Clean up

12 files changed, 10 insertions, 272 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 0f6944bbb79a..3e03d451c593 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.51 2004/12/27 00:04:04 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.52 2004/12/27 00:11:43 cyfred Exp $
+
+  27 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  -opengl-update-1.7.1.ebuild, -opengl-update-1.8.1-r1.ebuild,
+  -opengl-update-2.0_pre1.ebuild, -opengl-update-2.0_pre2.ebuild,
+  -opengl-update-2.0_pre3.ebuild:
+  Removing other 2.0_pre versions because of bad xorg-x11 check, pre4-r1 is
+  suitable; also removing the old MINOR versions.
 
 *opengl-update-2.0_pre4-r1 (27 Dec 2004)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index d181f5bc376e..c1627889b8d9 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,26 +1,16 @@
-MD5 2eca7489db295980511bb4534d4b359f ChangeLog 9248
+MD5 a6d4eaa556cb55fc0930081b217d3e9a ChangeLog 9587
 MD5 06e66398889b0eaf43fd1a634521bdb0 metadata.xml 318
 MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
-MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
 MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
 MD5 8b7d68f27db3db6ae7720556fbe4d53f opengl-update-1.8.2.ebuild 1594
-MD5 c78d172dcda5ffe19335f1220c4b0dbe opengl-update-1.8.1-r1.ebuild 1597
-MD5 41f5ceec6cb2831b975101d8cbb64d80 opengl-update-2.0_pre1.ebuild 1745
-MD5 88d1d3194250339cff3f4e4517ea5464 opengl-update-2.0_pre2.ebuild 1745
-MD5 c7ddcba021786cabd26d6d4a0e4ab5fd opengl-update-2.0_pre3.ebuild 1742
 MD5 71a71483a0bb3478dcfc5e766ddf049d opengl-update-2.0_pre4-r1.ebuild 1745
 MD5 0629c7cf1172224a3013ecaf6ef5d0ed files/opengl-update-2.0_pre1 8303
 MD5 e2d654ce48ba8b9908547ab004e33e0a files/opengl-update-2.0_pre2 9386
 MD5 f465dd119f8160b31b60fe90b3b57e46 files/opengl-update-2.0_pre3 9568
