Drop old versions.

Package-Manager: portage-2.0.51.22-r2

12 files changed, 8 insertions, 635 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index fb13a34b75d8..156d38acdeb6 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.28 2005/08/21 02:39:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.29 2005/08/21 10:04:25 spyderous Exp $
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/xorg-composite.patch, -files/xorg-server-fbmmx-local.patch,
+  -xorg-server-0.99.1.ebuild, -xorg-server-0.99.1-r1.ebuild,
+  -xorg-server-0.99.1-r2.ebuild, -xorg-server-0.99.1-r3.ebuild:
+  Drop old versions.
 
 *xorg-server-0.99.1-r4 (21 Aug 2005)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f481624e63db..ef426bf7c197 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,16 +1,6 @@
-MD5 933ccecdb5fe78b9be1e98c7f37330c2 xorg-server-0.99.1-r1.ebuild 3020
-MD5 4d44a5ecdb79cd635dae0b34516be848 ChangeLog 5230
-MD5 ec3dcd9bb675ec4c10e298b660b200d6 xorg-server-0.99.1.ebuild 2887
-MD5 a77ae0249ac2bde41bcb938adca6b411 xorg-server-0.99.1-r2.ebuild 3228
-MD5 7ba44f65da461a86dd463bcbf984b834 xorg-server-0.99.1-r3.ebuild 3552
+MD5 216bdde432e0dbca57dd0ffded48a4a9 ChangeLog 5501
 MD5 fce26ca043edacc74f8c3378c12471a0 xorg-server-0.99.1-r4.ebuild 3593
-MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite.patch 2397
-MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
-MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1-r1 137
 MD5 cda95e8d1c7c9540a7619dbe007c125d files/fix-xf86misc-typo.patch 615
 MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
-MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r2 239
-MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r3 239
 MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452
-MD5 f176158b79ddb098f9ffb61551423eb1 files/xorg-server-fbmmx-local.patch 1210
 MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1
