Version bump to fix bugs 228547 (broken symlinks) and 261498 (relative path usage). Also fixes issue with file collisions for binary drivers per bug 274959.

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

3 files changed, 100 insertions, 2 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index c28c35efe6e6..0d76f74ded25 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.44 2009/06/23 11:40:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.45 2009/06/23 14:23:57 scarabeus Exp $
+
+*eselect-opengl-1.0.7 (23 Jun 2009)
+
+  23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +eselect-opengl-1.0.7.ebuild:
+  Version bump to fix bugs 228547 (broken symlinks) and 261498 (relative
+  path usage). Also fixes issue with file collisions for binary drivers per
+  bug 274959.
 
   23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   eselect-opengl-1.0.5.ebuild, eselect-opengl-1.0.6.ebuild,
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 50026c01df51..e673ed6b2aff 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -1,11 +1,15 @@
 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 glext.h-52.bz2 44019 RMD160 8dca1c2489c9e1ada25d2fb167e30f3a01674ea2 SHA1 9492f35a65fd3e2a787cc31f95a24b6a571c6193 SHA256 5473ec70921fe2ebb2edca0fb410720ecc973eb537629ff01a8b1db535d230b2
 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 glxext.h-21.bz2 6526 RMD160 794e5ee97bf2ab6a69099ea996fa7314d05a7ee3 SHA1 64c3e1c756275938e6cc72a93ea2d8b710a1c3ba SHA256 55748b91c84b442625f66690268117ddf757b11bde279ca26ad40b3322baba2c
 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
+DIST opengl.eselect-1.0.7.bz2 3223 RMD160 d79fb3a5a6949ec210cf2b664e816e8c3fca68ab SHA1 fae2cc19da822059325d36a3831e9cd0b3151fa2 SHA256 eb30d15068f8fd68a03d1b8d238a33def991cc8a07408b6279bcc1d9376a5892
 EBUILD eselect-opengl-1.0.5.ebuild 2242 RMD160 6d0187213568373707c21f9336a7eb3ae153c21c SHA1 70c024f32fe3de0a5c4183bec4a00126fb0b1311 SHA256 4655391cf9fa2ac4a8284e057745a5514a32f258b082dfaba471fef2b7a64fbc
 EBUILD eselect-opengl-1.0.6-r1.ebuild 2293 RMD160 31867bd28b68082a70688c93a58edbaf1a111067 SHA1 4c2b4aa2b6da5aa547cdbd19406b82706f22c1e5 SHA256 2a7a19a6e530e384cd05f77d99d593a4a6fc1513c2cf47e3f08c5b195c8603e0
 EBUILD eselect-opengl-1.0.6.ebuild 2254 RMD160 734a54dde80a055304fdbfbe9b28ab2ae0960c6c SHA1 4a946c19614a5460e871cff80c513ba39274ab13 SHA256 fbfc06fb5c1cc814633efea0fe51b459d85772872cc43909fed1935885644039
-MISC ChangeLog 6755 RMD160 a3e7f3505a0e585aa7c535d45ff9c2c284f021e7 SHA1 e3c2fe0a65e4bc791e72ba65b4c3c50c289c1c75 SHA256 b183555e29a4d6ec2db55af938af7b7003f995ac3aecf1e65dd1362d3876c8f6
+EBUILD eselect-opengl-1.0.7.ebuild 2433 RMD160 71606eefa09bcc3809a2b753870d740da7d5ed8d SHA1 9f2661b796bd15a6078f474bbe77495412c60cc1 SHA256 ff1acb99f07cf88d4e35d84215f4aba01ba3ba2046f28dfe6c2b2935a6f9026c
+MISC ChangeLog 7043 RMD160 c4d55bba8362e1295877a4f2bfbb0997bbd44abe SHA1 42107b55fec24804b8cbe8812c9f2ac047062fc1 SHA256 da187af172754bd7d573f203208b7066c54daded5dde6b7e67d1deab5c7cc8f7
 MISC metadata.xml 267 RMD160 134d8d149c085f4a86cbab5e5803acdf7e638958 SHA1 5fe588fe5035811f3e5d1953f20ff44bdd983f7d SHA256 4bdfc9f7a79a41e9524633f6d8c966cd62a2902cf2aae61a30c5ac45805ee7cb
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild
new file mode 100644
index 000000000000..7155076398e1
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/06/23 14:23:57 scarabeus 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="52"
+GLXEXT="21"
+
+# one day is too much for me to wait, unmask this tomorow
+# @ 23.6.09
+#MIRROR="mirror://gentoo/"
+MIRROR="http://dev.gentooexperimental.org/~scarabeus/"
+SRC_URI="${MIRROR}/glext.h-${GLEXT}.bz2
+	${MIRROR}/glxext.h-${GLXEXT}.bz2
+	${MIRROR}/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}"  && "${impl}" != '(none)' ]] ; 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
+}