From b5f3b516a5b1604b1f0dca7195e6bdaec90a3a98 Mon Sep 17 00:00:00 2001
From: Fabian Fingerle <fabian@datensalat.eu>
Date: Wed, 22 Jul 2009 07:51:39 +0200
Subject: [PATCH] x11-drivers/nvidia-drivers-190.16: Bump (without keyword in
 Documentation)

---
 Documentation/package.keywords/nvidia-beta         |   1 -
 Documentation/package.keywords/nvidia-prerelease   |   2 -
 media-video/nvidia-settings/ChangeLog              |   4 +
 media-video/nvidia-settings/Manifest               |   4 +-
 .../nvidia-settings/nvidia-settings-190.16.ebuild  |  69 +++
 x11-drivers/nvidia-drivers/ChangeLog               |   4 +
 x11-drivers/nvidia-drivers/Manifest                |   6 +-
 .../nvidia-drivers/nvidia-drivers-190.16.ebuild    | 527 +++++++++++++++++++++
 8 files changed, 612 insertions(+), 5 deletions(-)
 create mode 100644 media-video/nvidia-settings/nvidia-settings-190.16.ebuild
 create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-190.16.ebuild

diff --git a/Documentation/package.keywords/nvidia-beta b/Documentation/package.keywords/nvidia-beta
index 2ac19fb..9992c0c 100644
--- a/Documentation/package.keywords/nvidia-beta
+++ b/Documentation/package.keywords/nvidia-beta
@@ -1,3 +1,2 @@
-# same as nvidia-prerelease
 =media-video/nvidia-settings-185.18.14 **
 =x11-drivers/nvidia-drivers-185.18.14 **
diff --git a/Documentation/package.keywords/nvidia-prerelease b/Documentation/package.keywords/nvidia-prerelease
index 9992c0c..e69de29 100644
--- a/Documentation/package.keywords/nvidia-prerelease
+++ b/Documentation/package.keywords/nvidia-prerelease
@@ -1,2 +0,0 @@
-=media-video/nvidia-settings-185.18.14 **
-=x11-drivers/nvidia-drivers-185.18.14 **
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 1e9c883..e7eea1c 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2
 
+  22 Jul 2009, Fabian Fingerle <fabian@datensalat.eu>
+  +nvidia-settings-190.16.ebuild:
+  Bump
+
   28 May 2009, Fabian Fingerle <fabian@datensalat.eu>
   -nvidia-settings-185.19.ebuild, -nvidia-settings-180.60.ebuild, -nvidia-settings-185.18.10.ebuild,
   +nvidia-settings-185.18.14.ebuild:
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 2e20d56..0f6f93c 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -2,7 +2,9 @@ AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
 DIST nvidia-settings-180.37.05.tar.gz 1342121 RMD160 402acf035919a7750e5562f5d0ded08cbd9ded59 SHA1 46bfe6221b427c4180da32a1232e3ba3e2b71ef5 SHA256 2cc1668f958bd586c36ac703ba31ac87c9094f4974eac136d6de64a69ecdc3c8
 DIST nvidia-settings-185.18.14.tar.gz 1350027 RMD160 441f0ee5b66041ddf9c71394fc2d2f3c793449c3 SHA1 61a97feef307837a642d34fc748e726664a1ad6b SHA256 c013fab6106f8addd40f0295354c001c4666c29ea65a4c8a7457331a215fce78
+DIST nvidia-settings-190.16.tar.gz 7332 RMD160 188b5c0554ca5e438dac2d9ecb79cfd76dddf7cf SHA1 cf15b09599e033d6bbe33074a8f4e6979c0674dd SHA256 405cc6aed9d812022880ff262684c0cc5b160893701aa52dc3d4cbc1acd31301
 EBUILD nvidia-settings-180.37.05.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10
 EBUILD nvidia-settings-185.18.14.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10
-MISC ChangeLog 2474 RMD160 341fd9cf052c10be3ad8771b87e8d188b2efdcba SHA1 d83ccaddc654557c0432903fa5e960509c5014ad SHA256 a2e2ad1b212e94a98cf256f2926a5dcf38bb917e766fff9bfd4eeb1edca03bae
+EBUILD nvidia-settings-190.16.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10
+MISC ChangeLog 2570 RMD160 6ddae9c25e29b91447d1d75737a776109741b442 SHA1 3161b0e905b830b2811ab575e6d77153f143f00b SHA256 ae442bc7f1842b3b9060c40bed755d7024a3dddbb7f17f08b4f7019bf38eeefc
 MISC metadata.xml 313 RMD160 ef0fd7e80d48cd3ca74f690da28124320f1a5bd9 SHA1 07663307a196dcdd3ae7fd14a87476f7a7aaa67a SHA256 d6e8ff073fd6c7c27d8401c2ccc11bd62003fca57618d4ebc2c3bcc2f3beec21
