Fix the proper libdir in the .la. Cleaning out older versions.

Package-Manager: portage-2.0.51-r14

5 files changed, 19 insertions, 13 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 3354363e710e..9095390f8060 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.76 2005/01/21 21:14:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.77 2005/01/25 01:38:23 eradicator Exp $
+
+*nvidia-glx-1.0.6629-r4 (24 Jan 2005)
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/libGL.la-r1,
+  -nvidia-glx-1.0.6629-r3.ebuild, +nvidia-glx-1.0.6629-r4.ebuild:
+  Fix the proper libdir in the .la.  Cleaning out older versions.
 
   21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/libGL.la-r1,
   nvidia-glx-1.0.6629-r3.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index f845d6f7a8e9..e82fb4608730 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 012763d1868724fcd205b5f9f1fd7826 ChangeLog 16005
+MD5 3c3edb980a5f09dc2b18d41c697e187c ChangeLog 16253
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 f04cfe31611830254b47f3ba5e63689d nvidia-glx-1.0.6111.ebuild 5347
 MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
-MD5 feaa376b86657df4dab27d1c948208d0 nvidia-glx-1.0.6629-r3.ebuild 6448
+MD5 09b3c1d31511ad3585ba011654e9dfb2 nvidia-glx-1.0.6629-r4.ebuild 6458
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
-MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r3 163
-MD5 e9c401189106eb6f4fe81109da2ee44d files/libGL.la-r1 745
+MD5 2bdf3e45c38594e81f47df4e5322725d files/libGL.la-r1 740
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r4 163
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
@@ -21,7 +21,7 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB9YqyArHZZzCEUG0RAshiAJ0UkWOibDO3EkJhFiPWiCuYnKd3lACeMjsK
-sCD+tKtphhkEA29YiNqdQsI=
-=ffSl
+iD8DBQFB9aMeArHZZzCEUG0RAvbOAKCFz++vjSSovi1U6NGbToFClMIEEgCfQNPI
+Gx6mhd9I7T2bB+5IU3dAosw=
+=b0uA
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r3 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r4
index 9324510b4ef9..9324510b4ef9 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r3
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r4
diff --git a/media-video/nvidia-glx/files/libGL.la-r1 b/media-video/nvidia-glx/files/libGL.la-r1
index 7cef9dfbea0e..dfe5cd5544d4 100644
--- a/media-video/nvidia-glx/files/libGL.la-r1
+++ b/media-video/nvidia-glx/files/libGL.la-r1
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
+libdir='${libdir}'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r4.ebuild
index 32026d03af3e..0fef95a1bc4e 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-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/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild,v 1.5 2005/01/24 23:54:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r4.ebuild,v 1.1 2005/01/25 01:38:24 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -19,14 +19,14 @@ LICENSE="NVIDIA"
 SLOT="0"
 
 # This revision just changes behavior on amd64 2005.0
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-base/opengl-update-1.8.1
+	>=x11-base/opengl-update-2.1_pre1
 	~media-video/nvidia-kernel-${PV}
 	!app-emulation/emul-linux-x86-nvidia"
 
@@ -159,7 +159,7 @@ src_install-libs() {
 	    -e "s:\${ver1}:${ver1}:" \
 	    -e "s:\${ver2}:${ver2}:" \
 	    -e "s:\${ver3}:${ver3}:" \
-	    -e "s:\${libdir}:${inslibdir}:" \
+	    -e "s:\${libdir}:${NV_ROOT}/lib:" \
 	    ${FILESDIR}/libGL.la-r1 > ${D}/${NV_ROOT}/lib/libGL.la
 
 	# The GLX extension