Added patch from Joshua Napoli <jnapoli@actuality-systems.com> to install libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems with NV2x cards.

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

3 files changed, 11 insertions, 467 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 82b229f8b037..f3ea752787b6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -31,17 +31,14 @@ RMD160 05693b8aa0f5d15336c441f69ca4a05f167b08b9 files/nvidia 1152
 SHA256 a5549cddd18ccd21099d1464fbf12846c280a698672575e67000037cb67d7162 files/nvidia 1152
 DIST NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff SHA1 e9e3635824815061fd01b4ece43f5ecd8f0a3424 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07
 DIST NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963 RMD160 d646e511978ac77fddb6600eabdfc1ea32146e00 SHA1 ef27e21c6117ba912c8c4351f4e89098d6672296 SHA256 404f25862031d8f3036de33d2a0fafc3c54821a9a08832c1c1616c145d93baa5
-DIST NVIDIA-FreeBSD-x86-1.0-9629.tar.gz 9664826 RMD160 4fbde38f91a517ae6a27331859d896f129e3ae51 SHA1 06a1fff3daaa77b34e43ac09243405361a219bad SHA256 8d8e0977150871fcc45a5607df823970738da1f9ec1ec4c8115790b38cea9d79
 DIST NVIDIA-FreeBSD-x86-1.0-9631.tar.gz 9667093 RMD160 2034f9086ad44ae222199e4949195dffc67274f1 SHA1 2cbeb4c732670b9eac8f95b5b5fb670ffdf03213 SHA256 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550
 DIST NVIDIA-FreeBSD-x86-1.0-9742.tar.gz 11161961 RMD160 1fe9fa3f561fac1883e295eee68fd1b4065b8898 SHA1 59e1c2aca45a777fa52d3c84bdf6b791791b4ea2 SHA256 398d742cccb450d2c02e0bb4f9f91ec0daeee6546f1327ec6477c80d4b9fa287
 DIST NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697 RMD160 ada4a46bd70d11f1c337a3c4be8c3f860591562c SHA1 0a2e063da4bf9ccee23a30033280d660129aebe3 SHA256 79d86b5cc43e230584ffb93a7bc7e83d29ee8a7b3c376fbba30cf0b7dd7e9b01
 DIST NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231 RMD160 296dcc76c43fd65105f8d0c6f99295ee983b8872 SHA1 362902983e11e1b372a102359c6057ebb5aa7ef6 SHA256 0b25f9e407ea513cac8d600054d2dc28ca2e407caa535510210ad9fa5f45e8dc
-DIST NVIDIA-Linux-x86-1.0-9629-pkg0.run 6583110 RMD160 29181862d735990f8b9164967dad59e08328f323 SHA1 c958910180567b3662a206b6c3d37b36e82321b2 SHA256 a2f3773ad296bb307cb7586bbf9301da3c6e92747ebe2f857dc2a51e4815a612
 DIST NVIDIA-Linux-x86-1.0-9631-pkg0.run 6581907 RMD160 7fc0b394e0a9fbb772e43136528dbd3c2b7ac81e SHA1 52b85567907b2f32a3d3e0eef9a5a509013c05ab SHA256 d1a54248d55f2aecab735e40ae060928670a766a98dd652b2245ebd68085ca5a
 DIST NVIDIA-Linux-x86-1.0-9742-pkg0.run 7715637 RMD160 8b7eba8dff97b4230b1031d65ed99ec3e37adeeb SHA1 c1787fe77785e7a5931bb0cf387f4a235580bb63 SHA256 e123bc78281f3c07f0b39e35430dee855b6ae7baf00ea956119fa0dae12be8fa
 DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214
 DIST NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646 RMD160 5cba53392aa0fd27231d01883679e1a1dba7ee34 SHA1 2a6297b89f0586192f806a18271c5e58de4eed0b SHA256 6fc8dedf782fdfe408dc0196531c301bb3bafac6878520537807118f3a2f9384
