xorg dep update

4 files changed, 151 insertions, 14 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 8e790a33cd41..4a34c8ecd23b 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.38 2004/04/08 05:14:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.39 2004/04/08 10:25:34 lv Exp $
+
+*nvidia-glx-1.0.5332-r2 (08 Apr 2004)
+
+  08 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild:
+  added amd64-specific ebuild with Donnie Berkholz's xorg-x11 compatibility
+  update
 
 *nvidia-glx-1.0.5336-r2 (08 Apr 2004)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 4e3c27ccf68d..9e925ba4d092 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,4 +1,5 @@
 MD5 f7b4fa2f31f11a9a027c17bae159d668 ChangeLog 6104
+MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
 MD5 0191a83e40ea1310e7feb19ef6261fb7 nvidia-glx-1.0.2880.ebuild 2569
 MD5 218d60d52500ff0dab705766cdcbfab2 nvidia-glx-1.0.2960-r1.ebuild 2613
 MD5 6b1fb591f57a7363c199e29911f1d782 nvidia-glx-1.0.3123.ebuild 2548
@@ -7,17 +8,18 @@ MD5 c03e64a5834a617bf0bc176cbcc831ec nvidia-glx-1.0.4191-r1.ebuild 2669
 MD5 ce80be748a63b9e71aae96a9b85952e2 nvidia-glx-1.0.4191.ebuild 2548
 MD5 7b1a1785b9d24fe67f230601a4ba6bb5 nvidia-glx-1.0.4349.ebuild 3009
 MD5 2d52a6d652e7b3df9ba1b83fde9c443a nvidia-glx-1.0.4363.ebuild 2946
+MD5 342683e396a2f3a19bb03240946f2b14 nvidia-glx-1.0.4496-r1.ebuild 3037
 MD5 3ddaaf5939e64ff9eb5e5e00060767d9 nvidia-glx-1.0.4496.ebuild 3008
 MD5 3df4c8fd0ec98502ade783f2d9567485 nvidia-glx-1.0.4499.ebuild 2679
-MD5 342683e396a2f3a19bb03240946f2b14 nvidia-glx-1.0.4496-r1.ebuild 3037
-MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
 MD5 90bf90f7f4b0eef05810db5216ba2a8f nvidia-glx-1.0.5328-r1.ebuild 3066
 MD5 bb24a68c07f4b9c27f9d115a3aaf72dd nvidia-glx-1.0.5328.ebuild 3034
-MD5 788abca9476f13a2fdbae77cdee11dab nvidia-glx-1.0.5332.ebuild 3327
-MD5 82612c8316b5a04ad33ff58d93bc5c22 nvidia-glx-1.0.5336.ebuild 3073
 MD5 cc7765cbbc24ec65578455f83e69b77c nvidia-glx-1.0.5332-r1.ebuild 3327
+MD5 788abca9476f13a2fdbae77cdee11dab nvidia-glx-1.0.5332.ebuild 3327
 MD5 3d890ba89122ea4c48816cfab255a293 nvidia-glx-1.0.5336-r1.ebuild 3076
 MD5 b4564e382e88152183bfb6381e8973f4 nvidia-glx-1.0.5336-r2.ebuild 3229
+MD5 82612c8316b5a04ad33ff58d93bc5c22 nvidia-glx-1.0.5336.ebuild 3073
+MD5 ffe55da6d794a343c7f6a3800f31d72f .nvidia-glx-1.0.5332-r1.ebuild.swp 12288
+MD5 a0ca32c70fcbb0972923dbc5696ff266 nvidia-glx-1.0.5332-r2.ebuild 3481
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
 MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
@@ -29,20 +31,21 @@ MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191-r1 72
 MD5 8b34536317191f4059bebe95beabe1a4 files/digest-nvidia-glx-1.0.4349 72
 MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
-MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
-MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 a31ceab3377afe2286673e74ddf89468 files/digest-nvidia-glx-1.0.4496-r1 80
+MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328 80
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336 80
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r1 83
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336 80
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r1 80
+MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740
+MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
+MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
+MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
+MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2
new file mode 100644
index 000000000000..943071e25292
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2
@@ -0,0 +1 @@
+MD5 eede761ab428ff0d27e5f67e8c555972 NVIDIA-Linux-x86_64-1.0-5332-pkg0.run 5597826
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild
new file mode 100644
index 000000000000..83acf7cd4571
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild,v 1.1 2004/04/08 10:25:34 lv Exp $
+
+PKG_V="pkg0"
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
+DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	>=x11-base/opengl-update-1.3
+	~media-video/nvidia-kernel-${PV}"
+PROVIDE="virtual/opengl"
+
+pkg_setup() {
+	# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
+	if has_version "x11-base/xfree"
+	then
+		if has_version "<x11-base/xfree-4.2.0-r9"
+		then
+			die "Upgrade to xfree 4.2.0-r9 or greater."
+		fi
+	fi
+}
+
+src_unpack() {
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+
+	# Use the correct defines to make gtkglext build work
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
+}
+
+src_install() {
+	local NV_ROOT="/usr/lib/opengl/nvidia"
+	local TLS=
+
+	# Check if we should install TLS versions of the libraries
+	${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
+	# Only trust this if we are merging to /
+	if [ "$?" = "0" -a "${ROOT}" = "/" ]
+	then
+		einfo "Using TLS..."
+		TLS="tls/"
+	fi
+
+	# The X module
+	exeinto /usr/X11R6/lib/modules/drivers
+	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
+
+	# The GLX extension
+	exeinto ${NV_ROOT}/extensions
+	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/lib/${TLS}libGL.so.${PV} \
+	      usr/lib/${TLS}libGLcore.so.${PV}
+	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
+	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
+	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
+	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
+
+	insinto /usr/X11R6/lib
+	doins usr/X11R6/lib/libXvMCNVIDIA.a
+	exeinto /usr/X11R6/lib
+	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins usr/include/GL/*.h
+
+	# Docs
+	dodoc usr/share/doc/*
+
+	# Not sure whether installing the .la file is neccessary;
+	# this is adopted from the `nvidia' ebuild
+	local ver1="`echo ${PV} |cut -d '.' -f 1`"
+	local ver2="`echo ${PV} |cut -d '.' -f 2`"
+	local ver3="`echo ${PV} |cut -d '.' -f 3`"
+	sed -e "s:\${PV}:${PV}:"     \
+		-e "s:\${ver1}:${ver1}:" \
+		-e "s:\${ver2}:${ver2}:" \
+		-e "s:\${ver3}:${ver3}:" \
+		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
+}
+
+pkg_preinst() {
+	#clean the dinamic libGL stuff's home to ensure
+	#we dont have stale libs floating around
+	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
+	fi
+	#make sure we nuke the old nvidia-glx's env.d file
+	if [ -e ${ROOT}/etc/env.d/09nvidia ]
+	then
+		rm -f ${ROOT}/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	#switch to the nvidia implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update nvidia
+	fi
+
+	einfo
+	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
+	einfo
+
+	if [ `has_version x11-libs/qt` ] ; then
+		einfo "You have Qt installed on your system.  Qt is linked against opengl,"
+		einfo "which means you may have problems emerging KDE programs later until"
+		einfo "you run \"opengl-update xfree\""
+	fi
+}