Update version.

(Portage version: 2.0.51.19)

4 files changed, 234 insertions, 11 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index e14ef8301de2..ee97bc6eb6a4 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.83 2005/03/12 01:55:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.84 2005/04/01 12:15:10 azarah Exp $
+
+*nvidia-glx-1.0.7174 (01 Apr 2005)
+
+  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.7174.ebuild:
+  Update version.
 
 *nvidia-glx-1.0.7167-r1 (11 Mar 2005)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index e505632e5213..672d321af7ba 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 014047952a5016667784aec4cb6b1d53 nvidia-glx-1.0.6629-r5.ebuild 6625
+MD5 8ce0a52509e539caa9cfa7248de8af46 nvidia-glx-1.0.7174.ebuild 6827
 MD5 6365d18b298c3e65338ed67fa7300188 ChangeLog 17420
 MD5 602445f790dfcd667782292575f1db40 nvidia-glx-1.0.6111-r1.ebuild 5584
 MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
 MD5 154f21ff3b663c19f1786d92c3ad9b47 nvidia-glx-1.0.7167-r1.ebuild 6827
+MD5 232f9fe6b4441fe310ba874edfc441b8 .nvidia-glx-1.0.7174.ebuild.swp 16384
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
+MD5 1d3a8d6893d3de6682d239bc71bb1f90 files/digest-nvidia-glx-1.0.7174 80
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r5 163
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
@@ -20,10 +20,3 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCMlnI1ZcsMnZjRyIRAr+UAJ4ss+C2ybQ+xogXQDuM/dCv/9OBkQCgiC+d
-uk1OG3wrKRm3m/tzO1pL3BI=
-=GxdA
------END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174
new file mode 100644
index 000000000000..55030e02d769
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174
@@ -0,0 +1 @@
+MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7174.ebuild
new file mode 100644
index 000000000000..a03eb111c608
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7174.ebuild
@@ -0,0 +1,223 @@
+# 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.7174.ebuild,v 1.1 2005/04/01 12:15:10 azarah Exp $
+
+inherit eutils multilib versionator
+
+X86_PKG_V="pkg0"
+AMD64_PKG_V="pkg1"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	 amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+
+LICENSE="NVIDIA"
+SLOT="0"
+
+# Just amd64 2005.0 fixes in this revbump
+KEYWORDS="-* ~x86 ~amd64"
+
+RESTRICT="nostrip multilib-pkg-force"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-base/opengl-update-2.1.0
+	~media-video/nvidia-kernel-${PV}
+	!app-emulation/emul-linux-x86-nvidia"
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+if use x86; then
+	PKG_V="${X86_PKG_V}"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="${AMD64_PKG_V}"
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
+
+check_xfree() {
+	# This isn't necessary, true. But its about time people got the idea.
+	if has_version "x11-base/xfree"; then
+		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
+	fi
+}
+
+pkg_setup() {
+	check_xfree
+
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your defualt abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
+
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+
+	# Patchs go below here, add breif description
+	cd ${S}
+	# nVidia wants us to use nvidia-installer, removing warning.
+	epatch ${NV_PATCH_PREFIX//7174/6629}-makefile.patch
+	# Use the correct defines to make gtkglext build work
+	epatch ${NV_PATCH_PREFIX//7174/6629}-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${NV_PATCH_PREFIX//7174/6629}-glheader.patch
+
+	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
+	# 16 July 2004, opengl-update is now supplying glext.h for system wide
+	# compatibility, so we still need to remove this.
+	# 7 November 2004, Keeping this around for 6629 to see what happens.
+	#rm -f usr/include/GL/glext.h
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif use amd64 ; then
+		src_install-libs lib32 $(get_multilibdir)
+		src_install-libs lib $(get_libdir)
+
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || return 0
+
+	# Install tls_test
+	dodir /usr/libexec/misc
+	exeinto /usr/libexec/misc
+	doexe usr/bin/tls_test
+	doexe usr/bin/tls_test_dso.so
+
+	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+	rm -f usr/share/doc/nvidia-settings*
+	dodoc usr/share/doc/*
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [[ ${#} -eq 2 ]] ; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+		pkglibdir=lib32
+	fi
+
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/${pkglibdir}/libGL.so.${PV} \
+	      usr/${pkglibdir}/libGLcore.so.${PV} \
+		  usr/${pkglibdir}/libnvidia-tls.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
+	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so.1
+
+	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
+	dodir ${TLS_ROOT}
+	exeinto ${TLS_ROOT}
+	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
+	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
+
+	# Old opengl-updates don't always make this
+	keepdir /usr/${inslibdir}/tls
+
+	# Not sure whether installing the .la file is neccessary;
+	# this is adopted from the `nvidia' ebuild
+	local ver1=$(get_version_component_range 1)
+	local ver2=$(get_version_component_range 2)
+	local ver3=$(get_version_component_range 3)
+	sed -e "s:\${PV}:${PV}:"     \
+	    -e "s:\${ver1}:${ver1}:" \
+	    -e "s:\${ver2}:${ver2}:" \
+	    -e "s:\${ver3}:${ver3}:" \
+	    -e "s:\${libdir}:${inslibdir}:" \
+	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+
+	# The X module
+	# 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
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
+
+	insinto ${X11_LIB_DIR}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
+		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+	exeinto ${X11_LIB_DIR}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
+		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins usr/include/GL/*.h
+}
+
+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
+
+	echo
+	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia have requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}