-DIST NVIDIA-Linux-x86_64-1.0-9629-pkg2.run 10235191 RMD160 38ee873f59ddc1299621dcccc7cf1c43da50dec9 SHA1 92d42f9854f35a40b8fd04e567c72740312718e1 SHA256 e8fcee3beb71329ed1e5fd700d80ba60264ff17e84e39871fbc6e20cdf8620c6
 DIST NVIDIA-Linux-x86_64-1.0-9631-pkg2.run 10233636 RMD160 5e9c501fbfad27686651f64705854552be6c3f0c SHA1 add85f7b7d47c6657c1b53bbe6f8da0e1da0a1d7 SHA256 009d6e4171fa18580264ce0ace92c1c68f0702f009837f1214d77b6948223375
 DIST NVIDIA-Linux-x86_64-1.0-9742-pkg2.run 11715309 RMD160 f59dad063810e87ed79699a32419318a53cb6aee SHA1 a3db0b69cffd4d8847aa7a9c5abdf79c292901eb SHA256 c35f9bcfd0793f7c1b29077be276e4d4a2e69c4ea90ca60134c118350f2ef5b9
 EBUILD nvidia-drivers-1.0.8774.ebuild 12802 RMD160 da6ca3d5553aadb84d3e45d276a5385cfdb4a5a9 SHA1 4a3ef9d3138f985ee55eb11c273d8a4f67423542 SHA256 0102acf744c38d346e85c3625ed75fb222bac67ea3320e6ea478fbdcf6c1f5c9
@@ -52,22 +49,18 @@ EBUILD nvidia-drivers-1.0.8776.ebuild 12801 RMD160 7852ed36ebcb3383e2c71ede6443d
 MD5 36d824c156eed1bb869ac8c149ef9754 nvidia-drivers-1.0.8776.ebuild 12801
 RMD160 7852ed36ebcb3383e2c71ede6443d377d0ade986 nvidia-drivers-1.0.8776.ebuild 12801
 SHA256 a09d6c62af5fc869f6b19994045a306105ce988e124ef3a30220f58f91910ffb nvidia-drivers-1.0.8776.ebuild 12801
-EBUILD nvidia-drivers-1.0.9629.ebuild 12625 RMD160 38b6348cfe02abffcb7c4005ba3800adf4be3eb1 SHA1 4f9b6ad9c67d37fa7d1a9edd6cc63a6b05773d24 SHA256 c7c2825eed5697699bc6b8be4192ffced13aa5f6858533d35a328d66454905b5
-MD5 f230beff8933b26d721b55bd83f5fb1e nvidia-drivers-1.0.9629.ebuild 12625
-RMD160 38b6348cfe02abffcb7c4005ba3800adf4be3eb1 nvidia-drivers-1.0.9629.ebuild 12625
-SHA256 c7c2825eed5697699bc6b8be4192ffced13aa5f6858533d35a328d66454905b5 nvidia-drivers-1.0.9629.ebuild 12625
 EBUILD nvidia-drivers-1.0.9631.ebuild 12635 RMD160 c4af5f2b4bdfd3ce6333b0f61208c4ac80e4f64c SHA1 523625edce894b2d4b93c5e1ff32da16ea4b3845 SHA256 c9d3c860a1722be6d8fedfa41c1a2acd9f5bfe00e64c05a3ed8abf335a08e14e
 MD5 c63475f350114376c5616778beea4925 nvidia-drivers-1.0.9631.ebuild 12635
 RMD160 c4af5f2b4bdfd3ce6333b0f61208c4ac80e4f64c nvidia-drivers-1.0.9631.ebuild 12635
 SHA256 c9d3c860a1722be6d8fedfa41c1a2acd9f5bfe00e64c05a3ed8abf335a08e14e nvidia-drivers-1.0.9631.ebuild 12635