-MD5 0f9ce79f34ab0d4e3728425f3f3f1706 files/opengl-update-2.0_pre4 9755
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.1-r1 64
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre1 64
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre2 64
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre3 64
+MD5 976b6bf00cfdfeaa6cdadbfd49cd2e95 files/opengl-update-2.0_pre4 9755
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre4-r1 64
 MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
 MD5 e167f464da278c0b5cbc93f2c66cef4d files/opengl-update-1.8.1 8120
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
 MD5 17ebb42dcebb9fcf0d717b135586fca3 files/opengl-update-1.8.2 8303
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.7.1 b/x11-base/opengl-update/files/digest-opengl-update-1.7.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.7.1
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8.1-r1 b/x11-base/opengl-update/files/digest-opengl-update-1.8.1-r1
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre1 b/x11-base/opengl-update/files/digest-opengl-update-2.0_pre1
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre2 b/x11-base/opengl-update/files/digest-opengl-update-2.0_pre2
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre3 b/x11-base/opengl-update/files/digest-opengl-update-2.0_pre3
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/opengl-update-1.7.1.ebuild b/x11-base/opengl-update/opengl-update-1.7.1.ebuild
deleted file mode 100644
index 45a65170f160..000000000000
--- a/x11-base/opengl-update/opengl-update-1.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.7.1.ebuild,v 1.7 2004/06/28 16:58:44 agriffis Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-}
diff --git a/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild b/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild
deleted file mode 100644
index 575e3e97df12..000000000000
--- a/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild,v 1.6 2004/11/12 18:08:57 fmccor Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm hppa ia64 s390 alpha ~mips ~ppc ~ppc64 sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	# xfree has glext.h somewhere out of place so lets make the user move it
-	if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
-	then
-		# Just make it simpler on the user by giving verbose instructions
-		if [ -d /usr/lib/opengl/xfree ]
-		then
-			GL_IM="xfree"
-		else
-			GL_IM="xorg-x11"
-		fi
-
-		echo
-		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
-		ewarn "fix is necessary for you to use opengl-update-1.8.1; Please do the following"
-		echo
-		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
-		echo
-		ewarn "You may then remerge opengl-update-1.8.1 successfully"
-		echo
-
-		die "Userspace problem needs fixing"
-	fi
-}
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	doins ${WORKDIR}/glext.h || die
-}
diff --git a/x11-base/opengl-update/opengl-update-2.0_pre1.ebuild b/x11-base/opengl-update/opengl-update-2.0_pre1.ebuild
deleted file mode 100644
index e18f83fbc7f7..000000000000
--- a/x11-base/opengl-update/opengl-update-2.0_pre1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.0_pre1.ebuild,v 1.1 2004/10/28 18:45:56 spyderous Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	# xfree has glext.h somewhere out of place so lets make the user move it
-	if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
-	then
-		# Just make it simpler on the user by giving verbose instructions
-		if [ -d /usr/lib/opengl/xfree ]
-		then
-			GL_IM="xfree"
-		else
-			GL_IM="xorg-x11"
-		fi
-
-		echo
-		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
-		ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
-		echo
-		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
-		echo
-		ewarn "You may then remerge opengl-update-1.8.1 successfully"
-		echo
-
-		die "Userspace problem needs fixing"
-	fi
-}
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	doins ${WORKDIR}/glext.h || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "This version will only work with >=x11-base/xorg-x11-6.8.0-r2."
-	ewarn "Upgrade before running ${PN}."
-	echo
-}
diff --git a/x11-base/opengl-update/opengl-update-2.0_pre2.ebuild b/x11-base/opengl-update/opengl-update-2.0_pre2.ebuild
deleted file mode 100644
index 8fb4209f7997..000000000000
--- a/x11-base/opengl-update/opengl-update-2.0_pre2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.0_pre2.ebuild,v 1.1 2004/11/03 20:32:39 spyderous Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	# xfree has glext.h somewhere out of place so lets make the user move it
-	if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
-	then
-		# Just make it simpler on the user by giving verbose instructions
-		if [ -d /usr/lib/opengl/xfree ]
-		then
-			GL_IM="xfree"
-		else
-			GL_IM="xorg-x11"
-		fi
-
-		echo
-		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
-		ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
-		echo
-		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
-		echo
-		ewarn "You may then remerge opengl-update-1.8.1 successfully"
-		echo
-
-		die "Userspace problem needs fixing"
-	fi
-}
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	doins ${WORKDIR}/glext.h || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "This version will only work with >=x11-base/xorg-x11-6.8.0-r2."
-	ewarn "Upgrade before running ${PN}."
-	echo
-}
diff --git a/x11-base/opengl-update/opengl-update-2.0_pre3.ebuild b/x11-base/opengl-update/opengl-update-2.0_pre3.ebuild
deleted file mode 100644
index b5e182fc014b..000000000000
--- a/x11-base/opengl-update/opengl-update-2.0_pre3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.0_pre3.ebuild,v 1.1 2004/11/30 02:10:00 cyfred Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	# xfree has glext.h somewhere out of place so lets make the user move it
-	if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
-	then
-		# Just make it simpler on the user by giving verbose instructions
-		if [ -d /usr/lib/opengl/xfree ]
-		then
-			GL_IM="xfree"
-		else
-			GL_IM="xorg-x11"
-		fi
-
-		echo
-		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
-		ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
-		echo
-		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
-		echo
-		ewarn "You may then remerge opengl-update-1.8.1 successfully"
-		echo
-
-		die "Userspace problem needs fixing"
-	fi
-}
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	doins ${WORKDIR}/glext.h || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "This version will only work with >=x11-base/xorg-x11-6.8.0-r2."
-	ewarn "Upgrade before running ${PN}."
-	echo
-}