version 1.17.0 of xorg-server is released. copied xorg-server-1.16.3-r1.ebuild to xorg-server-1.17.0.ebuild I had to remove the line with "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch because the patch fails to apply. If this patch is still needed than it has to be adapted. xorg-server-1.17.0.ebuild depends on xorg-drivers-1.17 so I copied xorg-drivers-1.16.ebuild to xorg-drivers-1.17.ebuild . xorg-server-1.17.0 compiles then without problems. Because of modesetting now is part of xorg-server-1.17.0 we have to block x11-drivers/xf86-video-modesetting in xorg-drivers-1.17.ebuild to avoid: * Detected file collision(s): * * /usr/share/man/man4/modesetting.4.bz2 * /usr/lib64/xorg/modules/drivers/modesetting_drv.so * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * x11-drivers/xf86-video-modesetting-0.9.0:0::gentoo * /usr/lib64/xorg/modules/drivers/modesetting_drv.so * /usr/share/man/man4/modesetting.4.bz2 * * Package 'x11-base/xorg-server-1.17.0' NOT merged due to file * collisions. If necessary, refer to your elog messages for the whole * content of the above message.
--- xorg-server-1.16.3-r1.ebuild +++ xorg-server-1.17.0.ebuild @@ -9,7 +9,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" DESCRIPTION="X.Org X servers" -SLOT="0/1.16.1" +SLOT="0/1.17.0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE_SERVERS="dmx kdrive xnest xorg xvfb" @@ -74,6 +74,7 @@ )" DEPEND="${CDEPEND} + !!x11-drivers/xf86-video-modesetting sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 @@ -131,7 +132,6 @@ PATCHES=( "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch ) --- xorg-drivers-1.16.ebuild +++ xorg-drivers-1.17.ebuild @@ -47,7 +47,6 @@ video_cards_intel video_cards_mach64 video_cards_mga - video_cards_modesetting video_cards_neomagic video_cards_nouveau video_cards_nv @@ -119,7 +118,6 @@ video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv )
An adapted version of the ia64 patch is in the x11 overlay already. !! blocker is only needed in case of miscompile/other build failure in the presence of the other package.
+*xorg-server-1.17.0 (08 Feb 2015) + + 08 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xorg-server-1.17-ia64-fix_inx_outx.patch, +xorg-server-1.17.0.ebuild, + metadata.xml: + Version bump, bug #539168. +
