Add patch for libxshmfence API changes.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 309 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index db9e33896749..643dece783c7 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.776 2013/11/29 15:39:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.777 2013/12/04 10:06:57 chithanh Exp $
+
+*xorg-server-1.14.99.903-r1 (04 Dec 2013)
+
+  04 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xorg-server-1.15-xshmfence-1.1.patch,
+  +xorg-server-1.14.99.903-r1.ebuild:
+  Add patch for libxshmfence API changes.
 
   29 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-server-1.14.99.903.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a5b2cdc09455..699b7b4aef2b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -13,6 +13,7 @@ AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d0
 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
 AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
+AUX xorg-server-1.15-xshmfence-1.1.patch 1397 SHA256 b7d496e9da649b3831beb3418784f469c11a17e74f87888929d83afe87487fc1 SHA512 ea17a1ce84b7d98149ed8330315036462d2ac4aa7e68b78d5dcc6fc5ff673e11be9b32629009bc1ba37c1493adbc0f8d34c386a2f6a66f468a1f6c33d91757fb WHIRLPOOL c7d3b4a7dfeb232ae559ac9a510ed64b16c37ddc0876858842e33a2d4fbd78009f236eb0363dc8532cdb41b0370828d3a5684ab299c56546972d6822287e7cc7
 AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01
 AUX xorg-server-1.9-cve-2013-4396.patch 915 SHA256 a1686c0bd07337991eba7edf769790be30b33d1295a22a847fd139f4573379cb SHA512 e8a4fb8c4097662d0e4188fec3d6ab827addd7edb0122ddb94f66795ebc8e0ef18bba899da8fd76e918556a625ffa0c0d19c650182683ff6216faa7655aa8d11 WHIRLPOOL 98b4999c932669047094f6063b007d673957547180507dfe714943d21eda5f2371d97424efb97be6b9039aeba8d2b9282efc6023ae3edbfa9d5c8fc63fac848f
 AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
@@ -33,8 +34,9 @@ EBUILD xorg-server-1.12.4-r2.ebuild 7101 SHA256 76fcc2c773e97bd014da74be9ae3b8e1
 EBUILD xorg-server-1.13.4-r1.ebuild 7044 SHA256 b48f1d67a28c352e44eb44d75dbc2d576624971cbc0351a925a9efcb86269c27 SHA512 e83b452b4a9da41cd474921022970b5b4ff04cf06e0ff65fc549479373ffe9b2a711751d0efb10c0a08c3861736e446247e8a2415a0c9acf1515463b3daac8a5 WHIRLPOOL 7ff186b2a4bf469a4fd104b671225471b0c841f91894fdf0db93c874e5d29d9cfe8b8f2c4ee636db5e6e58920debde244cf15a2f5b7580036387ffb4feae3721
 EBUILD xorg-server-1.14.3-r2.ebuild 7165 SHA256 49d86ddaf2aed6ce6dbb165d7ae20e46dc661ad9f82e33cee8fb38d661c466e9 SHA512 7d0766afff2c6cb1373a3066626e35056bb47f8beeecbcb2a876ee948dec6edbe6b19f72461e07897ca07b28e6c6818a54d96818707627827ec53caea4ba0c60 WHIRLPOOL 58eebeae8f8927579f6bf7eb6bb636764f0435fe654280949deb59c1d4072b05757526f9903e6f149c8f2d9f3370bfe57bd1667f6d4333d20c64261590c5e808
 EBUILD xorg-server-1.14.4.ebuild 7129 SHA256 3f6840af8a0cbf9e36b9b91c7a5879839b6acaebf0306f6f16bb0706f79bea32 SHA512 96c7f8e49458189ed1d441890c2038f38551097b9f7b782243cbb960e02c2cfed69c43b90ffb36d4cb113e751b16f7d30f9f0e5adc022c19328d9c315df1d55d WHIRLPOOL a99be785d898e429858cc63edf4362a81feb3e354a636c265bcc02f0133d097e794c950f9ce0af68c0d2a49dce482c168c7c9ba37bba2e4b182bfe691489b8c8