-EBUILD nvidia-drivers-1.0.9742.ebuild 12633 RMD160 e7312e8aafe2409b19f8894fa653962641e62778 SHA1 c3b48499d4367269830c8c6c2e0baf7077567778 SHA256 ee82467254386b49fad9266fc8dbf49170562b87cd5abbc5f6a1e2bf8b716da6
-MD5 7667fc55e5acedf5c3a69ab919c488b1 nvidia-drivers-1.0.9742.ebuild 12633
-RMD160 e7312e8aafe2409b19f8894fa653962641e62778 nvidia-drivers-1.0.9742.ebuild 12633
-SHA256 ee82467254386b49fad9266fc8dbf49170562b87cd5abbc5f6a1e2bf8b716da6 nvidia-drivers-1.0.9742.ebuild 12633
-MISC ChangeLog 7704 RMD160 e9a8a73a4236211ad4421b102a6d33498452eb34 SHA1 491bcc5b84374cfab71464e217bf53f999b52f0b SHA256 ee2cb86de92c41bba8e708a6f69fae3fca662fe3d67898285298a743591d6ae6
-MD5 90c3bc1429635dbdc86e4f9506887dee ChangeLog 7704
-RMD160 e9a8a73a4236211ad4421b102a6d33498452eb34 ChangeLog 7704
-SHA256 ee2cb86de92c41bba8e708a6f69fae3fca662fe3d67898285298a743591d6ae6 ChangeLog 7704
+EBUILD nvidia-drivers-1.0.9742.ebuild 12760 RMD160 4d5eea8a9778d988d90aee6b7295bac5628940fe SHA1 bf1c43e7e649e516a954bf1110f2c52bceebe682 SHA256 2e59a81a35464b22057445348c1f51bfd4e656549452e542a4b66383e880324f
+MD5 386cdccc8e5eb8b521330ce2806c9a8a nvidia-drivers-1.0.9742.ebuild 12760
+RMD160 4d5eea8a9778d988d90aee6b7295bac5628940fe nvidia-drivers-1.0.9742.ebuild 12760
+SHA256 2e59a81a35464b22057445348c1f51bfd4e656549452e542a4b66383e880324f nvidia-drivers-1.0.9742.ebuild 12760
+MISC ChangeLog 7996 RMD160 35b3f72d80350217c3a0da8e01be8103a8e9ee8b SHA1 49dc139e748bd8c37880a13662205a53679bcc89 SHA256 c144b1c8795ea58db7cc7d0542a5ae1fc774d5629a7d185728563b0c56e648a9
+MD5 b5e3ce1630dcccc8196ebc5ffe1a35e9 ChangeLog 7996
+RMD160 35b3f72d80350217c3a0da8e01be8103a8e9ee8b ChangeLog 7996
+SHA256 c144b1c8795ea58db7cc7d0542a5ae1fc774d5629a7d185728563b0c56e648a9 ChangeLog 7996
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -78,9 +71,6 @@ SHA256 ecdefa40d6421548fe01e3be584def65e7680204c39a50842b9aad7f81c82def files/di
 MD5 352fa2d75a4a3f1244165817cdbf61d4 files/digest-nvidia-drivers-1.0.8776 867
 RMD160 073fc276016fc837371f3c321bd76786bc68ca19 files/digest-nvidia-drivers-1.0.8776 867
 SHA256 9a2c001f4a7d6b6461ae0ed151c958442f1bc15f7c4515f499d876a503d41f92 files/digest-nvidia-drivers-1.0.8776 867