diff --git a/media-video/nvidia-settings/nvidia-settings-190.16.ebuild b/media-video/nvidia-settings/nvidia-settings-190.16.ebuild
new file mode 100644
index 0000000..f164781
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-190.16.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs multilib
+
+MY_P="${PN}-1.0"
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# xorg-server is used in the depends as nvidia-settings builds against some
+# headers in /usr/include/xorg/.
+# This also allows us to optimize out a lot of the other dependancies, as
+# between gtk and xorg-server, almost all libraries and headers are accounted
+# for.
+DEPEND=">=x11-libs/gtk+-2
+	dev-util/pkgconfig
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-libs/libXv
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto"
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-drivers/nvidia-drivers"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	cd "${S}/src/libXNVCtrl"
+	make clean || die "Cleaning old libXNVCtrl failed"
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
+
+	cd "${S}"
+	einfo "Building nVidia-Settings..."
+	emake  CC="$(tc-getCC)" || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	# Install the executable
+	exeinto /usr/bin
+	doexe nvidia-settings
+
+	# Install libXNVCtrl and headers
+	insinto "/usr/$(get_libdir)"
+	doins src/libXNVCtrl/libXNVCtrl.a
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
+
+	# Install icon and .desktop entry
+	doicon "${FILESDIR}/icon/${PN}.png"
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	# Install manpage
+	doman doc/nvidia-settings.1
+
+	# Now install documentation
+	dodoc doc/*.txt
+}
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 4ab0514..c597977 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2
 
+  21 Jul 2009, Fabian Fingerle <fabian@datensalat.eu>
+  +nvidia-drivers-190.16.ebuild:
+  Bump beta
+
   13 Jul 2009, Fabian Fingerle <fabian@datensalat.eu>
   +nvidia-kernel-2.6.31.patch, +nvidia-drivers-185.18.14-r1.ebuild:
   Add patch to build with 2.6.31 kernel
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index e57b009..5c26016 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,12 +7,16 @@ AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b3048
 AUX nvidia-kernel-2.6.31.patch 1275 RMD160 6f72ac2905eea70826cf9eb18aa98f80cf8d00cf SHA1 63ced6cc1944e65d86fb59975b492b3fed9327d0 SHA256 9c01e68cf14e25478e07a1069225b400580fe097f11bcc9174efa02143e7e1b6
 DIST NVIDIA-FreeBSD-x86-180.37.05.tar.gz 18796655 RMD160 9692fd5de9924dd2a3de91046463ec6e458af6f0 SHA1 d386d6f178c9f119685c16a5a271069d8985b4cc SHA256 4f23f748f56c6e734760643915b5cda3287d651c56ebf196f6692a127e0411a3
 DIST NVIDIA-FreeBSD-x86-185.18.14.tar.gz 19221783 RMD160 6865a8a4c7e24f671cac52d45999b657e950e86f SHA1 a7c87d70fc537dbabed6a0098dd57f7de4d3027d SHA256 d81b392505478d83e23f7b23cc2f2b4c808896bad9317417fa69c405b76db956
+DIST NVIDIA-FreeBSD-x86-190.16.tar.gz 19867097 RMD160 35f70967fed6eba9e33874203abe50af8f21e341 SHA1 504f6439a79244a9c92e79055a52f1fcb3b91845 SHA256 f5951085b56190da44fa46a8bba7bf8aecc34a6b92e71a47a80c3dbd5756bfa8
 DIST NVIDIA-Linux-x86-180.37.05-pkg0.run 13667040 RMD160 d841a7cc72e1204ad8806ebfeb0411320183af96 SHA1 1151eda8e76122eb461fbd986acb3ec33b697344 SHA256 4c574c7d2b5dba9859fac24d00e0dae36b4b00cbc90caa316bb10b9b1a4a064a
 DIST NVIDIA-Linux-x86-185.18.14-pkg0.run 14125083 RMD160 27b07a055ed85d6da0010725013c2be3331d8634 SHA1 0bdf22ecb9e50d0a4272c91c1f53bcebcc736a1c SHA256 c569da0d06067a3dffacb193f1b7c4d19c8440e4f9370a62d63ba29cc438f760
+DIST NVIDIA-Linux-x86-190.16-pkg0.run 14547456 RMD160 17d3f5cc97ee54cc07ba4ec94827ec529a44b7f5 SHA1 05b5b943eb7ac11b5dc1c629917e196f37e8006d SHA256 fc2509deacac6c35d0d3b0601a515ae7814c909a410c2a777f02a930a8e0d8eb
 DIST NVIDIA-Linux-x86_64-180.37.05-pkg2.run 21702197 RMD160 551fbda4d617c693403ac9d6c4f797ec28b63d74 SHA1 f1fde83e9e1641f9e447fe7c277c893a158cd4c0 SHA256 714133719b8df1c9813f8265f6a446604b6d717f9ed8bc7391639e5a659670b6
 DIST NVIDIA-Linux-x86_64-185.18.14-pkg2.run 22211696 RMD160 c304d60350f6961a883b5cc860dd2baa821b21fc SHA1 7b7c41028247070c24f5088a028f07fe910e4023 SHA256 44dd422544a3ac512769be27d9999a1a8b73bac6197dedc18bc0bc764049a198
+DIST NVIDIA-Linux-x86_64-190.16-pkg2.run 22900185 RMD160 88356740a2c0891fd94e7bd48f802fe781922cc6 SHA1 4bee12025d05bbf3926a50b5041213c17e3fd514 SHA256 f2d84996eb28411632beb98f3a5f9e7564fa21eda60ce4e2704f98410c466e9f
 EBUILD nvidia-drivers-180.37.05.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52
 EBUILD nvidia-drivers-185.18.14-r1.ebuild 15366 RMD160 c82146d44a82b98e0c972ed2a2e12cfc0e3b6db4 SHA1 c6c5360ab9a18e82e54c6ab00e38852368d3df71 SHA256 14f777dcabc924774c892de537fbc62d72acc2e75217112dd6655f3f950d9b02
 EBUILD nvidia-drivers-185.18.14.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52
-MISC ChangeLog 2906 RMD160 72d77374e55d48f061cebf6e874fef85b1805bc6 SHA1 48e8c759fe1445f5585bae8564a7cc4d08429819 SHA256 41742624d14bb3d144622cbe011e5e7080285dc40dfc7a8bf14d7a1df9eb5cdb
+EBUILD nvidia-drivers-190.16.ebuild 15301 RMD160 173b0591d47a5e6d378faf11ef1ce199772d8274 SHA1 4635708fb4bcbd1fe62f7438c4b8c2655b275fbc SHA256 97c077afd88045bf1bd61a342092e6dd505b9b2b1c2a051b4c98ed1a7ac5a733
+MISC ChangeLog 3006 RMD160 fb761a03679f00122f12b5662cb5f8dc87a383da SHA1 2eb67ec9810eef67e583391f9f76af3cc2198ce8 SHA256 e9a6abb196e52130c656a386391a9871fc167559ddc6b37dfe0b99c8694cbad0
 MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.16.ebuild
new file mode 100644
index 0000000..c5f2e42
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.16.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS=""
+IUSE="acpi custom-cflags gtk multilib kernel_linux"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="<x11-base/xorg-server-1.6.99
+	multilib? ( app-emulation/emul-linux-x86-xlibs )
+	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	!app-emulation/emul-linux-x86-nvidia
+	!x11-drivers/nvidia-legacy-drivers"
+DEPEND="${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
+RDEPEND="${COMMON}
+	kernel_linux? ( virtual/modutils )
+	media-libs/mesa
+	acpi? ( sys-power/acpid )"
+PDEPEND="gtk? ( media-video/nvidia-settings )"
+
+QA_TEXTRELS_x86="usr/lib/libXvMCNVIDIA.so.${PV}
+	usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libcuda.so.${PV}"
+
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+	usr/lib/opengl/nvidia/lib/libGL.so.1
+	usr/lib/opengl/nvidia/lib/libGLcore.so.1
+	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.1
+	usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1
+	usr/lib/opengl/nvidia/extensions/libglx.so
+	usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+	usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+	usr/lib32/libcuda.so.${PV}"
+
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	usr/lib64/libXvMCNVIDIA.so.${PV}
+	usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so
+	usr/bin/nvidia-xconfig"
+
+QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so"
+
+QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so"
+
+if use x86; then
+	PKG_V="-pkg0"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="-pkg2"
+	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}"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		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
+}
+
+paravirt_check() {
+	ebegin "Checking for Paravirtualized guest support"
+	linux_chkconfig_present PARAVIRT
+
+	if [[ $? -eq 0 ]]; then
+		eerror "Please disable PARAVIRT in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] Paravirtualized guest support"
+		eerror
+		eerror "or XEN support"
+		eerror
+		eerror "and recompile your kernel .."
+		die "PARAVIRT support detected!"
+	fi
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	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 kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
+		mtrr_check
+		paravirt_check
+	fi
+
+	# On BSD userland it wants real make command
+	use userland_BSD && MAKE="$(get_bmake)"
+
+	export _POSIX2_VERSION="199209"
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		NV_DOC="${S}/doc"
+		NV_EXEC="${S}/obj"
+		NV_SRC="${S}/src"
+	elif use kernel_linux; then
+		NV_DOC="${S}/usr/share/doc"
+		NV_EXEC="${S}/usr/bin"
+		NV_SRC="${S}/usr/src/nv"
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if use kernel_linux && kernel_is lt 2 6 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
+
+	if ! use x86-fbsd; then
+		mkdir "${S}"
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+
+	# Patches go below here, add brief description
+	cd "${S}"
+	use x86-fbsd && cd doc
+
+	# 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
+
+	# allow on board sensors to work with lm_sensors
+	if use kernel_linux; then
+		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
+	fi
+
+	if use kernel_linux; then
+		# Quiet down warnings the user does not need to see
+		sed -i \
+			-e 's:-Wpointer-arith::g' \
+			-e 's:-Wsign-compare::g' \
+			"${NV_SRC}"/Makefile.kbuild
+
+		# If you set this then it's your own fault when stuff breaks :)
+		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/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.
+
+	cd "${NV_SRC}"
+	if use x86-fbsd; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	cd "${S}"
+
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "$VIDEOGROUP" ]; then
+			eerror "Failed to determine the video group gid."
+			die "Failed to determine the video group gid."
+		fi
+
+		# Add the aliases
+		[ -f "${FILESDIR}/nvidia" ] || die "nvidia missing in FILESDIR"
+		sed -e 's:PACKAGE:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		doins "${WORKDIR}"/nvidia || die
+	elif use x86-fbsd; then
+		insinto /boot/modules
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+	fi
+
+	if 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
+
+	# Documentation
+	dodoc "${NV_DOC}"/{XF86Config.sample,Copyrights}
+	dohtml "${NV_DOC}"/html/*
+	if use x86-fbsd; then
+		dodoc "${NV_DOC}/README"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+	fi
+
+	# Helper Apps
+	dobin ${NV_EXEC}/nvidia-xconfig || die
+	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second parameter is the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	# libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
+	if [ -e $2.$3 ] ; then
+		doexe $2.$3
+		dosym ${libname}.$3 $1/${libname}
+		[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+	fi
+}
+
+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 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}
+
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.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
+		# Install the .la file for libtool, to prevent e.g. bug #176423
+		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
+		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
+
+	[[ -f ${drvdir}/nvidia_drv.so ]] && \
+		doexe ${drvdir}/nvidia_drv.so
+
+	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 libXvMCNVIDIA.so.${PV} \
+			/usr/${inslibdir}/libXvMCNVIDIA.so
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
+		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
+
+	#cuda
+	if [[ -f usr/include/cuda/cuda.h ]]; then
+		dodir /usr/include/cuda
+		insinto /usr/include/cuda
+		doins usr/include/cuda/*.h
+
+		if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
+			dolib.so usr/${pkglibdir}/libcuda.so.${PV}
+			dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
+			dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
+		fi
+	fi
+
+	#vdpau
+	if [[ -f usr/include/vdpau/vdpau.h ]]; then
+		dodir /usr/include/vdpau
+		insinto /usr/include/vdpau
+		doins usr/include/vdpau/*.h
+
+		for vdpaulib in vdpau_nvidia vdpau vdpau_trace; do
+			dolib.so usr/${pkglibdir}/lib${vdpaulib}.so.${PV}
+			dosym lib${vdpaulib}.so.${PV} /usr/${inslibdir}/lib${vdpaulib}.so.1
+			dosym lib${vdpaulib}.so.1 /usr/${inslibdir}/lib${vdpaulib}.so
+		done
+	fi
+}
+
+pkg_preinst() {
+
+	# Clean the dynamic 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 kernel_linux; then
+		linux-mod_pkg_postinst
+	fi
+
+	# Switch to the nvidia implementation
+	eselect opengl set --use-old nvidia
+
+	echo
+	elog "You must be in the video group to use the NVIDIA device"
+	elog "For more info, read the docs at"
+	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+	elog
+
+	elog "This ebuild installs a kernel module and X driver. Both must"
+	elog "match explicitly in their version. This means, if you restart"
+	elog "X, you most modprobe -r nvidia before starting it back up"
+	elog
+
+	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "nVidia has requested that any bug reports submitted have the"
+	elog "output of /usr/bin/nvidia-bug-report.sh included."
+	elog
+	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
+	elog
+	elog "If you are having resolution problems, try disabling DynamicTwinView."
+	echo
+}
+
+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
+
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) return 1 ;;
+		esac
+	fi
+
+	# If we've got nptl, we've got tls
+	built_with_use --missing true 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() {
+	if use kernel_linux; then
+		linux-mod_pkg_postrm
+	fi
+	eselect opengl set --use-old xorg-x11
+}
-- 
2.11.4.GIT