Added ebuild for NVIDIA driver release 1.0-8774.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 431 insertions, 15 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 92a62afb1fe4..ad944f2f6cb5 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.5 2006/08/08 04:03:51 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.6 2006/08/25 05:11:45 augustus Exp $
+
+*nvidia-drivers-1.0.8774 (25 Aug 2006)
+
+  25 Aug 2006; Kristopher Kersey <augustus@gentoo.org>
+  +nvidia-drivers-1.0.8774.ebuild:
+  Added ebuild for NVIDIA driver release 1.0-8774.
 
   08 Aug 2006; Joshua Jackson <tsunam@gentoo.org>
   nvidia-drivers-1.0.8762-r1.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 63f8d5709307..dbc605f2ada6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61
@@ -26,8 +23,11 @@ MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704
 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704
 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704
 DIST NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 RMD160 5b75d9b5e852b0d5222951d9d99c93d7960ee8f6 SHA1 70e6b1ed826ea0851aaefba93a15d553b1d5e725 SHA256 f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875
+DIST NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff SHA1 e9e3635824815061fd01b4ece43f5ecd8f0a3424 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07
 DIST NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 SHA1 bf83c71cc04117cfa4c81e38e2df07fa4dc3e8be SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee
+DIST NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959 RMD160 2d7249f4ca06db151d80870ff0da27edb402ee8a SHA1 fcd38bad3240b6b24cfef278238014351af98062 SHA256 099b597b93d794ec74b34583d3cbe6ea39f8ac5b2f7ae96d3aafbdfdd89daa83
 DIST NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 SHA1 7f2a73a2e96a94e5d44336db6a3d663cf68ad7f8 SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c
+DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214
 EBUILD nvidia-drivers-1.0.8762-r1.ebuild 11155 RMD160 b273b1a08b16b8ffe813352a9525a5fca187ae31 SHA1 53e04e7c8ff41bd9240c35cf791ef8da64c6f4e6 SHA256 3c1221cf1b4a146b8bc0d4b90bc2a96b87fe7dc1122be393a6fb660d1c465451
 MD5 92db60af59c0b85fd0ae7bc5ea46dbf5 nvidia-drivers-1.0.8762-r1.ebuild 11155
 RMD160 b273b1a08b16b8ffe813352a9525a5fca187ae31 nvidia-drivers-1.0.8762-r1.ebuild 11155
@@ -36,20 +36,20 @@ EBUILD nvidia-drivers-1.0.8762.ebuild 11089 RMD160 5c1f106b01732864ee007bf567ebd
 MD5 cdf785e2ad1e01b9b9b244fea4fec8a5 nvidia-drivers-1.0.8762.ebuild 11089
 RMD160 5c1f106b01732864ee007bf567ebd05586da78aa nvidia-drivers-1.0.8762.ebuild 11089
 SHA256 44047c3ecd9cf64bbb7e39e14839e4a0667c38288f8250ee5cbbeab5ccfb5840 nvidia-drivers-1.0.8762.ebuild 11089
