Cleaned out old cruft which supported the 2004.3 amd64 profile. Improved support for cleaning up after switching away from newer nvidia drivers. In -* to allow time for the file to hit mirrors.

Package-Manager: portage-2.1.3.16

4 files changed, 113 insertions, 8 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 3f606469203c..2fe61b9d47c5 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.31 2007/10/27 22:23:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.32 2007/10/27 23:06:01 eradicator Exp $
+
+*eselect-opengl-1.0.6 (27 Oct 2007)
+
+  27 Oct 2007; Jeremy Huddleston <eradicator@gentoo.org>
+  +eselect-opengl-1.0.6.ebuild:
+  Cleaned out old cruft which supported the 2004.3 amd64 profile. Improved
+  support for cleaning up after switching away from newer nvidia drivers.
 
   27 Oct 2007; Jeremy Huddleston <eradicator@gentoo.org>
   -eselect-opengl-1.0.3.ebuild, -eselect-opengl-1.0.4.ebuild:
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 1512d3abe3d2..a7829e896af3 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -4,14 +4,19 @@ Hash: SHA1
 DIST glext.h-29.bz2 33215 RMD160 b21868b31524c2309658d65682b4528823126ae5 SHA1 4635a7a73169e6516fbf4d214b36352568fad24e SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0
 DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA1 51dc76e10814a7b990086bc013c2ac0e5e06631d SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0
 DIST opengl.eselect-1.0.5.bz2 3365 RMD160 1bd3a537e2703c9d240c8c94d3e609ba2d009866 SHA1 c0aad648804ab1079a4377bc7bf44784136e1818 SHA256 b54ffa9831f86bd7effeea8931ab72e5ac417a2948d634969630039144166cc0
+DIST opengl.eselect-1.0.6.bz2 3295 RMD160 79ab635aeae9001cb4427db6532b17284b36d95e SHA1 c54dc98e4c223038f6b6250acb970e665a8d488e SHA256 50dfb50b9a4479524f34bcf0d421ec216dbab2c50def31fe208c186efe3d1b31
 EBUILD eselect-opengl-1.0.5.ebuild 2192 RMD160 dfa925fc22085f7c91190c80196bbd2a79328d05 SHA1 20be2afb391d989027ff30400300eb95067139e0 SHA256 228f76436919f4e349a47723b852bfc2c970f742af95a42304561ee767d225fc
 MD5 68e7ac6184482e55b1bc3f09f5a6af9b eselect-opengl-1.0.5.ebuild 2192
 RMD160 dfa925fc22085f7c91190c80196bbd2a79328d05 eselect-opengl-1.0.5.ebuild 2192
 SHA256 228f76436919f4e349a47723b852bfc2c970f742af95a42304561ee767d225fc eselect-opengl-1.0.5.ebuild 2192
-MISC ChangeLog 4803 RMD160 28bd7260f6bc0aaff68aea832e287a0cc4004e04 SHA1 3e60400cd95dea9f32377a6f98be3cebdef220ba SHA256 c49f7c76db8b0a6665c4e18f4d59fefa05ca71329f2ecc6af412a91fe97c0984
-MD5 16741567ae3c1d30bb5e1e05005d5825 ChangeLog 4803
-RMD160 28bd7260f6bc0aaff68aea832e287a0cc4004e04 ChangeLog 4803
-SHA256 c49f7c76db8b0a6665c4e18f4d59fefa05ca71329f2ecc6af412a91fe97c0984 ChangeLog 4803
+EBUILD eselect-opengl-1.0.6.ebuild 2224 RMD160 69317525839be1833bd9f4d29b2a583b46e64dd0 SHA1 dd964448880df6e62993616e243d2fd548f4d765 SHA256 a8e9f94da9f04c0e40480180af61fb5026114136191dd6404920bd6e492e2055
+MD5 1b72f4c5a16b9b1ab6885252627a3ab1 eselect-opengl-1.0.6.ebuild 2224
+RMD160 69317525839be1833bd9f4d29b2a583b46e64dd0 eselect-opengl-1.0.6.ebuild 2224
+SHA256 a8e9f94da9f04c0e40480180af61fb5026114136191dd6404920bd6e492e2055 eselect-opengl-1.0.6.ebuild 2224
+MISC ChangeLog 5079 RMD160 ee685f4431eceb753460720051dffd79f7bb5123 SHA1 308d30d31cabe489e6f0c399c511e4109c18641a SHA256 0443e5b0776f5d6d64a3f18de2a4ee0d9a459f4f03f3943b8887c9fce71f1885
+MD5 9a34078b9e72fdd518f569d042765bf6 ChangeLog 5079
+RMD160 ee685f4431eceb753460720051dffd79f7bb5123 ChangeLog 5079
+SHA256 0443e5b0776f5d6d64a3f18de2a4ee0d9a459f4f03f3943b8887c9fce71f1885 ChangeLog 5079
 MISC metadata.xml 366 RMD160 1e4b0bac744189f46350b440bf36112272a69baa SHA1 52b8b9b7d1cbcd2bcf4d988aaaf7bf744244fd77 SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445
 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
 RMD160 1e4b0bac744189f46350b440bf36112272a69baa metadata.xml 366
