Fix bug where symlinks aren't made in lib32 if lib32 is a symlink to the emul dir.

(Portage version: 2.0.51-r15)

5 files changed, 16 insertions, 17 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 265dad44b7d8..fe6c926931c7 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +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.61 2005/01/26 05:59:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.62 2005/01/27 01:49:27 eradicator Exp $
+
+*opengl-update-2.1_pre4 (26 Jan 2005)
+
+  26 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1_pre3, +files/opengl-update-2.1_pre4,
+  -opengl-update-2.1_pre3.ebuild, +opengl-update-2.1_pre4.ebuild:
+  Fix bug where symlinks aren't made in lib32 if lib32 is a symlink to the
+  emul dir.
 
 *opengl-update-2.1_pre3 (25 Jan 2005)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 7851a2560385..cc9953fa7627 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 725852c0acef490680bee70ddfa0c659 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 4c924ef13a9b1be12f94686ac699882b opengl-update-2.1_pre3.ebuild 2178
+MD5 4c924ef13a9b1be12f94686ac699882b opengl-update-2.1_pre4.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 da6cb7046d70c560fd536c5742040ff3 files/opengl-update-2.1_pre3 7594
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9zHhArHZZzCEUG0RAi8iAKCBkXdwn9wapym8OCuTN0345Pm99wCeP6MC
-yNeEtncymyAchgZ4WL1J7xI=
-=5kvv
------END PGP SIGNATURE-----
+MD5 5ee9fd99236712f0771b0578d281dddd files/opengl-update-2.1_pre4 7611
+MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre4 64
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre3 b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre4
index 23c2e8979086..23c2e8979086 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre3
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre4
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre3 b/x11-base/opengl-update/files/opengl-update-2.1_pre4
index 6c4d2640e7e0..33b850c6b347 100644
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre3
+++ b/x11-base/opengl-update/files/opengl-update-2.1_pre4
@@ -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_pre3,v 1.1 2005/01/26 05:59:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre4,v 1.1 2005/01/27 01:49:27 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>
@@ -172,7 +172,8 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 
 	LIBDIRS="lib lib32 lib64"
 	for LIBDIR in ${LIBDIRS}; do
-		[ -d "/usr/${LIBDIR}" -a ! -h "/usr/${LIBDIR}" ] || continue
+		[ "${LIBDIR}" = "lib32" ] || [ -d "/usr/${LIBDIR}" -a ! -h "/usr/${LIBDIR}" ] || continue
+
 		# System wide tls stuff
 		[ -h "/usr/${LIBDIR}/tls" ] && rm -f /usr/${LIBDIR}/tls
 		[ -d "/usr/${LIBDIR}/tls" ] || mkdir -p /usr/${LIBDIR}/tls
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre3.ebuild b/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild
index 81528738b291..eac307336d97 100644
--- a/x11-base/opengl-update/opengl-update-2.1_pre3.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.1_pre4.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_pre3.ebuild,v 1.1 2005/01/26 05:59:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild,v 1.1 2005/01/27 01:49:27 eradicator Exp $
 
 inherit multilib toolchain-funcs