+EBUILD xorg-server-1.14.99.903-r1.ebuild 7413 SHA256 c6caf367a9ffe630add8a7005b2906e20a617e980373e4cdd9c1203c2dbd4aaf SHA512 04b6a5a2e786f942d7d324a5a8bde4c2f929191de0f3818f0bdd713f98fe687e674e3d62ad02101854cafa9cfa624df628082360e77dc99d82fc649fdac4534c WHIRLPOOL dc0584f2d737c09568c57d785097a7fc16d77215d6b409550edc308499f2bd11c818675bdedb4f9f3cbd7b5ad99e437d29ec83e20622c7220bec2bc43721c2b9
 EBUILD xorg-server-1.14.99.903.ebuild 7343 SHA256 e502bfdb44a69a07ae13b0a310f234903ed25cb67cac9ae5f885ff638db52eb7 SHA512 59bc2d1830c858b9cc892ce67813a1470975ceebb30546dbe09ffa1b8fba55975f1e836989b50578df2cc8402f8aa802a52dbbbaea754a55540ba1958a5b7dbf WHIRLPOOL fad668f315ba42733401529f61724f67461809b011123d92cdb6ca1c05bd6dc8d6c01333eb47f40f39b0524e3095d81566a44c5cde0fca2e2d29c9aa461092e7
 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8
-MISC ChangeLog 52542 SHA256 02dcf6075b4dc81bf8f8171d57efdbcb45aeb55ab4106e6d84c62f963541915d SHA512 d5c42b9bdd85aee81455cafcf818b89c0a54f22af7ade37d7b61cd007c1b7f6db744007e061c7d69d7107f3dd5793e359fad18591c4a1f7cd2cfa553ef995190 WHIRLPOOL 20738d24fdc1adf16fec31af7f478f8cc901d52c9f58d15a0233cfed23c2bc2edd0fa0aa8974e6bc575566f20a89cfe8121cec623c52a88b82b631042bdf2776
+MISC ChangeLog 52782 SHA256 cf7088a28dd0c411118b370763b38a86e98c21e424cc2d772022f30c87fd4586 SHA512 02c0a0705b146db27d9574e2b3307598e3db0dcbd3235d05ead0b6c5bacc5fed57a83bebb8ca23f70154c47ba730026a79c7a3ae0b9dbd0adbfc293736ba0dc3 WHIRLPOOL a7c80c082c423808900b1a3a0eb32c231b0c7a64850916a814106fc8b2c09dd9c425ab49b0cf6a4e132ed601ba8709d7c3e4b7e45c28be49ef5f8365aa309f46
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1
diff --git a/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch b/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
new file mode 100644
index 000000000000..d2cffe73b284
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
@@ -0,0 +1,43 @@
+From eafba23b34be31c141ddafb8380520ac9a0622ac Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Fri, 22 Nov 2013 06:45:18 +0000
+Subject: miext/sync: Handle libxshmfence API change
+
+libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
+That changed to exposing a 'struct shmfence' instead, which is nice
+and opaque and offers fine type checking across the API.
+
+This patch requires the newer version of the library and uses
+the new interface type.
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/configure.ac b/configure.ac
+index f6ecdc6..5a36e54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -787,7 +787,7 @@ DMXPROTO="dmxproto >= 2.2.99.1"
+ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
+ WINDOWSWMPROTO="windowswmproto"
+ APPLEWMPROTO="applewmproto >= 1.4"
+-XSHMFENCE="xshmfence"
++XSHMFENCE="xshmfence >= 1.1"
+ 
+ dnl Required modules
+ XPROTO="xproto >= 7.0.22"
+diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
+index 20780fd..01f82fc 100644
+--- a/miext/sync/misyncshm.c
++++ b/miext/sync/misyncshm.c
+@@ -38,7 +38,7 @@
+ static DevPrivateKeyRec syncShmFencePrivateKey;
+ 
+ typedef struct _SyncShmFencePrivate {
+-    int32_t             *fence;
++    struct xshmfence    *fence;
+     int                 fd;
+ } SyncShmFencePrivateRec, *SyncShmFencePrivatePtr;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild
new file mode 100644
index 000000000000..4923fb3a3a6d
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild,v 1.1 2013/12/04 10:06:57 chithanh Exp $
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+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"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-9.2.0[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.16
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri3proto-1.0
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	"${FILESDIR}"/${PN}-1.15-xshmfence-1.1.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-9 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		elog "You should consider reading upgrade guide for this release:"
+		elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+		echo
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can rebuild all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+
+	if use udev && has_version virtual/udev[-keymap]; then
+		ewarn "virtual/udev was built without keymap support. This may cause input device"
+		ewarn "autoconfiguration to fail."
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+		local x=""
+		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}