@@ -19,10 +24,13 @@ SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445 metadata
 MD5 e82d2dd7818f77075eaf39f0ce983f2c files/digest-eselect-opengl-1.0.5 687
 RMD160 7b9ca0fdd1541ae9c279d126dd62db6509007cb8 files/digest-eselect-opengl-1.0.5 687
 SHA256 5f2e6400107f8708b782f2233e1d1299870dad53950de56f90c98d3970b3c1d5 files/digest-eselect-opengl-1.0.5 687
+MD5 0be20973554246221869406cf3aee63e files/digest-eselect-opengl-1.0.6 687
+RMD160 c841ebb0f849d4b6c5dc52a192757613e2ff4692 files/digest-eselect-opengl-1.0.6 687
+SHA256 433696719cec5d69fa4c2dfa2a1e590bf6c440d561526d0ca3f465033fa07ea0 files/digest-eselect-opengl-1.0.6 687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHI7qBjC1Anjf1NmMRAmSBAJ0W4clAmXHKx6gR+nBGpWPJNpnUvwCdEBg2
-ZiB6hUjrF6T2c3Zchexo27s=
-=bQBk
+iD8DBQFHI8RujC1Anjf1NmMRAniNAJwKof9QaioNull+SPaAEwhbabG3CwCfWyzc
+hTMufUNu/YHTZv1ydWcZAEk=
+=NyUT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild
new file mode 100644
index 000000000000..7df11988da57
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild,v 1.1 2007/10/27 23:06:01 eradicator Exp $
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
+
+GLEXT="29"
+GLXEXT="11"
+
+SRC_URI="mirror://gentoo/glext.h-${GLEXT}.bz2
+	 mirror://gentoo/glxext.h-${GLXEXT}.bz2
+	 mirror://gentoo/opengl.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-*"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+EMULTILIB_PKG="true"
+
+DEPEND="app-arch/bzip2"
+RDEPEND=">=app-admin/eselect-1.0.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	mv opengl.eselect-${PV} opengl.eselect
+	mv glext.h-${GLEXT} glext.h
+	mv glxext.h-${GLXEXT} glxext.h
+}
+
+pkg_preinst() {
+	# It needs to be before 04multilib
+	[[ -f "${ROOT}/etc/env.d/09opengl" ]] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
+
+	OABI="${ABI}"
+	for ABI in $(get_install_abis); do
+		if [[ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]]
+		then
+			einfo "Removing libMesaGL.so from xorg-x11 profile. See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
+		fi
+		if [[ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]]
+		then
+			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
+		fi
+
+		for f in ${ROOT}/usr/$(get_libdir)/libGL.so.* ${ROOT}/usr/$(get_libdir)/libGLcore.so.* ${ROOT}/usr/$(get_libdir)/libnvidia-tls* ${ROOT}/usr/$(get_libdir)/tls/libnvidia-tls* ; do
+			[[ -e ${f} ]] && rm -f ${f}
+		done
+	done
+	ABI="${OABI}"
+	unset OABI
+}
+
+pkg_postinst() {
+	local impl="$(eselect opengl show)"
+	if [[ -n "${impl}" ]] ; then
+		eselect opengl set "${impl}"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins opengl.eselect
+
+	# Install default glext.h
+	insinto /usr/$(get_libdir)/opengl/global/include
+	doins ${WORKDIR}/glext.h || die
+	doins ${WORKDIR}/glxext.h || die
+}
diff --git a/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.6 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.6
new file mode 100644
index 000000000000..65f323f18a80
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.6
@@ -0,0 +1,9 @@
+MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
+RMD160 b21868b31524c2309658d65682b4528823126ae5 glext.h-29.bz2 33215
+SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0 glext.h-29.bz2 33215
+MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
+RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe glxext.h-11.bz2 5900
+SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0 glxext.h-11.bz2 5900
+MD5 ce0c5e10283e8836c99299f496e56acb opengl.eselect-1.0.6.bz2 3295
+RMD160 79ab635aeae9001cb4427db6532b17284b36d95e opengl.eselect-1.0.6.bz2 3295
+SHA256 50dfb50b9a4479524f34bcf0d421ec216dbab2c50def31fe208c186efe3d1b31 opengl.eselect-1.0.6.bz2 3295