Bumped versions of glxext.h and glext.h. Closes bug #201048

Package-Manager: portage-2.1.4_rc9

3 files changed, 103 insertions, 3 deletions

diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index f5859cdcea76..09cf02647c85 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -2,13 +2,19 @@
 Hash: SHA1
 
 DIST glext.h-29.bz2 33215 RMD160 b21868b31524c2309658d65682b4528823126ae5 SHA1 4635a7a73169e6516fbf4d214b36352568fad24e SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0
+DIST glext.h-39.bz2 36955 RMD160 0b2c571fa8c5ebaeac82637164556bcda0b9af04 SHA1 4766c179d4605457715429b3feba0be6e8a97aef SHA256 d11cbde20bb0ff44ff11e0045c92039721487d9a1bc85c2b4f3ee9a76e662eb1
 DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA1 51dc76e10814a7b990086bc013c2ac0e5e06631d SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0
+DIST glxext.h-19.bz2 6234 RMD160 fdeac6930b4fd70d88fe44f56a029cc466673aaf SHA1 d1dfd98dc5c565f83a798adffb82d4c8f751ce5a SHA256 00a15ec18e586335c3d045b42efe419c5c5383855b2ce4036a1cac3acef21fab
 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
+EBUILD eselect-opengl-1.0.6-r1.ebuild 2259 RMD160 e2ffdac9644b91806b27a35d82f5a2853978fe82 SHA1 f1f1a994151a072b2b2a736ffda6b7d3a142a422 SHA256 1137d122f31d74101acaf10382fc3d66dd298d590af6618970af7af0d63ad094
+MD5 5b4d982e69ac6457bec8a1280792c15e eselect-opengl-1.0.6-r1.ebuild 2259
+RMD160 e2ffdac9644b91806b27a35d82f5a2853978fe82 eselect-opengl-1.0.6-r1.ebuild 2259
+SHA256 1137d122f31d74101acaf10382fc3d66dd298d590af6618970af7af0d63ad094 eselect-opengl-1.0.6-r1.ebuild 2259
 EBUILD eselect-opengl-1.0.6.ebuild 2206 RMD160 448c5ac594d4874ba9c507236db7a7d33adc6146 SHA1 847270e637c0e7c4ec1f820031971c50967ab7bb SHA256 607dadff3f56fcf00dc1d3fabcf2308b67016fa0e037c47a87817ca2c780717e
 MD5 027f8423fee446551fc3554d7e5f18f6 eselect-opengl-1.0.6.ebuild 2206
 RMD160 448c5ac594d4874ba9c507236db7a7d33adc6146 eselect-opengl-1.0.6.ebuild 2206
@@ -27,10 +33,13 @@ SHA256 5f2e6400107f8708b782f2233e1d1299870dad53950de56f90c98d3970b3c1d5 files/di
 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
+MD5 7badb82094a25bc101b5288154b97763 files/digest-eselect-opengl-1.0.6-r1 687
+RMD160 ecf46d81d0daa5053e82a25f35fe92bfc8193845 files/digest-eselect-opengl-1.0.6-r1 687
+SHA256 863f5d47347c8108daa2a848ef8fad9b6944cd0ca18722436768e16bf9fdf53f files/digest-eselect-opengl-1.0.6-r1 687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHK65g/ejvha5XGaMRAkSHAKDFa5LFzvFFSWsIwTz/YMT0vHt2YQCeIAUd
-bUmc+MJYOvQkGwE1M8EibpQ=
-=ceXe
+iD8DBQFHZ/sZjC1Anjf1NmMRAkBaAJ0a4hQNh6oElrFxtWG2+gykn1jyCwCfdJKT
+5gD6C3eHRnxIaank8NXggdI=
+=J7Xj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..6127b8a3e937
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild
@@ -0,0 +1,82 @@
+# 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-r1.ebuild,v 1.1 2007/12/18 16:53:22 eradicator Exp $
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://www.opengl.org/registry/api/glext.h
+# http://www.opengl.org/registry/api/glxext.h
+
+GLEXT="39"
+GLXEXT="19"
+
+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"
+# -* to give time for headers to hit mirrors...
+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-r1 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.6-r1
new file mode 100644
index 000000000000..b06728b52ad6
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.6-r1
@@ -0,0 +1,9 @@
+MD5 1b6cabd4ee6271b72586e14a4566cbd4 glext.h-39.bz2 36955
+RMD160 0b2c571fa8c5ebaeac82637164556bcda0b9af04 glext.h-39.bz2 36955
+SHA256 d11cbde20bb0ff44ff11e0045c92039721487d9a1bc85c2b4f3ee9a76e662eb1 glext.h-39.bz2 36955
+MD5 fcaedf0982135ada0e83378ad4725898 glxext.h-19.bz2 6234
+RMD160 fdeac6930b4fd70d88fe44f56a029cc466673aaf glxext.h-19.bz2 6234
+SHA256 00a15ec18e586335c3d045b42efe419c5c5383855b2ce4036a1cac3acef21fab glxext.h-19.bz2 6234
+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