Fixing bug #79539.

(Portage version: 2.0.51-r15)

5 files changed, 21 insertions, 22 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 3aa1b598a21e..5216f82b90b4 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.59 2005/01/25 01:13:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.60 2005/01/26 05:38:40 eradicator Exp $
+
+*opengl-update-2.1_pre2 (25 Jan 2005)
+
+  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1_pre1, +files/opengl-update-2.1_pre2,
+  -opengl-update-2.1_pre1.ebuild, +opengl-update-2.1_pre2.ebuild:
+  Fixing bug #79539.
 
 *opengl-update-2.1_pre1 (24 Jan 2005)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 593b8c3b926f..fee8056802bf 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 aa9d3d45162d00f2d519830de2e7934e ChangeLog 10709
 MD5 06e66398889b0eaf43fd1a634521bdb0 metadata.xml 318
 MD5 5b48e832f6c2794525ab473968ad7071 opengl-update-1.5.ebuild 525
 MD5 4e8eebd835dbf4f24182d7cce7af8ab7 opengl-update-1.7.2.ebuild 541
 MD5 020171f71e450cf568dac04eabd695f4 opengl-update-1.8.2.ebuild 1594
 MD5 8c379f3db72c5092a1aec955685a4a66 opengl-update-2.0_pre4-r1.ebuild 1742
-MD5 06f24b5d9691ed5e27d7f52ffe307e8a opengl-update-2.1_pre1.ebuild 2033
+MD5 06f24b5d9691ed5e27d7f52ffe307e8a opengl-update-2.1_pre2.ebuild 2033
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.2 64
@@ -15,13 +12,6 @@ MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre4-r1 64
 MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
 MD5 17ebb42dcebb9fcf0d717b135586fca3 files/opengl-update-1.8.2 8303
-MD5 a85413de6dcf27a5f354eb9972b535ce files/opengl-update-2.1_pre1 7465
 MD5 976b6bf00cfdfeaa6cdadbfd49cd2e95 files/opengl-update-2.0_pre4 9755
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9gEdArHZZzCEUG0RAjwaAJ9i9WW9IpbzrNrwHAVY9D2YMACeigCeIzXt
-8s38Cw0E/krCzxq7rIwRuJo=
-=mbOg
------END PGP SIGNATURE-----
+MD5 c3f4170619214e96ed02947019f4de9f files/opengl-update-2.1_pre2 7470
+MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre2 64
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre1 b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre2
index 23c2e8979086..23c2e8979086 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre1
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre2
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre1 b/x11-base/opengl-update/files/opengl-update-2.1_pre2
index 9071a75cf11d..a7bacf25bf83 100644
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre1
+++ b/x11-base/opengl-update/files/opengl-update-2.1_pre2
@@ -1,10 +1,11 @@
 #!/bin/bash
 # 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/files/opengl-update-2.1_pre1,v 1.2 2005/01/25 01:43:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre2,v 1.1 2005/01/26 05:38:40 eradicator Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
+# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
 
 . /etc/init.d/functions.sh
 
@@ -216,8 +217,6 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 					ln -s ${file}
 				fi
 			done
-
-			ln -s opengl/${GL_LOCAL}/lib/libGL.so libMesaGL.so
 		popd
 
 		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]; then
@@ -254,7 +253,7 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		fi
 
 		# Setup the includes
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/modules/includes" ]; then
+		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/include" ]; then
 			for x in gl.h glx.h glxtokens.h glext.h; do
 				if [ -e /usr/X11R6/include/GL/${x} ]; then
 					rm -f /usr/X11R6/include/GL/${x}
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre1.ebuild b/x11-base/opengl-update/opengl-update-2.1_pre2.ebuild
index d01d9122f083..ef4b087a841b 100644
--- a/x11-base/opengl-update/opengl-update-2.1_pre1.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.1_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1_pre1.ebuild,v 1.3 2005/01/25 08:19:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1_pre2.ebuild,v 1.1 2005/01/26 05:38:40 eradicator Exp $
 
 inherit multilib toolchain-funcs
 
@@ -35,9 +35,12 @@ pkg_preinst() {
 	OABI="${ABI}"
 	for ABI in $(get_abi_order); do
 		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL* from xorg-x11 profile.  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL*
-			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL*
+			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
 	done
 	ABI="${OABI}"