Remove X11R6 in .la so dependency_libs just uses /usr/lib.

(Portage version: 2.0.51-r15)

4 files changed, 10 insertions, 39 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index d7034e9f5a4a..80b14c386104 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.80 2005/02/09 10:27:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.81 2005/02/09 10:54:56 eradicator Exp $
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la-r1,
+  files/libGL.la-r2, nvidia-glx-1.0.6629-r5.ebuild:
+  Remove X11R6 in .la so dependency_libs just uses /usr/lib.
 
 *nvidia-glx-1.0.6629-r5 (09 Feb 2005)
 
diff --git a/media-video/nvidia-glx/files/libGL.la-r1 b/media-video/nvidia-glx/files/libGL.la-r1
deleted file mode 100644
index dfe5cd5544d4..000000000000
--- a/media-video/nvidia-glx/files/libGL.la-r1
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/${libdir} -lm -lX11 -lXext -ldl     '
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='${libdir}'
diff --git a/media-video/nvidia-glx/files/libGL.la-r2 b/media-video/nvidia-glx/files/libGL.la-r2
index 21b6562f5335..ef8d5cc56e0a 100644
--- a/media-video/nvidia-glx/files/libGL.la-r2
+++ b/media-video/nvidia-glx/files/libGL.la-r2
@@ -14,7 +14,7 @@ library_names='libGL.so.${PV} libGL.so.1 libGL.so'
 old_library=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/${xlibdir} -lm -lX11 -lXext -ldl     '
+dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
 
 # Version information for libGL.
 current=${ver1}
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='${libdir}'
+libdir='/usr/${libdir}/opengl/nvidia/lib'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
index 27c51194b871..61b56a175245 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.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/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild,v 1.1 2005/02/09 10:27:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild,v 1.2 2005/02/09 10:54:56 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -26,7 +26,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-base/opengl-update-2.1_pre1
+	>=x11-base/opengl-update-2.1.0
 	~media-video/nvidia-kernel-${PV}
 	!app-emulation/emul-linux-x86-nvidia"
 
@@ -159,8 +159,7 @@ src_install-libs() {
 	    -e "s:\${ver1}:${ver1}:" \
 	    -e "s:\${ver2}:${ver2}:" \
 	    -e "s:\${ver3}:${ver3}:" \
-		-e "s:\${xlibdir}:${inslibdir}:" \
-	    -e "s:\${libdir}:${NV_ROOT}/lib:" \
+	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
 	# The X module