Drop older 1.8 series ebuilds.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 7 insertions, 967 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index d0f39469c11a..48682a16015c 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.519 2010/07/21 22:35:41 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.520 2010/07/22 19:54:18 scarabeus Exp $
+
+  22 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-server-1.8.0.ebuild, -xorg-server-1.8.1.901.ebuild,
+  -xorg-server-1.8.1.902.ebuild:
+  Drop older 1.8 series ebuilds.
 
 *xorg-server-1.8.2 (21 Jul 2010)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index ede2e28e05cc..3b2a3eb7abf6 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,7 +1,5 @@
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
 AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
-AUX 1.8.0-match-only-sane-devices.patch 1980 RMD160 4fee29076bb30e8fb1b820ef58a1c26f3bd63c73 SHA1 98d4ea8e493a31f141e39f4a468458469ebff58f SHA256 95f6ab36fa1b6b80786ff90fb2ee1f7fe02d964a1d10c90277060b4982d8eace
-AUX 1.8.0-no-hardcoded-etc.patch 833 RMD160 9e3736556f8c74c1c78561590cf03e9316d28a75 SHA1 0063e0c520f128507e71134571de6dd95a00079c SHA256 2168832548dbb8d6619df7b2a54b22f118de588522b4014dabaa98829331a6b9
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
@@ -11,16 +9,10 @@ DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
-DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
-DIST xorg-server-1.8.1.901.tar.bz2 5220082 RMD160 36c0a17c5b41ddb222117b35616630b093300e5c SHA1 e26228cbeb387ec37ee6c549a208534a2dd2ae43 SHA256 ca9ccea83eb9585f53182df0e984d1303a78b585e77651b2c407d7b500884863
-DIST xorg-server-1.8.1.902.tar.bz2 5223335 RMD160 bf0c5b57fc191ad1b2eaef1cf9b36bc8f04082b8 SHA1 1857151a4dc361c30ba2eaad3115722724121c81 SHA256 f1e4d81aad3ec5096a40f94ad20c141b933269f497b1dcca1cc4c3e774449e91
 DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
 EBUILD xorg-server-1.7.6.ebuild 7309 RMD160 b761bc151ecdc960d3e881e059ce5bafdccc3d32 SHA1 31c1c8915970323e6786eb8a0f5945553d1a9f22 SHA256 c8640d0acde2da02116a589712159b14414840a76e36b7ff555edb7c688f455a
 EBUILD xorg-server-1.7.7.ebuild 7162 RMD160 b099b9dc02ff0b6aaa82ec54ac01203c25a052cb SHA1 85b2efa437730f2623c36ebab3fb4cb28c7a0d0d SHA256 7e0a584a20db0a4b94326bed6ab77f9866b2a4526d3d71dc6a7cb9d88c0b4313
-EBUILD xorg-server-1.8.0.ebuild 8163 RMD160 256d04fae9d5a1f395479558d8ef53c0c5558299 SHA1 26c6e8befd90bf1f8a059914b03f00a0bad172f3 SHA256 a6b7a567f020a1feb343fdde0b9833c2e06b9d4079aa442bde9f0ac9c3f74530
-EBUILD xorg-server-1.8.1.901.ebuild 8038 RMD160 3cc0712f36e5fb587053d55ad6bb4d9339a3b0a3 SHA1 c2be06719733ce095ad968984b024b9f96e2e4e2 SHA256 baf4368ec373a543477ed4f69d85aff4798d9491bf12dc8f0eb6977bba012632
-EBUILD xorg-server-1.8.1.902.ebuild 8033 RMD160 7b4f0a30f904677b5c995e13a2b9faff0df3e7e0 SHA1 a940f5854f3eb38215456d58ea80a5cb7011321a SHA256 eef13728610b7bcd1d9534ea68a985ecb828809be2b93c6996e62f90b19462f1
 EBUILD xorg-server-1.8.2.ebuild 8080 RMD160 353d87f4a9ec420430dc96eec68374da582f1164 SHA1 276e307b30d3d8cb7b1908b82768a57fe9b4c4ea SHA256 aa5cf0497aeec9b178954aaab8d8c9bc0e8790070c4d3d1dd23b49afc4bc3ebf
