Currently the xorg-server ebuild lists: ">=x11-apps/xinit-1.2.1-r1" in PDEPEND. This will cause a file collision on upgrade and generally annoying. * This package will overwrite one or more files that may belong to other * packages (see list below). * * Detected file collision(s): * * /etc/conf.d/xdm * /etc/init.d/xdm * /etc/init.d/xdm-setup * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * x11-apps/xinit-1.2.0-r4 * /etc/conf.d/xdm * /etc/init.d/xdm * /etc/init.d/xdm-setup * * Package 'x11-base/xorg-server-1.9.2' NOT merged due to file * collisions. If necessary, refer to your elog messages for the whole * content of the above message. I checked xinit-1.3.0-r1, and it doesn't install those files. Please change the dep in xorg-server.
One more thought. I think you will also need "!<x11-apps/xinit-1.3" in DEPEND so that it will be guaranteed to be unmerged. The PDEPEND action will just get emerged after the xorg-server build which is too late (still have the file collision)
Proposed fix: --- xorg-server-1.9.2.ebuild.orig 2010-12-26 16:33:49.000000000 +0000 +++ xorg-server-1.9.2.ebuild 2010-12-26 16:34:28.000000000 +0000 @@ -90,10 +90,11 @@ >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 - )" + ) + !<x11-apps/xinit-1.3" PDEPEND=" - >=x11-apps/xinit-1.2.1-r1 + x11-apps/xinit xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" EPATCH_FORCE="yes" which produces sane output again: Calculating dependencies... done! [ebuild U ] x11-base/xorg-server-1.9.2 [1.7.7-r1] USE="nptl udev%* xorg -dmx (-doc) -ipv6 -kdrive -minimal -static-libs% -tslib (-debug%) (-hal%) (-sdl%)" 0 kB [ebuild U ] x11-apps/xinit-1.3.0-r1 [1.2.0-r4] USE="minimal (-debug%) (-pam%*)" 0 kB [blocks b ] <x11-apps/xinit-1.3 ("<x11-apps/xinit-1.3" is blocking x11-base/xorg-server-1.9.2)
Oops, sorry for the multiple comments. It has occurred to me that above output is incorrect. The xinit blocker needs to be a "!!<..." instead of single !. Calculating dependencies... done! [ebuild U ] x11-apps/xinit-1.3.0-r1 [1.2.0-r4] USE="minimal (-debug%) (-pam%*)" 0 kB [ebuild U ] x11-base/xorg-server-1.9.2 [1.7.7-r1] USE="nptl udev%* xorg -dmx (-doc) -ipv6 -kdrive -minimal -static-libs% -tslib (-debug%) (-hal%) (-sdl%)" 0 kB [blocks b ] <x11-base/xorg-server-1.8.0 ("<x11-base/xorg-server-1.8.0" is blocking x11-apps/xinit-1.3.0-r1) THAT will solve the file collision issue properly.
Using commit message: ------------------------------------------------------------------------------ (#349798) Pull in xinit 1.3. Do it in RDEPEND instead of PDEPEND so that files moving around between packages don't run into conflicts. (Portage version: 2.1.9.26/cvs/Linux x86_64) ------------------------------------------------------------------------------ /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v <-- ChangeLog new revision: 1.554; previous revision: 1.553 /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.ebuild,v <-- xorg-server-1.9.2.ebuild new revision: 1.6; previous revision: 1.5 /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild,v <-- xorg-server-1.9.2.902.ebuild new revision: 1.2; previous revision: 1.1 >>> Creating Manifest for /data/src/gentoo-x86/x11-base/xorg-server
