Making /usr/lib/tls back into a directory again, for future compatibility

7 files changed, 30 insertions, 57 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 2f034b483f1d..39a97e76eaa6 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.35 2004/07/18 01:31:56 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.36 2004/07/18 02:51:17 cyfred Exp $
+
+*opengl-update-1.8.1 (18 Jul 2004)
+
+  18 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/opengl-update-1.8,
+  +files/opengl-update-1.8.1, -opengl-update-1.8-r1.ebuild,
+  +opengl-update-1.8.1.ebuild, -opengl-update-1.8.ebuild:
+  Making /usr/lib/tls back into a directory again, for future compatibility
 
   18 Jul 2004; Bart Lauwers <blauwers@gentoo.org> opengl-update-1.8.ebuild:
   Corrected typo.
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 74635d526545..7f0a7a3c1b6e 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,17 +1,15 @@
-MD5 6f1eab7ccbf9257d8c324ddaf15dcbe4 ChangeLog 5943
+MD5 dee0288d8dc8bbcebde88b65394a0cf3 opengl-update-1.8.1.ebuild 1397
+MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
+MD5 6e0cc69782ef253b67a33e40723de5fc ChangeLog 6248
 MD5 c3cadbedd505ea68c030746be518104e metadata.xml 322
-MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
 MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
-MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
-MD5 0867dd00b69a47bfd11e1bee96cbddbf opengl-update-1.8.ebuild 1164
-MD5 5d1870cbb2e8519b3069875796cd66f0 opengl-update-1.8-r1.ebuild 1398
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
+MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
+MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
+MD5 9cbc21fd5c6a3d82256a3fd44d4acac8 files/opengl-update-1.8.1 7766
+MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8 0
 MD5 8318429d1d44e5439b53280cac4ff461 files/glext.h-20040714 304594
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
-MD5 68834971401015e11a498c9b82f87730 files/opengl-update-1.8 7431
-MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8-r1 0
-MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8.1 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8-r1 b/x11-base/opengl-update/files/digest-opengl-update-1.8-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.8-r1
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8 b/x11-base/opengl-update/files/digest-opengl-update-1.8.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-1.8
+++ b/x11-base/opengl-update/files/digest-opengl-update-1.8.1
diff --git a/x11-base/opengl-update/files/opengl-update-1.8 b/x11-base/opengl-update/files/opengl-update-1.8.1
index 8bf0040118d4..e0dba65cb2f2 100644
--- a/x11-base/opengl-update/files/opengl-update-1.8
+++ 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,v 1.1 2004/07/17 03:25:31 cyfred Exp $
+# $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 $
 # 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>
@@ -181,10 +181,14 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		fi
 
 		# Setup nvidia tls symlinks (if necessary)
-		if [ -e /usr/${LIBDIR}/tls ]
+		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
 		if [ -e /usr/${LIBDIR}/libnvidia-tls.so ]
 		then
 			rm -f /usr/${LIBDIR}/libnvidia-tls.so
@@ -193,9 +197,13 @@ ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
 		then
 			rm -f /usr/${LIBDIR}/libnvidia-tls.so.1
 		fi
-		if [ -d /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls ]
+		if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1 ]
 		then
-			ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls /usr/${LIBDIR}/tls
+			realtls="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1)"
+			ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
+				/usr/${LIBDIR}/tls/libnvidia-tls.so
+			ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
+				/usr/${LIBDIR}/tls/libnvidia-tls.so.1
 		fi
 		if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libnvidia-tls.so.1 ]
 		then
diff --git a/x11-base/opengl-update/opengl-update-1.8-r1.ebuild b/x11-base/opengl-update/opengl-update-1.8.1.ebuild
index 8f39cc99c75d..f039fa3ece1f 100644
--- a/x11-base/opengl-update/opengl-update-1.8-r1.ebuild
+++ b/x11-base/opengl-update/opengl-update-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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/opengl-update-1.8-r1.ebuild,v 1.2 2004/07/17 14:13:15 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.1.ebuild,v 1.1 2004/07/18 02:51:17 cyfred Exp $
 
 DESCRIPTION="Utility to change the OpenGL interface being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/x11-base/opengl-update/opengl-update-1.8.ebuild b/x11-base/opengl-update/opengl-update-1.8.ebuild
deleted file mode 100644
index 554dffde4ffd..000000000000
--- a/x11-base/opengl-update/opengl-update-1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/opengl-update-1.8.ebuild,v 1.3 2004/07/18 01:31:56 blauwers Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-GLEXT="20040714"
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	if ( has_version "x11-base/xfree" || has_version "<x11-base/xorg-x11-6.7.0-r2" )
-	then
-		echo
-		ewarn "This version of opengl-update is designed for use with xorg-x11-6.7.0-r2"
-		ewarn "Please mask this version of opengl-update by doing the following"
-		echo
-		ewarn "echo \"=x11-base/opengl-update-1.8\" >> /etc/portage/package.mask"
-		echo
-		ewarn "Alternatively you can upgrade your system to x11-base/xorg-x11-6.7.0-r2"
-		echo
-
-		die "Please mask this pacakge"
-	fi
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	newins ${FILESDIR}/glext.h-${GLEXT} glext.h || die
-}