-MISC ChangeLog 115569 RMD160 50a8c1d82c9e1a1b4abc459f322d2e485c79bf49 SHA1 96f845d83a4d4dd111fc09e8ecdb03c9ddc6ff4c SHA256 53ff9e72c10623ee42442b59a2dc6d9abed305568f66293b2e8634ab22d1fe65
+MISC ChangeLog 115752 RMD160 2a6eeae6e2bc5ff8745ac61862f9c8d267bdfde8 SHA1 b19e0a774a095d86e74287afb618f67a0697ca0b SHA256 e20136dae1530787b577d1c94a2957329015f0e07516f4c03c9ab56faaa639b7
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
diff --git a/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch b/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch
deleted file mode 100644
index 6ece211d7120..000000000000
--- a/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From c8a608cb6ce8f9c86258c1ab49084f691fa9cc51 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 07 Apr 2010 00:04:38 +0000
-Subject: config: only match sane devices in 10-evdev.conf
-
-Having a generic catchall also adds devices like accelerometers. These
-devices make X unusable, hence restrict matching to "known sane" devices
-like pointers, touchpads, keyboards, tablets and touchscreens.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Acked-by: Julien Cristau <jcristau@debian.org>
-Acked-by: Dan Nicholson <dbn.lists@gmail.com>
-Acked-by: James Cloos <cloos@jhcloos.com>
----
-diff --git a/config/10-evdev.conf b/config/10-evdev.conf
-index 7406f4e..cc83ab2 100644
---- a/config/10-evdev.conf
-+++ b/config/10-evdev.conf
-@@ -1,8 +1,40 @@
- #
- # Catch-all evdev loader for udev-based systems
--#
-+# We don't simply match on any device since that also adds accelerometers
-+# and other devices that we don't really want to use. The list below
-+# matches everything but joysticks.
-+
- Section "InputClass"
--        Identifier "evdev-catchall"
-+        Identifier "evdev pointer catchall"
-+        MatchIsPointer "on"
-+        MatchDevicePath "/dev/input/event*"
-         Driver "evdev"
-+EndSection
-+
-+Section "InputClass"
-+        Identifier "evdev keyboard catchall"
-+        MatchIsKeyboard "on"
-         MatchDevicePath "/dev/input/event*"
-+        Driver "evdev"
-+EndSection
-+
-+Section "InputClass"
-+        Identifier "evdev touchpad catchall"
-+        MatchIsTouchpad "on"
-+        MatchDevicePath "/dev/input/event*"
-+        Driver "evdev"
-+EndSection
-+
-+Section "InputClass"
-+        Identifier "evdev tablet catchall"
-+        MatchIsTablet "on"
-+        MatchDevicePath "/dev/input/event*"
-+        Driver "evdev"
-+EndSection
-+
-+Section "InputClass"
-+        Identifier "evdev touchscreen catchall"
-+        MatchIsTouchscreen "on"
-+        MatchDevicePath "/dev/input/event*"
-+        Driver "evdev"
- EndSection
---
-cgit v0.8.3-6-g21f6
diff --git a/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch b/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch
deleted file mode 100644
index 33a28626b536..000000000000
--- a/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7fc78783018cf2ce27f8e6829f9eff1d9032541c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 7 Apr 2010 09:27:59 +1000
-Subject: [PATCH] config: don't hardcode /etc for 10-evdev.conf
-
-Use sysconfdir instead to avoid amusements like /usr/etc/ and the like.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- config/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config/Makefile.am b/config/Makefile.am
-index eed7454..2e468cf 100644
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS)
- libconfig_la_SOURCES += udev.c
- libconfig_la_LIBADD = $(UDEV_LIBS)
- 
--xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
-+xorgconfddir = $(sysconfdir)/$(XF86CONFIGDIR)
- xorgconfd_DATA = 10-evdev.conf
- 
- else
--- 
-1.6.6.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.8.0.ebuild b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
deleted file mode 100644
index f64bea4083eb..000000000000
--- a/x11-base/xorg-server/xorg-server-1.8.0.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2010 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.8.0.ebuild,v 1.6 2010/04/13 21:56:38 polynomial-c Exp $
-
-EAPI=3
-XORG_EAUTORECONF="yes"
-inherit xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} doc hal ipv6 minimal nptl 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/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.3.3
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.15.20
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	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.5
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.3
-	)
-	!udev? ( hal? ( sys-apps/hal ) )
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( sys-fs/udev[extras] )"
-
-DEPEND="${RDEPEND}
-	!!net-dialup/dtrace
-	!<x11-apps/xinit-1.2.1-r1
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.11
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=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.0.99.3
-	>=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.13
-	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? ( app-doc/doxygen )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3.0
-	)"
-
-PDEPEND="
-	>=x11-apps/xinit-1.2.1-r1
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	"${FILESDIR}"/${PV}-no-hardcoded-etc.patch
-	"${FILESDIR}"/${PV}-match-only-sane-devices.patch
-	)
-
-pkg_setup() {
-	local myconf
-
-	xorg-2_pkg_setup
-
-	use minimal || ensure_a_server_is_building
-
-	# HAL shebang
-	if use hal; then
-		ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
-		ewarn "From next major release on the hal support will be fully disabled."
-	fi
-	if use hal && use udev; then
-		ewarn "Both hal and udev flags are enabled."
-		ewarn "Enabling only udev!"
-		myconf="
-			$(use_enable udev config-udev)
-			--disable-config-hal
-		"
-	else
-		myconf="
-			$(use_enable hal config-hal)
-			$(use_enable udev config-udev)
-		"
-	fi
-
-	# 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
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(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 xorg)
-		$(use_enable nptl glx-tls)
-		$(use_with doc doxygen)
-		${myconf}
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		--with-os-vendor=Gentoo
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	# Incompatible with GCC 3.x CPP, bug #314615
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
-		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
-	fi
-
-	# detect if we should inform user about ebuild breakage
-	if ! has_version "x11-base/xorg-server" ||
-			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
-		INFO="yes"
-	fi
-}
-
-src_configure() {
-	# this is required only for configure and build time
-	OLD_IMPLEM="$(eselect opengl show)"
-	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
-	xorg-2_src_configure
-}
-
-src_compile() {
-	emake # no die here intentional
-	if [[ $? != 0 ]]; then
-		[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
-		die "Compilation failed"
-	fi
-	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example (see bugs #151421 and #151670)
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-
-	# install the xdm.init
-	cp "${FILESDIR}"/xdm.initd "${T}"
-	if use hal && ! use udev; then
-		sed -i \
-			-e "s/@HALD_DEPEND@/need hald/g" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	else
-		sed -i \
-			-e "/@HALD_DEPEND@/ d" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	fi
-	newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-}
-
-pkg_postinst() {
-	if [[ ${INFO} = yes ]]; then
-		einfo "You should consider reading upgrade guide for this release:"
-		einfo "	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 generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	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/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild b/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild
deleted file mode 100644
index 31eba9bba321..000000000000
--- a/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2010 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.8.1.901.ebuild,v 1.3 2010/06/18 14:14:35 scarabeus Exp $
-
-EAPI=3
-XORG_EAUTORECONF="yes"
-inherit xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} doc hal ipv6 minimal nptl 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/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.3.3
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.15.20
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	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.5
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.3
-	)
-	!udev? ( hal? ( sys-apps/hal ) )
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( sys-fs/udev )"
-
-DEPEND="${RDEPEND}
-	!<x11-apps/xinit-1.2.1-r1
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.11
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=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.0.99.3
-	>=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.13
-	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? ( >=app-doc/doxygen-1.6.1 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3.0
-	)"
-
-PDEPEND="
-	>=x11-apps/xinit-1.2.1-r1
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	)
-
-pkg_setup() {
-	local myconf
-
-	xorg-2_pkg_setup
-
-	use minimal || ensure_a_server_is_building
-
-	# HAL shebang
-	if use hal; then
-		ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
-		ewarn "From next major release on the hal support will be fully disabled."
-	fi
-	if use hal && use udev; then
-		ewarn "Both hal and udev flags are enabled."
-		ewarn "Enabling only udev!"
-		myconf="
-			$(use_enable udev config-udev)
-			--disable-config-hal
-		"
-	else
-		myconf="
-			$(use_enable hal config-hal)
-			$(use_enable udev config-udev)
-		"
-	fi
-
-	# 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
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(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 xorg)
-		$(use_enable nptl glx-tls)
-		$(use_with doc doxygen)
-		${myconf}
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		--with-os-vendor=Gentoo
-		${conf_opts}"
-
-	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	pushd "${T}/mesa-symlinks/GL" &> /dev/null
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h
-	done
-	for i in  glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h
-	done
-	popd &> /dev/null
-	export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS} }-I${T}/mesa-symlinks"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	# Incompatible with GCC 3.x CPP, bug #314615
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
-		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
-	fi
-
-	# detect if we should inform user about ebuild breakage
-	if ! has_version "x11-base/xorg-server" ||
-			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
-		INFO="yes"
-	fi
-}
-
-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 hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-
-	# install the xdm.init
-	cp "${FILESDIR}"/xdm.initd "${T}"
-	if use hal && ! use udev; then
-		sed -i \
-			-e "s/@HALD_DEPEND@/need hald/g" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	else
-		sed -i \
-			-e "/@HALD_DEPEND@/ d" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	fi
-	newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set --use-old xorg-x11
-
-	if [[ ${INFO} = yes ]]; then
-		einfo "You should consider reading upgrade guide for this release:"
-		einfo "	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 generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	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/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.8.1.902.ebuild b/x11-base/xorg-server/xorg-server-1.8.1.902.ebuild
deleted file mode 100644
index 0fca40a26019..000000000000
--- a/x11-base/xorg-server/xorg-server-1.8.1.902.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2010 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.8.1.902.ebuild,v 1.1 2010/06/26 22:11:50 remi Exp $
-
-EAPI=3
-XORG_EAUTORECONF="yes"
-inherit xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} doc hal ipv6 minimal nptl 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/libpciaccess-0.10.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.3.3
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.15.20
-	>=x11-libs/xtrans-1.2.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	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.5
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.3
-	)
-	!udev? ( hal? ( sys-apps/hal ) )
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( sys-fs/udev )"
-
-DEPEND="${RDEPEND}
-	!<x11-apps/xinit-1.2.1-r1
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.11
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
-	>=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.0.99.3
-	>=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.13
-	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? ( >=app-doc/doxygen-1.6.1 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3.0
-	)"
-
-PDEPEND="
-	>=x11-apps/xinit-1.2.1-r1
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-disable-acpi.patch
-	)
-
-pkg_setup() {
-	local myconf
-
-	xorg-2_pkg_setup
-
-	use minimal || ensure_a_server_is_building
-
-	# HAL shebang
-	if use hal; then
-		ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
-		ewarn "From next major release on the hal support will be fully disabled."
-	fi
-	if use hal && use udev; then
-		ewarn "Both hal and udev flags are enabled."
-		ewarn "Enabling only udev!"
-		myconf="
-			$(use_enable udev config-udev)
-			--disable-config-hal
-		"
-	else
-		myconf="
-			$(use_enable hal config-hal)
-			$(use_enable udev config-udev)
-		"
-	fi
-
-	# 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
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(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 xorg)
-		$(use_enable nptl glx-tls)
-		$(use_with doc doxygen)
-		${myconf}
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		--with-os-vendor=Gentoo
-		${conf_opts}"
-
-	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	pushd "${T}/mesa-symlinks/GL" &> /dev/null
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h
-	done
-	for i in  glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h
-	done
-	popd &> /dev/null
-	export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS} }-I${T}/mesa-symlinks"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	# Incompatible with GCC 3.x CPP, bug #314615
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
-		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
-	fi
-
-	# detect if we should inform user about ebuild breakage
-	if ! has_version "x11-base/xorg-server" ||
-			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
-		INFO="yes"
-	fi
-}
-
-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 hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-
-	# install the xdm.init
-	cp "${FILESDIR}"/xdm.initd "${T}"
-	if use hal && ! use udev; then
-		sed -i \
-			-e "s/@HALD_DEPEND@/need hald/g" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	else
-		sed -i \
-			-e "/@HALD_DEPEND@/ d" \
-			"${T}"/xdm.initd \
-			|| die "sed failed"
-	fi
-	newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set --use-old xorg-x11
-
-	if [[ ${INFO} = yes ]]; then
-		einfo "You should consider reading upgrade guide for this release:"
-		einfo "	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 generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	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/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}