Fixed misinstalling libglx extension.

(Portage version: 2.0.51-r15)

5 files changed, 20 insertions, 24 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 5216f82b90b4..265dad44b7d8 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,13 +1,14 @@
 # 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.60 2005/01/26 05:38:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.61 2005/01/26 05:59:52 eradicator Exp $
 
-*opengl-update-2.1_pre2 (25 Jan 2005)
+*opengl-update-2.1_pre3 (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.
+  -files/opengl-update-2.1_pre1, +files/opengl-update-2.1_pre3,
+  -opengl-update-2.1_pre1.ebuild, +opengl-update-2.1_pre3.ebuild:
+  Fixing bug #79539.  Fix misinstalling libglx.  Don't symlink libMesaGL.
+  Remove libMesaGL on preinst.
 
 *opengl-update-2.1_pre1 (24 Jan 2005)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 53cc7fdd9efb..4f4a8319c747 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 482da043e395ab3a42d8deca06ff07dc ChangeLog 10957
+MD5 de7ee349f4ee753a4f7ab9984e7c77a8 ChangeLog 11041
 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 edea77c76beade4774d1fbd516b557e5 opengl-update-2.1_pre2.ebuild 2178
+MD5 edea77c76beade4774d1fbd516b557e5 opengl-update-2.1_pre3.ebuild 2178
 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
@@ -16,12 +13,5 @@ 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 976b6bf00cfdfeaa6cdadbfd49cd2e95 files/opengl-update-2.0_pre4 9755
-MD5 fdd1d25c9209087520b26e3f2414df78 files/opengl-update-2.1_pre2 7470
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9y0PArHZZzCEUG0RAt3gAJ4zv7+Nxpw/t10d6IzQSgre1nUSIACfURw3
-esP+hWObZgVlVIyQx+3gY0E=
-=JnKH
------END PGP SIGNATURE-----
+MD5 964c441a1c32ef7523f42e81c5b07eb7 files/opengl-update-2.1_pre3 7458
+MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre3 64
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre2 b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre3
index 23c2e8979086..23c2e8979086 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre2
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre3
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre2 b/x11-base/opengl-update/files/opengl-update-2.1_pre3
index a7bacf25bf83..6c4d2640e7e0 100644
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre2
+++ b/x11-base/opengl-update/files/opengl-update-2.1_pre3
@@ -1,7 +1,7 @@
 #!/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_pre2,v 1.1 2005/01/26 05:38:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre3,v 1.1 2005/01/26 05:59:52 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>
@@ -200,7 +200,7 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		pushd /usr/${LIBDIR}
 			# First remove old symlinks
 			for file in libGL.so* libGLcore.so* libnvidia-tls.so*  tls/libnvidia-tls.so*; do
-				rm -f ${file}
+				[ -h ${file} ] && rm -f ${file}
 			done
 
 			# Note that we don't do .so*, just .so on purpose.  The
@@ -235,10 +235,15 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 			popd
 		fi
 
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/modules/extensions" ]; then
+		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]; then
 			mkdir -p /usr/${LIBDIR}/modules/extensions
 			pushd /usr/${LIBDIR}/modules/extensions
-				for file in ../../opengl/${GL_LOCAL}/lib/extensions/*.{so,a,la}; do
+				# First remove old symlinks
+				for file in libglx.so libglx.a; do
+					[ -h ${file} ] && rm -f ${file}
+				done
+
+				for file in ../../opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
 					[ -f "${file}" ] || continue
 					rm -f $(basename ${file})
 
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre2.ebuild b/x11-base/opengl-update/opengl-update-2.1_pre3.ebuild
index ef4b087a841b..81528738b291 100644
--- a/x11-base/opengl-update/opengl-update-2.1_pre2.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.1_pre3.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_pre2.ebuild,v 1.1 2005/01/26 05:38:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1_pre3.ebuild,v 1.1 2005/01/26 05:59:52 eradicator Exp $
 
 inherit multilib toolchain-funcs