Updates for 6111 to work with xorg-x11-6.8.0-r4

4 files changed, 24 insertions, 18 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index d47bf4c71a69..e10833f79a91 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.78 2005/01/26 06:23:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.79 2005/01/28 23:02:56 cyfred Exp $
+
+*nvidia-glx-1.0.6111-r1 (29 Jan 2005)
+
+  29 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
+  +nvidia-glx-1.0.6111-r1.ebuild, -nvidia-glx-1.0.6111.ebuild:
+  Updating 6111 to work with >=xorg-x11-6.8.0-r4
 
   25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   nvidia-glx-1.0.6629-r4.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 820d8525e8e8..e4a85d4eb5af 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 23b5ab982a11f1b9813b159a7d39342c ChangeLog 16447
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 f04cfe31611830254b47f3ba5e63689d nvidia-glx-1.0.6111.ebuild 5347
+MD5 f7e990b2b3128b84715f5cbc2e0cf15b nvidia-glx-1.0.6111-r1.ebuild 5582
 MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
 MD5 3caddf22ca4f5d5dcb5acddfb60dc065 nvidia-glx-1.0.6629-r4.ebuild 6627
 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 2bdf3e45c38594e81f47df4e5322725d files/libGL.la-r1 740
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111 163
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
 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
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
 MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9zeGArHZZzCEUG0RAonHAJwIzGFrXN6ceRuHSz03EJYbEpucfQCfYda/
-6BO1IUcVtApBsV7YVV7cAfc=
-=Cf9c
------END PGP SIGNATURE-----
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111-r1
index 891f45379b0a..891f45379b0a 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111-r1
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild
index da401e059d25..25ad6899edc0 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-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/media-video/nvidia-glx/nvidia-glx-1.0.6111.ebuild,v 1.5 2005/01/10 21:51:14 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild,v 1.1 2005/01/28 23:02:56 cyfred Exp $
 
 inherit eutils
 
@@ -82,7 +82,15 @@ src_install() {
 	local NV_ROOT="/usr/lib/opengl/nvidia"
 
 	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
+		local X11_LIB_DIR="/usr/$(get_libdir)"
+	else
+		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
+	fi
+
+	# The X module
+	exeinto ${X11_LIB_DIR}/modules/drivers
 	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
 
 	# The GLX extension
@@ -114,9 +122,9 @@ src_install() {
 	doexe usr/bin/tls_test
 	doexe usr/bin/tls_test_dso.so
 
-	insinto /usr/X11R6/lib
+	insinto ${X11_LIB_DIR}
 	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
+	exeinto ${X11_LIB_DIR}
 	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h