-MD5 e22ba3cecde9f7c5b6f5bbea87b34954 files/digest-nvidia-drivers-1.0.9629 870
-RMD160 bd8ebb0f64cf1e6326be4c9f5081925797496adf files/digest-nvidia-drivers-1.0.9629 870
-SHA256 a1bba83f45a5d37c5e48e7bd4d88c5d920b2bb57d9f244ee2616caabb705c280 files/digest-nvidia-drivers-1.0.9629 870
 MD5 e40c59778a2bc692817308df81ae2d1c files/digest-nvidia-drivers-1.0.9631 870
 RMD160 3f03d5b9e447512ed9a1fd6eefbc6d013c7b9c14 files/digest-nvidia-drivers-1.0.9631 870
 SHA256 7d920f7b6cae52a27fa4c0e9194e1e96565862955c2ceba136327bb92564c748 files/digest-nvidia-drivers-1.0.9631 870
@@ -90,7 +80,7 @@ SHA256 8dd84c7a6735999dd6c18040ed7dce2e29c6a5e6eef94ae145ecee72fee71c77 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFda0/kT4lNIS36YERAjsKAJ9P2wGag4sUcjO3x0m5PEmpGla49ACgkU3q
-C3j/QK6KuY75OYTi8hxywmY=
-=lWQ4
+iD8DBQFFdz1ykT4lNIS36YERAjw0AJ9kpIUB9pGXqPP24Zo8UfM15/KtowCdHAvz
+DFE0PO5ch3URsJ/eDHpJR2s=
+=02XH
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9629 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9629
deleted file mode 100644
index 5896235b1bb6..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9629
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 de54b42974d2aa1d2bcd0d0de81f0df9 NVIDIA-FreeBSD-x86-1.0-9629.tar.gz 9664826
-RMD160 4fbde38f91a517ae6a27331859d896f129e3ae51 NVIDIA-FreeBSD-x86-1.0-9629.tar.gz 9664826
-SHA256 8d8e0977150871fcc45a5607df823970738da1f9ec1ec4c8115790b38cea9d79 NVIDIA-FreeBSD-x86-1.0-9629.tar.gz 9664826
-MD5 f3a4129e1d5e9b06828627da56ca149d NVIDIA-Linux-x86-1.0-9629-pkg0.run 6583110
-RMD160 29181862d735990f8b9164967dad59e08328f323 NVIDIA-Linux-x86-1.0-9629-pkg0.run 6583110
-SHA256 a2f3773ad296bb307cb7586bbf9301da3c6e92747ebe2f857dc2a51e4815a612 NVIDIA-Linux-x86-1.0-9629-pkg0.run 6583110
-MD5 c7be950ab060dbd33a9958785f96b6e2 NVIDIA-Linux-x86_64-1.0-9629-pkg2.run 10235191
-RMD160 38ee873f59ddc1299621dcccc7cf1c43da50dec9 NVIDIA-Linux-x86_64-1.0-9629-pkg2.run 10235191
-SHA256 e8fcee3beb71329ed1e5fd700d80ba60264ff17e84e39871fbc6e20cdf8620c6 NVIDIA-Linux-x86_64-1.0-9629-pkg2.run 10235191
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild
deleted file mode 100644
index caae51ccee11..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# 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.9629.ebuild,v 1.2 2006/12/04 16:22:08 wolf31o2 Exp $
-
-inherit eutils multilib versionator linux-mod
-
-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}-pkg0.run )
-	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.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
-	media-libs/mesa
-	app-admin/eselect-opengl
-	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-	!app-emulation/emul-linux-x86-nvidia
-	!x11-drivers/nvidia-legacy-drivers"
-
-QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/opengl/nvidia/extensions/libglx.so"
-
-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_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib32/libXvMCNVIDIA.so.${PV}
-	usr/lib32/xorg/modules/drivers/nvidia_drv.so
-	usr/lib32/opengl/nvidia/extensions/libglx.so"
-
-QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/extensions/libglx.so"
-
-export _POSIX2_VERSION="199209"
-
-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}/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
-		# 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
-	elog "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
-	echo
-	einfo "You may also be interested in media-video/nvidia-settings"
-	echo
-	elog "nVidia has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	echo
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	echo
-	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
-
-	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() {
-	if ! use x86-fbsd; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}