version bump

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 543 insertions, 6 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 250af3db3892..ae710f176453 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.143 2009/03/30 18:42:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.144 2009/04/19 06:38:59 cardoe Exp $
+
+*nvidia-drivers-180.51 (19 Apr 2009)
+
+  19 Apr 2009; Doug Goldstein <cardoe@gentoo.org>
+  +nvidia-drivers-180.51.ebuild:
+  version bump
 
 *nvidia-drivers-180.44 (30 Mar 2009)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 35c7e104427b..454bc3b1593a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -30,6 +30,7 @@ DIST NVIDIA-FreeBSD-x86-180.29.tar.gz 18030564 RMD160 2417bc1221c53069ad5157a5cc
 DIST NVIDIA-FreeBSD-x86-180.37.tar.gz 18578074 RMD160 7f87ee815266476f144c46694f16fa32d2911920 SHA1 3b505acab4fcb6ce2070e5aa776b3085adf8f9d3 SHA256 49acd29b0f8ac41de0d6690dbf5ae0e4098ca9c33f8168712eeaaae82992e052
 DIST NVIDIA-FreeBSD-x86-180.41.tar.gz 18591553 RMD160 9bb02090aff222b946f6522b3776a9b285ec70e8 SHA1 32876cd879768399390adcb2d9595ddfe7b487b0 SHA256 e74eb78ee729a6a2cbaa95ad62572d262f928100fdde088aa9b4a3aa82c084f3
 DIST NVIDIA-FreeBSD-x86-180.44.tar.gz 18591139 RMD160 1d13ebecffdd731d6875a6b0ac1e3d9cf4c7d4d2 SHA1 4bb816a5705bfa87a9e9cb0d06e4b4e0f9aa7039 SHA256 29b996aad27f7aa2407ff33af15eac28d10a629d98021d0baa843fad5b8d8f20
+DIST NVIDIA-FreeBSD-x86-180.51.tar.gz 18594914 RMD160 aa927e8f14f36ae97ad2d75c08ffa0edfee5f59e SHA1 65b9a47fd240f41d5bdbe1a210661800d963095b SHA256 8dc2983617353a4c230c70d505249fe75a7739390ec1868c0e6df9f6bd518300
 DIST NVIDIA-FreeBSD-x86-96.43.09.tar.gz 10400444 RMD160 9569c9b51d902c214b0225b0aad615627ec944b9 SHA1 21680258aa94a1bff4a59d13de850c31743fac2a SHA256 58c041ce5be40b7837d8126ff1ea6e2932be0d189a046622faef698f1a83b50f
 DIST NVIDIA-FreeBSD-x86-96.43.10.tar.gz 11051781 RMD160 148206bfe84896224864469631a1b3a621d3179a SHA1 e6717dcd6d97d51d4dee7e9a19057c83e0ac0065 SHA256 df7d5dd6387dcefec8fe5ba1c0988ccd6eebcfd1cbed587948bd050946659d84
 DIST NVIDIA-FreeBSD-x86-96.43.11.tar.gz 11051460 RMD160 b3e50cb5118ea53edc9923d609f7f22478802b54 SHA1 64ff4132d325744a26f82ea85c4266799774b709 SHA256 5e17d537ae8ef4c56cb1b95c17672865a49f3aa504775e96d61a6795f6d9c26f
@@ -48,6 +49,7 @@ DIST NVIDIA-Linux-x86-180.29-pkg0.run 13297644 RMD160 30d6b22b35dcfa5a5f51c371e3
 DIST NVIDIA-Linux-x86-180.37-pkg0.run 13558011 RMD160 ad9440d447d1ef1a9ec0b8af49430aef322e769e SHA1 5a2484e96961ea667815cf13026ded32180dcb2d SHA256 59d6a39b29692b1d1d5f69ce159140833c60e19acb8e00ffe4d3700624656704
 DIST NVIDIA-Linux-x86-180.41-pkg0.run 13563960 RMD160 5a3f095e7306ac1efdb9916a07e1a45945322670 SHA1 6f825a58e332dd8e561a079f47d298db39ca704a SHA256 a1a7b55a6044a89be211fe437dac966b72ae9659783f6d994fc6ca86442e00ed
 DIST NVIDIA-Linux-x86-180.44-pkg0.run 13565325 RMD160 8a141bdb0a0d3aacf908cae51d58f4683db724ae SHA1 f65b3d984538de934e666b959d1825f5aa450235 SHA256 726d2052772cf5f8b9e683a805c89427f242d0a72ef45ca895fe6a48b24daa01
