Install OpenGL stuff to /usr/libdir/opengl/$PN/lib, not /usr/libdir/opengl/$PN/libdir. Again thanks to eradicator for the libdir advice.

Package-Manager: portage-2.0.51-r14

5 files changed, 24 insertions, 32 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 33247b2ff697..cd1689ad1009 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.292 2005/01/21 19:54:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.293 2005/01/21 21:26:46 spyderous Exp $
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Install OpenGL stuff to /usr/libdir/opengl/$PN/lib, not
+  /usr/libdir/opengl/$PN/libdir. Again thanks to eradicator for the libdir
+  advice.
 
   21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 6d4d58ea2c58..a5a47a13c0c6 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 085908a4a27edf2ec69fb1a34ffe931a ChangeLog 70123
-MD5 2c82f765cc96df7956d6202123af62a8 xorg-x11-6.8.1.901-r1.ebuild 52668
-MD5 0121ea587ac539af01c4adf030ca5c3c xorg-x11-6.8.0-r4.ebuild 52473
+MD5 3f4491e216ceb467cad9be02059df0bc ChangeLog 70409
+MD5 7c03bd31f914716aced554e8b999cba9 xorg-x11-6.8.1.901-r1.ebuild 52419
+MD5 335cd7553dff20977daff9463b623b51 xorg-x11-6.8.0-r4.ebuild 52224
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 14576ef12374154411f8b81da6cf9b82 xorg-x11-6.8.1.902.ebuild 52479
+MD5 f53c6ca27ebdb79c989692b59d08c36d xorg-x11-6.8.1.902.ebuild 52230
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index e45a3252b0f6..612156e5318f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.58 2005/01/21 19:54:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.59 2005/01/21 21:26:46 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1196,7 +1196,7 @@ etc_files_install() {
 setup_dynamic_libgl() {
 	# next section is to setup the dynamic libGL stuff
 	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${PN}/{$(get_libdir),extensions,include}
+		dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include}
 		local x=""
 		for x in ${D}/usr/$(get_libdir)/libGL.so* \
 			${D}/usr/$(get_libdir)/libGL.la \
@@ -1204,7 +1204,7 @@ setup_dynamic_libgl() {
 			${D}/usr/$(get_libdir)/libMesaGL.so; do
 			if [ -f ${x} -o -L ${x} ]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/$(get_libdir)
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
 			fi
 		done
 			for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do
@@ -1221,11 +1221,6 @@ setup_dynamic_libgl() {
 		# Since we added glext.h and don't have new opengl-update yet, do this
 		# Avoids circular opengl-update/xorg-x11 dependency
 		dosym ../../../$(get_libdir)/opengl/${PN}/include/glext.h /usr/X11R6/include/GL/
-		# Even if libdir isnt lib, we need a lib symlink for opengl-update and
-		# friends. See bug 62990 for more info.
-		if [ "$(get_libdir)" != "lib" ]; then
-			dosym $(get_libdir) /usr/$(get_libdir)/opengl/${PN}/lib
-		fi
 	eend 0
 }
 
@@ -1256,7 +1251,7 @@ strip_execs() {
 			fi
 		done
 		# Now do the libraries ...
-		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/$(get_libdir)}/*.so.* \
+		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \
 			$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
 			if [ -f ${x} ]; then
 				echo "$(echo ${x/${D}})"
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild
index 31f02f9ea19e..a72896914175 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.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/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild,v 1.11 2005/01/21 19:54:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild,v 1.12 2005/01/21 21:26:46 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1195,7 +1195,7 @@ etc_files_install() {
 setup_dynamic_libgl() {
 	# next section is to setup the dynamic libGL stuff
 	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${PN}/{$(get_libdir),extensions,include}
+		dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include}
 		local x=""
 		for x in ${D}/usr/$(get_libdir)/libGL.so* \
 			${D}/usr/$(get_libdir)/libGL.la \
@@ -1203,7 +1203,7 @@ setup_dynamic_libgl() {
 			${D}/usr/$(get_libdir)/libMesaGL.so; do
 			if [ -f ${x} -o -L ${x} ]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/$(get_libdir)
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
 			fi
 		done
 			for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do
@@ -1220,11 +1220,6 @@ setup_dynamic_libgl() {
 		# Since we added glext.h and don't have new opengl-update yet, do this
 		# Avoids circular opengl-update/xorg-x11 dependency
 		dosym ../../../$(get_libdir)/opengl/${PN}/include/glext.h /usr/X11R6/include/GL/
-		# Even if libdir isnt lib, we need a lib symlink for opengl-update and
-		# friends. See bug 62990 for more info.
-		if [ "$(get_libdir)" != "lib" ]; then
-			dosym $(get_libdir) /usr/$(get_libdir)/opengl/${PN}/lib
-		fi
 	eend 0
 }
 
@@ -1255,7 +1250,7 @@ strip_execs() {
 			fi
 		done
 		# Now do the libraries ...
-		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/$(get_libdir)}/*.so.* \
+		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \
 			$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
 			if [ -f ${x} ]; then
 				echo "$(echo ${x/${D}})"
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
index 4adff898c4c1..1605a80a89f4 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902.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/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.16 2005/01/21 19:54:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.17 2005/01/21 21:26:46 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1195,7 +1195,7 @@ etc_files_install() {
 setup_dynamic_libgl() {
 	# next section is to setup the dynamic libGL stuff
 	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${PN}/{$(get_libdir),extensions,include}
+		dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include}
 		local x=""
 		for x in ${D}/usr/$(get_libdir)/libGL.so* \
 			${D}/usr/$(get_libdir)/libGL.la \
@@ -1203,7 +1203,7 @@ setup_dynamic_libgl() {
 			${D}/usr/$(get_libdir)/libMesaGL.so; do
 			if [ -f ${x} -o -L ${x} ]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/$(get_libdir)
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
 			fi
 		done
 			for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do
@@ -1220,11 +1220,6 @@ setup_dynamic_libgl() {
 		# Since we added glext.h and don't have new opengl-update yet, do this
 		# Avoids circular opengl-update/xorg-x11 dependency
 		dosym ../../../$(get_libdir)/opengl/${PN}/include/glext.h /usr/X11R6/include/GL/
-		# Even if libdir isnt lib, we need a lib symlink for opengl-update and
-		# friends. See bug 62990 for more info.
-		if [ "$(get_libdir)" != "lib" ]; then
-			dosym $(get_libdir) /usr/$(get_libdir)/opengl/${PN}/lib
-		fi
 	eend 0
 }
 
@@ -1255,7 +1250,7 @@ strip_execs() {
 			fi
 		done
 		# Now do the libraries ...
-		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/$(get_libdir)}/*.so.* \
+		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \
 			$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
 			if [ -f ${x} ]; then
 				echo "$(echo ${x/${D}})"