deleted file mode 100644
index b4cf4fc553af..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1
deleted file mode 100644
index b4cf4fc553af..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
deleted file mode 100644
index 2b2f4f2f5a24..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 0e0f7c327a15e6b939770fec6a852848 xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz 406372
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r3 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r3
deleted file mode 100644
index 2b2f4f2f5a24..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 0e0f7c327a15e6b939770fec6a852848 xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz 406372
diff --git a/x11-base/xorg-server/files/xorg-composite.patch b/x11-base/xorg-server/files/xorg-composite.patch
deleted file mode 100644
index a0b466b67808..000000000000
--- a/x11-base/xorg-server/files/xorg-composite.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-1. Make composite build for Xnest and Xorg by fixing link order
-2. Make Xdmx link properly when building the module with composite
-3. Fix typo of XF86MIS instead of XF86MISC
-4. Require glproto for dmx/glxproxy and for dri+glx
-
-Index: xorg/configure.ac
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
-retrieving revision 1.30
-diff -u -b -B -r1.30 configure.ac
---- xorg/configure.ac	27 Jul 2005 08:11:26 -0000	1.30
-+++ xorg/configure.ac	28 Jul 2005 20:49:35 -0000
-@@ -221,6 +221,9 @@
- if test "$DMX" = yes; then
- 	PKG_CHECK_MODULES([DMXMODULES],
-                           [xmuu xext x11 xrender xfont xi dmxproto])
-+	if test "$GLX" = yes; then
-+		PKG_CHECK_MODULES([GL],[glproto])
-+	fi
- fi
- AM_CONDITIONAL(DMX, [test x$DMX = xyes])
- 
-@@ -404,6 +407,9 @@
- 	AC_SUBST(DRIPROTO_CFLAGS)
- 	PKG_CHECK_MODULES([LIBDRM], [libdrm])
- 	AC_SUBST(LIBDRM_CFLAGS)
-+	if test "$GLX" = yes; then
-+		PKG_CHECK_MODULES([GL],[glproto])
-+	fi
- fi
- AC_DEFINE(XINPUT,1,[Support X Input extension])
- EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
-@@ -541,7 +547,7 @@
- if test x$XF86VIDMODE = xyes; then
-   AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension])
- fi
--if test x$XF86MIS = xyes; then
-+if test x$XF86MISC = xyes; then
-   AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions])
- fi
- # must come first as it uses stuff in Shape -d
-@@ -574,11 +574,6 @@
- EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.la'
- EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
- 
--if test "$COMPOSITE" = yes; then
--	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/miext/cw/libcw.la'
--	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
--fi
--
- DIX_LIB='$(top_builddir)/dix/libdix.la'
- OS_LIB='$(top_builddir)/os/libos.la'
- MI_LIB='$(top_builddir)/mi/libmi.la'
-@@ -598,6 +593,12 @@
- XI_INC='-I$(top_srcdir)/Xi'
- CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
- 
-+if test "$COMPOSITE" = yes; then
-+	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'
-+	DAMAGE_LIB="$DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la'
-+	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'" "'-I$(top_srcdir)/miext/cw'
-+fi
-+
- PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
- XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
- 
diff --git a/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch b/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch
deleted file mode 100644
index d31aff5198c3..000000000000
--- a/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=4073
-
-xorg-server compilation dies, 2 undefined symbols
-
-diff -ur fb.orig/fbmmx.c fb/fbmmx.c
---- xorg-server-0.99.1/fb.orig/fbmmx.c	2005-08-13 20:37:45 +0000
-+++ xorg-server-0.99.1/fb/fbmmx.c	2005-08-13 20:35:13 +0000
-@@ -2315,7 +2315,7 @@
-              "pop %%eax\n"
-              "mov $0x0, %%edx\n"
-              "xor %%ebx, %%eax\n"
--             "jz skip\n"
-+             "jz 1f\n"
- 
-              "mov $0x00000000, %%eax\n"
-              "cpuid\n"
-@@ -2324,7 +2324,7 @@
-              "mov %%ecx, %3\n"
-              "mov $0x00000001, %%eax\n"
-              "cpuid\n"
--             "skip:\n"
-+             "1:\n"
-              "pop %%ebx\n"
-              "mov %%edx, %0\n"
-              : "=r" (result), 
-@@ -2355,10 +2355,10 @@
-                     "cpuid\n"
-                     "xor %%edx, %%edx\n"
-                     "cmp $0x1, %%eax\n"
--                    "jge skip2\n"
-+                    "jge 2f\n"
-                     "mov $0x80000001, %%eax\n"
-                     "cpuid\n"
--                    "skip2:\n"
-+                    "2:\n"
-                     "mov %%edx, %0\n"
-                     "pop %%ebx\n"
-                     : "=r" (result)
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild
deleted file mode 100644
index 483b7ec4fe7b..000000000000
--- a/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild,v 1.5 2005/08/20 22:53:03 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.3.1.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-
-PATCHES="${FILESDIR}/xorg-composite.patch"
-
-SRC_URI="${SRC_URI}
-	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~sparc ~x86"
-IUSE="glx dri xinerama ipv6 minimal"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	glx? ( >=media-libs/mesa-6
-		>=x11-base/opengl-update-2.2.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	x11-proto/compositeproto
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/dmxproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	x11-proto/xineramaproto
-	x11-proto/fontsproto
-	x11-proto/kbproto
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	glx? ( x11-proto/glproto )
-	dri? ( x11-proto/xf86driproto
-		x11-libs/libdrm )"
-
-pkg_setup() {
-	if use glx; then
-		confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	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
-	CONFIGURE_OPTIONS="
-		$(use_enable xinerama)
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable glx)
-		$(use_enable dri)
-		--enable-xorg
-		--enable-composite
-		--enable-xtrap
-		--enable-xevie
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		${confopts}"
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	dosym Xorg /usr/bin/X
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-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/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
deleted file mode 100644
index 12d4a43ab6ec..000000000000
--- a/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild,v 1.5 2005/08/20 22:53:03 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.3.1.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-
-PATCHES="${WORKDIR}/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch
-	${FILESDIR}/check-for-glproto.patch
-	${FILESDIR}/fix-xf86misc-typo.patch"
-
-SRC_URI="${SRC_URI}
-	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )
-	http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~sparc ~x86"
-IUSE="glx dri xinerama ipv6 minimal"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	glx? ( >=media-libs/mesa-6
-		>=x11-base/opengl-update-2.2.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	x11-proto/compositeproto
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/dmxproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	x11-proto/xineramaproto
-	x11-proto/fontsproto
-	x11-proto/kbproto
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	glx? ( x11-proto/glproto )
-	dri? ( x11-proto/xf86driproto
-		x11-libs/libdrm )"
-
-pkg_setup() {
-	if use glx; then
-		confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	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
-	CONFIGURE_OPTIONS="
-		$(use_enable xinerama)
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable glx)
-		$(use_enable dri)
-		--enable-xorg
-		--enable-composite
-		--enable-xtrap
-		--enable-xevie
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		${confopts}"
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	dosym Xorg /usr/bin/X
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-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/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild
deleted file mode 100644
index a985bfbe5e18..000000000000
--- a/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild,v 1.11 2005/08/20 22:53:03 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.3.1.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-
-PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-20050811-1.patch
-	${FILESDIR}/check-for-glproto.patch
-	${FILESDIR}/fix-xf86misc-typo.patch
-	${FILESDIR}/${P}-x86_64-1.patch
-	${FILESDIR}/${PN}-fbmmx-local.patch"
-
-SRC_URI="${SRC_URI}
-	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )
-	http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="glx dri ipv6 minimal"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	glx? ( >=media-libs/mesa-6
-		>=x11-base/opengl-update-2.2.3 )"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	x11-proto/compositeproto
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/dmxproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	x11-proto/xineramaproto
-	x11-proto/fontsproto
-	x11-proto/kbproto
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	glx? ( x11-proto/glproto )
-	dri? ( x11-proto/xf86driproto
-		x11-libs/libdrm )"
-
-pkg_setup() {
-	if use glx; then
-		confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	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
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable glx)
-		$(use_enable dri)
-		--enable-xorg
-		--enable-xtrap
-		--enable-xevie
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		${confopts}"
-}
-
-src_install() {
-	x-modular_src_install
-
-	if use glx; then
-		dynamic_libgl_install
-	fi
-
-	dosym Xorg /usr/bin/X
-	fperms 4711 /usr/bin/Xorg
-}
-
-pkg_postinst() {
-	if use glx; then
-		switch_opengl_implem
-	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/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}
diff --git a/x11-base/xorg-server/xorg-server-0.99.1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1.ebuild
deleted file mode 100644
index 5df7828857a9..000000000000
--- a/x11-base/xorg-server/xorg-server-0.99.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1.ebuild,v 1.8 2005/08/20 22:53:03 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.3.1.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-
-PATCHES="${FILESDIR}/xorg-composite.patch"
-
-SRC_URI="${SRC_URI}
-	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~sparc ~x86"
-IUSE="glx dri xinerama ipv6 minimal"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	glx? ( >=media-libs/mesa-6
-		>=x11-base/opengl-update-2.2.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	x11-proto/compositeproto
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/dmxproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	x11-proto/xineramaproto
-	x11-proto/fontsproto
-	x11-proto/kbproto
-	glx? ( x11-proto/glproto )
-	dri? ( x11-proto/xf86driproto
-		x11-libs/libdrm )"
-
-if use glx; then
-	confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-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
-CONFIGURE_OPTIONS="
-	$(use_enable xinerama)
-	$(use_enable ipv6)
-	$(use_enable !minimal dmx)
-	$(use_enable !minimal xvfb)
-	$(use_enable !minimal xnest)
-	$(use_enable glx)
-	$(use_enable dri)
-	--enable-xorg
-	--enable-composite
-	--enable-xtrap
-	--enable-xevie
-	--sysconfdir=/etc/X11
-	--localstatedir=/var
-	${confopts}"
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-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/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}