update version

6 files changed, 185 insertions, 2 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 19d4f26c6326..b908a7cdba6e 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-glx 
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.10 2002/09/08 12:58:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.11 2002/09/11 22:57:41 azarah Exp $
+
+*nvidia-glx-1.0.3123 (12 Sep 2002)
+
+  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Update version.
 
   8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild :
   
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123
new file mode 100644
index 000000000000..7c5a88369ba7
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123
@@ -0,0 +1 @@
+MD5 2e1ea7847838f49360cf358b2c8fb15b NVIDIA_GLX-1.0-3123.tar.gz 1765011
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild
new file mode 100644
index 000000000000..8fac6be84576
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild,v 1.1 2002/09/11 22:57:41 azarah Exp $
+
+# Make sure Portage does _NOT_ strip symbols.  Need both lines for
+# Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA_GLX-${NV_V}"
+S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
+DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
+SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
+	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
+HOMEPAGE="http://www.nvidia.com/"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
+DEPEND="virtual/glibc
+	>=x11-base/xfree-4.2.0-r9
+	>=x11-base/opengl-update-1.3
+	~media-video/nvidia-kernel-${PV}"
+
+PROVIDE="virtual/opengl"
+
+
+src_install() {
+	local NV_ROOT="/usr/lib/opengl/nvidia"
+
+	# 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/libglx.so.${PV} libglx.so
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/lib/libGL.so.${PV} \
+	      usr/lib/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.1 > ${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
+}
+
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index d016adb31e8d..2583e002d7e9 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.7 2002/08/16 23:55:31 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.8 2002/09/11 22:57:33 azarah Exp $
+
+*nvidia-kernel-1.0.3123 (12 Sep 2002)
+
+  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Update version.
 
 *nvidia-kernel-1.0.2960-r1 (16 Aug 2002)
 
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.3123 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.3123
new file mode 100644
index 000000000000..b183624bce27
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.3123
@@ -0,0 +1 @@
+MD5 9496c1b260985eaea59d3760b1e42eb4 NVIDIA_kernel-1.0-3123.tar.gz 428232
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.3123.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.3123.ebuild
new file mode 100644
index 000000000000..6f61069f5257
--- /dev/null
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.3123.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.3123.ebuild,v 1.1 2002/09/11 22:57:33 azarah Exp $
+
+# Make sure Portage does _NOT_ strip symbols.  Need both lines for
+# Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA_kernel-${NV_V}"
+S="${WORKDIR}/${NV_PACKAGE}"
+DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
+SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
+	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
+HOMEPAGE="http://www.nvidia.com/"
+
+# The slow needs to be set to $KV to prevent unmerges of
+# modules for other kernels.
+LICENSE="NVIDIA"
+SLOT="${KV}"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+DEPEND="virtual/linux-sources
+	>=sys-apps/portage-1.9.10"
+
+
+src_compile() {
+	# Portage should determine the version of the kernel sources
+	check_KV
+	#IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been
+	#updated but the running kernel is still compiled with an older gcc.  This is
+	#needed for chrooted building, where the sanity check detects the gcc of the
+	#kernel outside the chroot rather than within.
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+		clean NVdriver || die
+}
+
+src_install() {
+	# The driver goes into the standard modules location
+	insinto /lib/modules/${KV}/video
+	doins NVdriver
+    
+	# Add the aliases
+	insinto /etc/modules.d
+	doins ${FILESDIR}/nvidia
+
+	# Docs
+	dodoc ${S}/README
+
+	# The device creation script
+	into /
+	newsbin ${S}/makedevices.sh NVmakedevices.sh
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" ]
+	then
+		# Update module dependency
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		then
+			/sbin/NVmakedevices.sh >/dev/null 2>&1
+		fi
+	fi
+
+	einfo "If you are not using devfs, loading the module automatically at"
+	einfo "boot up, you need to add \"NVdriver\" to your /etc/modules.autoload."
+	einfo
+}
+