-MISC ChangeLog 1236 RMD160 44391c2c1afa785f2ab6e9e44e0189832c72627a SHA1 bda89490dec6c784532c91afe176f792e2133b84 SHA256 008c5516f05d8d6a5d30f6cde2119a8db639adb09b169ae8df360b9be6f24b15
-MD5 38589c14ed7dd61d703a05f821ac0eb8 ChangeLog 1236
-RMD160 44391c2c1afa785f2ab6e9e44e0189832c72627a ChangeLog 1236
-SHA256 008c5516f05d8d6a5d30f6cde2119a8db639adb09b169ae8df360b9be6f24b15 ChangeLog 1236
+EBUILD nvidia-drivers-1.0.8774.ebuild 11131 RMD160 3bbd802810a4f129199d4e05e8dd277e31f02fb4 SHA1 7a99b9023e29187ca1a853635f4eb817e9cbb409 SHA256 2753e9d5b1c83756296b992a39006615e8f6004fcf2dacbfd1928f4cfc886442
+MD5 2670c9cf7ad6d0403882485fdc2dae0b nvidia-drivers-1.0.8774.ebuild 11131
+RMD160 3bbd802810a4f129199d4e05e8dd277e31f02fb4 nvidia-drivers-1.0.8774.ebuild 11131
+SHA256 2753e9d5b1c83756296b992a39006615e8f6004fcf2dacbfd1928f4cfc886442 nvidia-drivers-1.0.8774.ebuild 11131
+MISC ChangeLog 1420 RMD160 7c2ab44e8092d042a0836a12ce800080630a5c57 SHA1 9f3a832313a7182baf3284cc64ac462889f037a3 SHA256 e42ad8b99d16d5799638489dc100c99dbf6db658889e89c20411b7c0d307400a
+MD5 864eeea125fd34e876519b922e3c3b16 ChangeLog 1420
+RMD160 7c2ab44e8092d042a0836a12ce800080630a5c57 ChangeLog 1420
+SHA256 e42ad8b99d16d5799638489dc100c99dbf6db658889e89c20411b7c0d307400a ChangeLog 1420
 MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762 870
 RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762 870
 SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762 870
 MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762-r1 870
 RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762-r1 870
 SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762-r1 870
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFE2A1E2ZWR0Jhg/EsRAhFCAJ92q2jwZJMf+p1TnLtzjax27Qq26gCdEjAa
-z4jT6gtr3MmWL7zCeBJthaM=
-=2DBn
------END PGP SIGNATURE-----
+MD5 001ce5de86d073b2f9d1f7075aca2787 files/digest-nvidia-drivers-1.0.8774 870
+RMD160 88f38c4e304f6b6c91063a373559721e3555c883 files/digest-nvidia-drivers-1.0.8774 870
+SHA256 dba7d0016db3321eac77d5136e3f0da180cbb687969d3c1303675d4bd2ba2fee files/digest-nvidia-drivers-1.0.8774 870
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774
new file mode 100644
index 000000000000..14f94bedb52b
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774
@@ -0,0 +1,9 @@
+MD5 0fe3cbc309815f4ac3d70e7d1a3a4f9e NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
+RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
+SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07 NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
+MD5 eb01a4372096ee7799e6560cf568c1c2 NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
+RMD160 2d7249f4ca06db151d80870ff0da27edb402ee8a NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
+SHA256 099b597b93d794ec74b34583d3cbe6ea39f8ac5b2f7ae96d3aafbdfdd89daa83 NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
+MD5 1f569a860caf1c4314444536c7e659dd NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
+RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
+SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214 NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
new file mode 100644
index 000000000000..2a21abd23f45
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.1 2006/08/25 05:11:45 augustus Exp $
+
+inherit eutils multilib versionator linux-mod
+
+X86_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${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 )
+	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="dlloader"
+RESTRICT="nostrip multilib-pkg-force"
+
+DEPEND="kernel_linux? ( virtual/linux-sources )"
+RDEPEND="kernel_linux? ( virtual/modutils )
+	 || ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 || ( media-libs/mesa virtual/x11 )
+	 app-admin/eselect-opengl
+	 kernel_linux? ( !media-video/nvidia-kernel )
+	 kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	 !app-emulation/emul-linux-x86-nvidia
+	 !x11-drivers/nvidia-legacy-drivers
+	 !media-video/nvidia-glx"
+
+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}"
+elif use x86-fbsd; then
+	PKG_V=""
+	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
+
+# On BSD userland it wants real make command
+MAKE="make"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "This version needs MTRR support for most chipsets!"
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+pkg_setup() {
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if ! use x86-fbsd; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S})"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+		mtrr_check
+	fi
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
+
+	if ! use x86-fbsd; then
+		if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
+			echo
+			ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			ewarn "This is not officially supported for ${P}. It is likely you"
+			ewarn "will not be able to compile or use the kernel module."
+			ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+			echo
+			ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+		fi
+	fi
+
+	if ! use x86-fbsd; then
+		cd ${WORKDIR}
+		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
+	else
+		unpack ${A}
+	fi
+
+	# Patches go below here, add breif description
+	use x86-fbsd \
+		&& cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
+		|| cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+	# Use the correct defines to make gtkglext build work
+	epatch ${FILESDIR}/NVIDIA_glx-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
+
+	if ! use x86-fbsd; then
+		# Zander kernel patches
+		# None yet.
+
+		# Quiet down warnings the user do not need to see
+		sed -i \
+			-e 's:-Wpointer-arith::g' \
+			-e 's:-Wsign-compare::g' \
+			${S}/Makefile.kbuild
+
+		# If you set this then it's your own fault when stuff breaks :)
+		[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		cd ${S}; convert_to_m Makefile.kbuild
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+	if use x86-fbsd; then
+		cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
+		MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+	else
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+
+	if ! use x86-fbsd; then
+		linux-mod_src_install
+
+		# Add the aliases
+		sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+		insinto /etc/modules.d
+		newins ${WORKDIR}/nvidia nvidia
+	else
+		insinto /boot/modules
+		doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko"
+	fi
+
+	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
+
+	if ! use x86-fbsd; then
+		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+		newdoc usr/share/doc/README.txt README
+		dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog
+		dodoc usr/share/doc/XF86Config.sample
+		dohtml usr/share/doc/html/*
+	else
+		dodoc doc/README doc/README.Linux doc/XF86Config.sample
+	fi
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second paramis the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+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 usrpkglibdir=usr/${pkglibdir}
+	local libdir=usr/X11R6/${pkglibdir}
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
+	local incdir=usr/include/GL
+	local sover=${PV}
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
+
+	if ! has_version x11-base/xorg-server ; then
+		X11_LIB_DIR="/usr/${inslibdir}"
+	fi
+
+	if use x86-fbsd; then
+		# on FreeBSD everything is on obj/
+		pkglibdir=obj
+		usrpkglibdir=obj
+		x11pkglibdir=obj
+		drvdir=obj
+		extdir=obj
+
+		# don't ask me why the headers are there.. glxext.h is missing
+		incdir=doc
+
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
+
+	dodir ${NO_TLS_ROOT}
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
+
+	if ! use x86-fbsd; then
+		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
+	fi
+
+	if want_tls ; then
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	else
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	fi
+
+	if ! use x86-fbsd; then
+		# 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
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
+		has_version "x11-base/xorg-server"; then
+		[[ -f ${drvdir}/nvidia_drv.so ]] && \
+			doexe ${drvdir}/nvidia_drv.so
+	else
+		[[ -f ${drvdir}/nvidia_drv.o ]] && \
+			doexe ${drvdir}/nvidia_drv.o
+	fi
+
+	insinto /usr/${inslibdir}
+	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+		doins ${libdir}/libXvMCNVIDIA.a
+	exeinto /usr/${inslibdir}
+	# fix Bug 131315
+	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
+		dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
+			/usr/${inslibdir}/libXvMCNVIDIA.so
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
+}
+
+pkg_preinst() {
+	# Can we make up our minds ?!?!?
+	local NV_D=${IMAGE:-${D}}
+
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# 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() {
+	if ! use x86-fbsd; then
+		linux-mod_pkg_postinst
+	fi
+
+	#switch to the nvidia implementation
+	eselect opengl set --use-old nvidia
+
+	echo
+	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia has requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}
+
+want_tls() {
+	# For uclibc or anything non glibc, return false
+	has_version sys-libs/glibc || return 1
+
+	# Old versions of glibc were lt/no-tls only
+	has_version '<sys-libs/glibc-2.3.2' && return 1
+
+	local valid_chost="true"
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) valid_chost="false"
+		esac
+	fi
+
+	[[ ${valid_chost} == "false" ]] && return 1
+
+	# If we've got nptl, we've got tls
+	built_with_use sys-libs/glibc nptl && return 0
+
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
+	# These versions built linuxthreads version to support tls, too
+	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
+
+	return 1
+}
+
+pkg_postrm() {
+	eselect opengl set --use-old xorg-x11
+}