+DIST NVIDIA-Linux-x86-180.51-pkg0.run 13572988 RMD160 bd32531d2fd481fc50c26f98cff7c34e002afdef SHA1 f957efd1aad1e1802c29fe338974ad8256e94bb7 SHA256 256f816c6dd8d94130ec7957c549f94f7a039fe009fbf19898ce037a0f90edca
 DIST NVIDIA-Linux-x86-71.86.06-pkg0.run 5261179 RMD160 87541a06f384b567b5762bf5e01faee7c4983fc0 SHA1 744b7885dcb99b1cbc9d3f61a755644f149eb0c9 SHA256 bd89aa8656fbc49f0cf0b5e9d6975f2345d7363ca240f7b67d92690ad8e3e1d7
 DIST NVIDIA-Linux-x86-71.86.07-pkg0.run 5264394 RMD160 764111fb8413452ba23ff9c6488de6974257dd84 SHA1 1c71f68b7460f0ac0a8abe07f56ea7876b0496e3 SHA256 06019159b99fd4b7f983eaf8d4f9b5b15b389d328d8606eee2bb62f1b9b9341b
 DIST NVIDIA-Linux-x86-71.86.08-pkg0.run 5274646 RMD160 73ac12d2679c38e17de9fbda9ed95a9331f3cf9d SHA1 24144312f514d883b0cd4059d0e2f34f6c41e139 SHA256 072afdcdb46f3ecdb88a0d2e15002a00c4314018d2985556c54395545d64aa18
@@ -71,6 +73,7 @@ DIST NVIDIA-Linux-x86_64-180.29-pkg2.run 20943249 RMD160 d8eaee700f9f1d3a9bcd6dd
 DIST NVIDIA-Linux-x86_64-180.37-pkg2.run 21467700 RMD160 88d4d12a2c2d175dd9cf37ca4ec69ba83544128b SHA1 d8098b43199ca9a00a68a8a6c2b4218da47a79de SHA256 0072ea712e23436997e719b133af6d0c976b49d201efcd682c2ea1f5e65b9445
 DIST NVIDIA-Linux-x86_64-180.41-pkg2.run 21468727 RMD160 bc71f42f6489561e0555a3801a6cbca72f98f700 SHA1 94a87bd19e619d1eceba0b11b83e8ede295584d9 SHA256 cc2009ced73b89bb845a5ff49da6aeff4f419a42ef89509fdd17cab32f18419a
 DIST NVIDIA-Linux-x86_64-180.44-pkg2.run 21472494 RMD160 72ce9b8f9cc6e8edc5f423996ae6ac1c3f1fe415 SHA1 cba088b8d12277570959d37711eee14c716922bd SHA256 b71be310e8b8f240923abbcf2f4e7a1712e0f2605979910c3c5ba941ddee7f34
+DIST NVIDIA-Linux-x86_64-180.51-pkg2.run 21477607 RMD160 097914eed8fff44bd3a24f6799c7bbd66a39f91f SHA1 1e8fe6e4549f2a91812aa1995dbe5a739822c97a SHA256 debc15623f0a0c582ed3e3a5f6e1a39a277f66db003174227f176737ba4bedc3
 DIST NVIDIA-Linux-x86_64-71.86.06-pkg2.run 8380369 RMD160 dece285c6e02da8e788d977c2df114b3bbf8cc0f SHA1 518dd3e4d8ff484a6809184064d39afe0004ef45 SHA256 00f21f8ef75eeade437bb611fac98c4df6c4bef82293ad1d4506020f7004b57b
 DIST NVIDIA-Linux-x86_64-71.86.07-pkg2.run 8380439 RMD160 5ba261e0f5f25868236ca47768167dd913786a23 SHA1 de7c6951bfc524d2decbe729346e3af351f1d8cb SHA256 e42e004647225086cd2bceb207d3575974188133cb4d5e497188df967362cf39
 DIST NVIDIA-Linux-x86_64-71.86.08-pkg2.run 8386132 RMD160 5860272e5c1fab536362498c00e2021d0b18f682 SHA1 764ce3af14d3cd32db6f01879962ea7eda34d413 SHA256 97ae2082e91e01ab802d309444dae49227cca6bbe0240deff2cdd387bd7503fa
@@ -94,6 +97,7 @@ EBUILD nvidia-drivers-180.29.ebuild 15428 RMD160 77a7bbe1afd3b51bafbdf45ba16a238
 EBUILD nvidia-drivers-180.37.ebuild 15430 RMD160 b78877db67606cda73a79417fea99e946febe371 SHA1 82f21f6abc9da89b27a1cef1039eee3ff8af98b1 SHA256 f72ce734d2b4d8b5325612bba9ba92ccb332b0ac88acc0de1817c8882918fcec
 EBUILD nvidia-drivers-180.41.ebuild 15429 RMD160 6fef045524d6fe038d605c12b9c8534be63af40f SHA1 ab1b6ac0c4f5520d000c7eca228a8109f3feb487 SHA256 fbc14eb389761a00f26630b52ddfe4b43266913b224e686dcdf76bf19928fe6e
 EBUILD nvidia-drivers-180.44.ebuild 15442 RMD160 29f3656bf8fd34359b4ceef7195b97d1afc7d11f SHA1 1a89a3801d99166176b29ee358ef4dc498062450 SHA256 9196cf7cd972fa79fd410e279f022df4a52f6348e570a2608ef9299bcec0c24c
