Adding some checking on amd64 to save 32bit systems and install links properly.

3 files changed, 37 insertions, 15 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 7e4d29708015..6ac9b1442331 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.37 2004/07/18 19:16:48 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.38 2004/07/19 05:39:21 cyfred Exp $
+
+  19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; files/opengl-update-1.8.1:
+  Slight check added to make amd64 stuff more sensical.
 
   18 Jul 2004; Travis Tilley <lv@gentoo.org> opengl-update-1.8.1.ebuild:
   marking opengl-update 1.8.1 stable on amd64 so that i can un-break nvidia-glx
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index fe30f0d57dc4..2407da63f719 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,15 +1,15 @@
+MD5 673065d2d80258eb99834fd9099c7562 opengl-update-1.8.1.ebuild 1392
 MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
-MD5 af5840c9e63291d2c8aa9f12a70a453a ChangeLog 6398
+MD5 2b297cee42eba906321d863d91771c6e ChangeLog 6536
 MD5 c3cadbedd505ea68c030746be518104e metadata.xml 322
 MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
 MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
-MD5 673065d2d80258eb99834fd9099c7562 opengl-update-1.8.1.ebuild 1392
 MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
+MD5 e167f464da278c0b5cbc93f2c66cef4d files/opengl-update-1.8.1 8120
 MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
+MD5 8318429d1d44e5439b53280cac4ff461 files/glext.h-20040714 304594
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8.1 0
-MD5 9cbc21fd5c6a3d82256a3fd44d4acac8 files/opengl-update-1.8.1 7766
-MD5 8318429d1d44e5439b53280cac4ff461 files/glext.h-20040714 304594
diff --git a/x11-base/opengl-update/files/opengl-update-1.8.1 b/x11-base/opengl-update/files/opengl-update-1.8.1
index e0dba65cb2f2..3ed5882683f2 100644
--- a/x11-base/opengl-update/files/opengl-update-1.8.1
+++ b/x11-base/opengl-update/files/opengl-update-1.8.1
@@ -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-1.8.1,v 1.1 2004/07/18 02:51:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.8.1,v 1.2 2004/07/19 05:39:21 cyfred 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>
@@ -118,6 +118,10 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		if [ ${?} = 0 ]
 		then
 			ln -sf /usr/lib/opengl/${GL_IMPLEM}/tls /usr/lib/opengl/${GL_IMPLEM}/lib/tls
+			if [ -d /usr/lib32/opengl/${GL_IMPLEM} ]
+			then
+				ln -sf /usr/lib32/opengl/${GL_IMPLEM}/tls /usr/lib32/opengl/${GL_IMPLEM}/lib/tls
+			fi
 		fi
 	fi
 	
@@ -129,7 +133,30 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		source /etc/env.d/09opengl
 		echo "LDPATH=${LDPATH}:/usr/lib32/opengl/${GL_IMPLEM}/lib" > /etc/env.d/09opengl
 		unset LDPATH
+
+		# We also need to make TLS directories now aswell, make 32bit one here
+		lib32="$(readlink /usr/lib32)"
+		if [ -h ${lib32}/tls ]
+		then
+			rm -f ${lib32}/tls
+		fi
+		if [ ! -d ${lib32}/tls ]
+		then
+			mkdir -p ${lib32}/tls
+		fi
+			
+	fi
+
+	# System wide tls stuff
+	if [ -h /usr/lib/tls ]
+	then
+		rm -f /usr/lib/tls
+	fi
+	if [ ! -d /usr/lib/tls ] 
+	then
+		mkdir -p /usr/lib/tls
 	fi
+	
 	/usr/sbin/env-update &>/dev/null
 
 	LIBDIRS="lib lib32"
@@ -180,15 +207,7 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 				/usr/${LIBDIR}/libGLcore.so.1
 		fi
 
-		# Setup nvidia tls symlinks (if necessary)
-		if [ -h /usr/${LIBDIR}/tls ]
-		then
-			rm -f /usr/${LIBDIR}/tls
-		fi
-		# Make the directory 
-		mkdir -p /usr/${LIBDIR}/tls
-
-		# Now setup the library links
+		# Now setup the TLS library links
 		if [ -e /usr/${LIBDIR}/libnvidia-tls.so ]
 		then
 			rm -f /usr/${LIBDIR}/libnvidia-tls.so