+EBUILD nvidia-drivers-180.51.ebuild 15430 RMD160 af33de50dfc4dc1072405ae21af2cef00fd417c7 SHA1 024118e57224b48968ab6422776b2931b2845421 SHA256 24d811644861a261ada1eba9d2fcf43c77abbcc57b0d4ad2980c49dc04e67544
 EBUILD nvidia-drivers-71.86.06.ebuild 14138 RMD160 2f713727f51ed4fdcf8e94fa629b8892fe3266b1 SHA1 9ac9d3ccae0978327e782c1ba52f506326d565dc SHA256 ea06b4cf57144afe3a08d0a266e0beced197aa53b88464e76d2f4cde9d62c123
 EBUILD nvidia-drivers-71.86.07.ebuild 14185 RMD160 23342dddcd0936f4bb095887f14d7f29ffce8d66 SHA1 616ddfd373ff9dc886c3d4ec36f1732161c9daa9 SHA256 8708fb576fbb1d35cbd7b235ec35d0f479115ac195202f033e0b785988b1e6eb
 EBUILD nvidia-drivers-71.86.08.ebuild 14186 RMD160 1674c0820fef05e00c7af65b8b619704a6fae19f SHA1 c41caf19a93e1c19a1bb3e74091144ae7149e4b8 SHA256 b8bf988963a3f7bd80e9f49cf77d8f5b044f240d4e0d329e46a0421a16fd28ea
@@ -102,12 +106,12 @@ EBUILD nvidia-drivers-96.43.07.ebuild 14475 RMD160 35dc001755181bdda3e4d0c5be978
 EBUILD nvidia-drivers-96.43.09.ebuild 14639 RMD160 196b0ec412f57feac01ca2dda35c582a380b888a SHA1 f7237f6b8e793eaaffe3115c3ec6f84a8f66bcec SHA256 e21c09a244c86fc97385a7f35d1d535f68c59ceac3503e1b00b923f186ecaabf
 EBUILD nvidia-drivers-96.43.10.ebuild 14638 RMD160 9d523f06b1b7b8680029bb10f54c82f73d2c6cfe SHA1 a67739823e27f8fcac0ebc5713b743b6ac2a0f1d SHA256 2d17ebd8061ad91e30e390a399872f76c3562b08738dcb439f460db6f9e588cb
 EBUILD nvidia-drivers-96.43.11.ebuild 14639 RMD160 4ab1ed78b9a60cdd82e28d6dd1259ba8fa8856bf SHA1 99e3d4c9a396b96e8ccbd81d11a7557c6ccb27eb SHA256 6fa0cee535c2954f91a4f81c597ba83f24a89ddc37e39e917c9a5fdc3dacff6e
-MISC ChangeLog 32051 RMD160 1fe8351c4cb02fdeaaa6c7fbdea2383781533658 SHA1 38450de251139329b996e323e0a9760b2c881d84 SHA256 8a5ae3d8ff1b6e103c1872725f06da50d375c2ec435b1ec4d53d62e3e18715fe
+MISC ChangeLog 32188 RMD160 9d4a62aba88c18d20c51c34df1fc2c0c8b727f81 SHA1 1e387a4af25e473acc42541a257342db3c32e952 SHA256 cfbdafd78bc885d01c17ec72b81575c88447d8d4f7f54c6cd8a70c66b96387ea
 MISC metadata.xml 351 RMD160 9a2f8ace5189665008eac04219b424984b6af8fe SHA1 5b8a1d9bdb3d322c2128d3871f4ffc379e58cd96 SHA256 5629f3b578b84d76ef9199df2dbeefaf4f04f966738e4bd35d56183fd3b81618
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknREqoACgkQoeSe8B0zEfyDiQCghhSGxyfhqflqFiDhMwXmql0d
-xT4An0y9mydgj6Oxc+iDuS+upB/a9+Tm
-=zlpY
+iEYEARECAAYFAknqxxwACgkQoeSe8B0zEfyVqwCeNCjds9zDl5h/7+SgHoyu3mbO
+2TEAnRoYS0WTD53GQwCRLQ1V+H0W5Cg/
+=hLSJ
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-180.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-180.51.ebuild
new file mode 100644
index 000000000000..4b41d423bfc6
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-180.51.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.51.ebuild,v 1.1 2009/04/19 06:38:59 cardoe Exp $
+
+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? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+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
+}