Version bumps.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 1001 insertions, 2 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index a242ff4630f7..c699c1c63b3a 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # 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.141 2009/03/23 14:15:51 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.142 2009/03/23 14:35:14 ricmm Exp $
+
+*nvidia-drivers-173.14.18 (23 Mar 2009)
+*nvidia-drivers-71.86.09 (23 Mar 2009)
+
+  23 Mar 2009; <ricmm@gentoo.org> +nvidia-drivers-71.86.09.ebuild,
+  +nvidia-drivers-173.14.18.ebuild:
+  Version bumps.
 
 *nvidia-drivers-180.41 (23 Mar 2009)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9b12240a695d..212d68cca7fb 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -18,6 +18,7 @@ DIST NVIDIA-FreeBSD-x86-173.14.12.tar.gz 15856061 RMD160 c68ef8983bbd84d68142c82
 DIST NVIDIA-FreeBSD-x86-173.14.15.tar.gz 16212612 RMD160 136bb03f1a465fcda058b0bc95eac77ce95ee088 SHA1 cc859db781552e979e6e7055f19fe717679bd0f9 SHA256 971388007d9522573752f36be009b49e0db14d957dd79119790a627320bdea2b
 DIST NVIDIA-FreeBSD-x86-173.14.16.tar.gz 16207135 RMD160 beceed24337c11b48b82d451fc752457991a139c SHA1 98d89d221ceced5bf497adea03fbee26f1bc4af7 SHA256 caf775990d0a6fb35fb7f5b1cb83872bd95a49f7bf73d9f1dff6f783b6dcf3a1
 DIST NVIDIA-FreeBSD-x86-173.14.17.tar.gz 16206185 RMD160 f3376b772ce539d620f3d9af9a81eeae578b9df5 SHA1 fb1b42aec1dd10013aa35b77725b20abe0b59fa6 SHA256 70e2f9c73a702b470e800944a1ca6e2bee118d3feff4a5a6499b9c72ed8ea22f
+DIST NVIDIA-FreeBSD-x86-173.14.18.tar.gz 16203001 RMD160 42803f45677f1edf51f91fb4ece3b10fbd5e514b SHA1 102667e46fdff3186bfd10b128f7024c01e169d9 SHA256 7c77dd3e442351a5e782888db93a4e2f3832396adb85f65c086ed1f1c906700a
 DIST NVIDIA-FreeBSD-x86-177.80.tar.gz 16704786 RMD160 88b85e8872338b8b91ff1c51570b93302bd7514a SHA1 e7ba987ab22fd5644a073b4fcf8477d036264cd4 SHA256 169f06ff5af4c4b5a0f0fbec6a1d7d7318feb25dce64cdbe63861af92de65437
 DIST NVIDIA-FreeBSD-x86-177.82.tar.gz 16708972 RMD160 ef85282a05127a7d5c764243deb2448d9045f0ba SHA1 1df52f23e241a847c256f125b3bc73d2d714e344 SHA256 705c2ed339fbe17545b490d6fced7da351624f767b3d710dbeabfc6447079ac1
 DIST NVIDIA-FreeBSD-x86-180.22.tar.gz 17867440 RMD160 9953a2b45134c43eb3b26e3c5181b2660f5c9d9d SHA1 7c61226b62b21c800e2c32a1173f09b2006715f9 SHA256 1c5f5647e36908eca031f45fff2b11d08efdb0de351e161aedd95b2ca2bd196f
@@ -34,6 +35,7 @@ DIST NVIDIA-Linux-x86-173.14.12-pkg0.run 11587505 RMD160 97d02d21f94b2c93f27af04
 DIST NVIDIA-Linux-x86-173.14.15-pkg0.run 11876894 RMD160 ecfa439b84db97d7dfdd4337bd0138d1a49c6bd7 SHA1 e480c29f5c1ead123c546be10b81d747bd7a675c SHA256 736b4314854e676570f6c4a179bfa65763c73fbdaaaa5de91f5820f8d170ada4
 DIST NVIDIA-Linux-x86-173.14.16-pkg0.run 11880373 RMD160 c12b35fb166c23017c33eff6b99b0d589f6bb1ff SHA1 086c20077fbee0fa52ba1f7dfdabb1856d339356 SHA256 9dfdeb0e02c51cbe4df4c3cd5043c3770a0ac6f82dc4f6918250732164e90bbb
 DIST NVIDIA-Linux-x86-173.14.17-pkg0.run 11881672 RMD160 8bced107ad8acd23c9e49f521be408d3c8a06e2a SHA1 a1fe3ba659e604925c25448e401b7ba551b3f038 SHA256 2f761ba18c9a7b49e556e941bb946df2b46d4220476af167c5447467722c8a5f
+DIST NVIDIA-Linux-x86-173.14.18-pkg0.run 11872482 RMD160 cdc425d311b6067d0caec30dbc7f339c8486e9b4 SHA1 10e7b49faa74a1067ccbbf6131e13658ffadbfc5 SHA256 fffea4ac0461b52021191d86d5a7965bd95219bb4c4f505eb532759438fbd2b5
 DIST NVIDIA-Linux-x86-177.80-pkg0.run 12743262 RMD160 ffeb2f6ed3c4ba4ae8678c502a78440abfdbebfb SHA1 b193ae0d386b88ee0e7dbecbb565bb7ae70c1e05 SHA256 7a0afe3e9bcdd5ec4cf078d38592f408f8cccfb2c50beca71cf47b53be1aa997
 DIST NVIDIA-Linux-x86-177.82-pkg0.run 12747296 RMD160 1edf12487961bcf6c932797ea28db20dc48c3e19 SHA1 efca3d21433250221dcdee4d304e999a7cf20fae SHA256 947384416a991a583aa44dfb594e323858ecaedf4e6ad859849e43301c9f9515
 DIST NVIDIA-Linux-x86-180.22-pkg0.run 13205766 RMD160 b2bf60bd3b2dde36989e25147b970c5f56a3fa62 SHA1 385b6947ff725be28cdb361ca0429c474cf7f633 SHA256 94091f6b3fbf721b6960b8fd990f256e4dd4a91ce5a31a4e5934fadaf0ba4c1b
@@ -44,6 +46,7 @@ DIST NVIDIA-Linux-x86-180.41-pkg0.run 13563960 RMD160 5a3f095e7306ac1efdb9916a07
 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
+DIST NVIDIA-Linux-x86-71.86.09-pkg0.run 5274589 RMD160 ca2cb1d370a15328925b0e2fb8c211b57b29cf78 SHA1 c66c0859a3ff142bc2435ed00a23b7dea45c1305 SHA256 464681742bf702f1359d7477c4023a6264f68cddce6c15ce2a5657c7da9dfb1c
 DIST NVIDIA-Linux-x86-96.43.07-pkg0.run 6595902 RMD160 beeb827c53dd8ad8712db9b39fda8219308ff05e SHA1 4820162119f81a30b665f37fd8d772545d921be4 SHA256 8a61ad352bc7f3aceebe3fd3fed39354fe13214bb13f7c4ddda557f5bc842515
 DIST NVIDIA-Linux-x86-96.43.09-pkg0.run 7235652 RMD160 0e2aa9244efa4abba6b33462cfb5fdaa32a28cfd SHA1 47d14780acdf0f41b866ed9fc2c3f80f095a9fc0 SHA256 ef4a8378cceb7a1a47028d7a4cf06ab1c3b203e57d853c9f36b5204531bcdfb7
 DIST NVIDIA-Linux-x86-96.43.10-pkg0.run 7792883 RMD160 91cc61f7fc05d7469c10f60501ab3588d0575952 SHA1 dd5915b13c3144b959ba61739fff4ed53a18f927 SHA256 fad5a53dcbd3032b4cabb3104dc3a25d37a4a0d8ed0e18aaf6f0c572d1666d31
@@ -54,6 +57,7 @@ DIST NVIDIA-Linux-x86_64-173.14.12-pkg2.run 16794952 RMD160 68e27029a16dfe7a5b67
 DIST NVIDIA-Linux-x86_64-173.14.15-pkg2.run 17153650 RMD160 e156525049175e8f5a7dc27c920f0a2f5ae5d47d SHA1 165563ca94d20b78aea2ce5752d14350ef38af6e SHA256 26de94a26e8892f1cdabfb2ae94a0ec0332a901aefb47b38dbb3a3b334513981
 DIST NVIDIA-Linux-x86_64-173.14.16-pkg2.run 17154343 RMD160 f9cfbf57bdf01cdd7e0322f0960b3d23913e3816 SHA1 7b71256dc039f58db49fca771c3a646ec5c32b89 SHA256 0740b240fafaa2d3d35731fc8c3d0a6c61bb5adc902c83b2de4dcda3d866a350
 DIST NVIDIA-Linux-x86_64-173.14.17-pkg2.run 17153760 RMD160 8f703e377f943983e2395c51111d4aa8ae4eaf34 SHA1 50d6dc22e776dc5454472828b812651804db5881 SHA256 5a21f300d76c83e98b6618eb94191fd1743730b5c1785c804ea71a759cd7e792
+DIST NVIDIA-Linux-x86_64-173.14.18-pkg2.run 17146775 RMD160 822edc8794b791284efc003b66cd83c4ab2bd761 SHA1 06761c527ab5896b142c9e642315fb58bdbc111c SHA256 7de554cb7166d1a9af1ab2b62ea02a36193af9b1eec16f53dd7feb3731d10e7f
 DIST NVIDIA-Linux-x86_64-177.80-pkg2.run 19409654 RMD160 e492240b2c6ce78edd8c1dfd856b98a477844bac SHA1 218e803705269498552c877e8d27316ef323c983 SHA256 877c1d70568d75ab34ded0e4eac97374d7cf19a20ac51860f27a5157d89da1cf
 DIST NVIDIA-Linux-x86_64-177.82-pkg2.run 19416201 RMD160 82a7d9f38965a256d270f2e13a0a673b90247f61 SHA1 b99947e3732f11ddbad5bdcc033154ce55976fc3 SHA256 4235f3acc516cf209b91222c87ba768c5fdbef171c7737db9f1d6cc890f2737f
 DIST NVIDIA-Linux-x86_64-180.22-pkg2.run 20754738 RMD160 162ca2d4434ff8c781cba23c9d851deeb847c8d0 SHA1 5fb516644e1394917e9466dfe0d79c3b15dc6601 SHA256 bb3727373d34f68de24cff36fc05d9bdbfd3d20633bbcdb15d88b11251d6cc7b
@@ -64,6 +68,7 @@ DIST NVIDIA-Linux-x86_64-180.41-pkg2.run 21468727 RMD160 bc71f42f6489561e0555a38
 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
+DIST NVIDIA-Linux-x86_64-71.86.09-pkg2.run 8388126 RMD160 c8f5252db6f22149164156e62e4a151334adc869 SHA1 8df93e50e5fc182290838db5f762763c0582bc9c SHA256 f6d2d949baac3ea00132bb76df2a982f4fefdf2b9acfc7968668d317ed1010df
 DIST NVIDIA-Linux-x86_64-96.43.07-pkg2.run 10201418 RMD160 a8001232a5f2108a7ed8f2816487873317ebf018 SHA1 7c6e4f8050f1a8221efb458d350b6853f00d2cb4 SHA256 37efff3be9404fc936a074ce2c9e9a189568a02c3893d75bf438d5b45682051e
 DIST NVIDIA-Linux-x86_64-96.43.09-pkg2.run 10940888 RMD160 9dfb6264fdd932cb8dd45a6738207593080e67a8 SHA1 6e3061afa0d8424c86a4ebd86e0505233fd4c3a6 SHA256 e5fc926178231a2c4677dc007358e79ebcbdb2ce0def4ec4cc9d5732f3000d54
 DIST NVIDIA-Linux-x86_64-96.43.10-pkg2.run 11587529 RMD160 a39f629c2fa9198506c7658b8990f97246d459c2 SHA1 b14784d8a2c82137a1c5ff010041abcda5c78a52 SHA256 05fd243f4101288242edfde4f6237f2eda0c3cfc7c55f746bd4fb32390da4dd8
@@ -74,6 +79,7 @@ EBUILD nvidia-drivers-173.14.12.ebuild 15103 RMD160 f48624f0a133fdfcad40a3728d8e
 EBUILD nvidia-drivers-173.14.15.ebuild 15089 RMD160 c29ca1d21d1839beabae1143707768a61e119b37 SHA1 657c727929f5c2f118c72c007ac2139ffaae8440 SHA256 9dd974e3205259460e7c322a7d65a44c51144ae6b68677a22004a44907d10113
 EBUILD nvidia-drivers-173.14.16.ebuild 15090 RMD160 7c553ee7df4996e8a76902433287035348874949 SHA1 ffe2aef46034cafcb59bb139f73c6fed8016a6f7 SHA256 736518faff3de7d58dbbca785dbb616c9c81be10282cc139bdcf9385eb65b699
 EBUILD nvidia-drivers-173.14.17.ebuild 15091 RMD160 58d253172825817ae1dc8eeacd9d3835435a91f9 SHA1 2f6a646041d84b52a4a81eaf05c3270db1a8b3e8 SHA256 df7b48b60aedfedbd7585322c189f75d0db530ec625f1b03084029a233def03d
+EBUILD nvidia-drivers-173.14.18.ebuild 15102 RMD160 3297754b5c46c8f98b5e3bb40d89947c4e156b49 SHA1 4edb1dba20efa9c300b2bba33462e91ca2fc8f0a SHA256 0942a546da859217f4ea50a5b76c614d59a80b9ca164c136edb91f950a9c28cd
 EBUILD nvidia-drivers-177.80.ebuild 15048 RMD160 95aedd3d8d984df6ed8e799ab88f76bea155616e SHA1 d08a21a575a55bd133ca05ba4df82bd0d04aa87b SHA256 a5cb848ae004a8a9a922eeca26312c84494e02da8246df8bc4bd28663384941b
 EBUILD nvidia-drivers-177.82.ebuild 15089 RMD160 7392f1cc48820ec14a93326a9b3f8373a41a7ed7 SHA1 bb059c51a9e896af648edd1720f04ede79bf7d97 SHA256 996d43621b60cbdf37eb661ce7999856397e1dac2cef87f16171c334a2871953
 EBUILD nvidia-drivers-180.22.ebuild 15442 RMD160 cc8ef382244b28684e895520c84ef81e77359425 SHA1 97ebaa20f07f8933c6abe458071a07bf1b708ef4 SHA256 7aed249d21f8f12b8986c448a1031be418fe3f701c4149fbb6ec4498dd233bc4
@@ -84,9 +90,10 @@ EBUILD nvidia-drivers-180.41.ebuild 15429 RMD160 6fef045524d6fe038d605c12b9c8534
 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
+EBUILD nvidia-drivers-71.86.09.ebuild 14186 RMD160 6184259627d05dfafe0d27f1e366a588bda098ba SHA1 832a71cc67d4a221297ec24cdbf60aaf74673091 SHA256 4ac5648a265606dd28ddb8e61336371ee7799ae66d2d00e68b1793b172aaa5d4
 EBUILD nvidia-drivers-96.43.07.ebuild 14475 RMD160 35dc001755181bdda3e4d0c5be97879d579736a1 SHA1 c5b52dffd298e87c4cd78118bf5ada1f2af770d5 SHA256 07b82b5b503e61212104927ad79e4f75d082e39c0df807800bfaeb9e1874a98d
 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 31699 RMD160 4ff7f5e7b7510ba63b537613f39bd55944853c4b SHA1 82fb5fe701c72f0d4910f1e1e160aacad233efcc SHA256 040d5d298b0949ee8342cfa6a0e16b7728e816a40309201bda210bdbe2eaf1df
+MISC ChangeLog 31900 RMD160 e6de98fb4756c3165ece18d59a1a0d552d23a220 SHA1 aa4ae8a27792c620016767bacdf4e8908ca49557 SHA256 b511b6951abd187c3a79e224715f74f62d70bd24a54bbffa6ce1dad9f5f9aceb
 MISC metadata.xml 351 RMD160 9a2f8ace5189665008eac04219b424984b6af8fe SHA1 5b8a1d9bdb3d322c2128d3871f4ffc379e58cd96 SHA256 5629f3b578b84d76ef9199df2dbeefaf4f04f966738e4bd35d56183fd3b81618
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
new file mode 100644
index 000000000000..eca4495b06d1
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
@@ -0,0 +1,514 @@
+# 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-173.14.18.ebuild,v 1.1 2009/03/23 14:35:14 ricmm 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? ( 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="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="acpi custom-cflags gtk multilib kernel_linux"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="<x11-base/xorg-server-1.5.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
+}
+
+sysvipc_check() {
+	ebegin "Checking for SYSVIPC support"
+	linux_chkconfig_present SYSVIPC
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "Please enable SYSVIPC support in your kernel config, found at:"
+		eerror
+		eerror "  General setup"
+		eerror "    [*] System V IPC"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "SYSVIPC support not 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
+		sysvipc_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
+		cd "${WORKDIR}"
+		bash "${DISTDIR}"/${NV_PACKAGE}${PKG_V}.run --extract-only
+	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 \
+		    && einfo "Patching ${NV_SRC}/Makefile* to respect 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
+}
+
+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
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild
new file mode 100644
index 000000000000..2db69bd58b9a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild
@@ -0,0 +1,471 @@
+# 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-71.86.09.ebuild,v 1.1 2009/03/23 14:35:14 ricmm Exp $
+
+inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
+
+X86_NV="Linux-x86"
+AMD64_NV="Linux-x86_64"
+X86_FBSD_NV="FreeBSD-x86"
+X86_NV_PACKAGE="NVIDIA-${X86_NV}-${PV}-pkg0"
+AMD64_NV_PACKAGE="NVIDIA-${AMD64_NV}-${PV}-pkg2"
+X86_FBSD_NV_PACKAGE="NVIDIA-${X86_FBSD_NV}-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/${X86_NV}/${PV}/${X86_NV_PACKAGE}.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/${AMD64_NV}/${PV}/${AMD64_NV_PACKAGE}.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="acpi custom-cflags gtk multilib kernel_FreeBSD kernel_linux userland_BSD"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="<x11-base/xorg-server-1.4.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/xorg/libXvMCNVIDIA.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libnvidia-cfg.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_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.${PV}
+	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_WX_LOAD_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/lib/libnvidia-cfg.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/lib/libnvidia-cfg.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_WX_LOAD_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"
+
+QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	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/lib64/libXvMCNVIDIA.so.${PV}
+	usr/bin/nvidia-xconfig"
+
+QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so
+	usr/lib/libXvMCNVIDIA.so.${PV}
+	usr/bin/nvidia-xconfig"
+
+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() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	# use the right package
+	if use x86; then
+		NV_PACKAGE="${X86_NV_PACKAGE}"
+	elif use amd64; then
+		NV_PACKAGE="${AMD64_NV_PACKAGE}"
+	elif use x86-fbsd; then
+		NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		NV_DOC="${WORKDIR}/${NV_PACKAGE}/doc"
+		NV_EXEC="${WORKDIR}/${NV_PACKAGE}/obj"
+		NV_SRC="${WORKDIR}/${NV_PACKAGE}/src"
+	elif use kernel_linux; then
+		NV_DOC="${WORKDIR}/${NV_PACKAGE}/usr/share/doc"
+		NV_EXEC="${WORKDIR}/${NV_PACKAGE}/usr/bin"
+		NV_SRC="${WORKDIR}/${NV_PACKAGE}/usr/src/nv"
+	fi
+
+	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:${NV_SRC})"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
+		mtrr_check
+	fi
+
+	# On BSD userland it wants real make command
+	use userland_BSD && MAKE="$(get_bmake)"
+
+	# Unknown why this needs to be set
+	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
+}
+
+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 "${WORKDIR}/${NV_PACKAGE}"
+		cd "${WORKDIR}/${NV_PACKAGE}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+
+	# Patches go below here, add brief description
+	use x86-fbsd \
+		&& cd "${NV_DOC}" \
+		|| cd "${WORKDIR}/${NV_PACKAGE}"
+	# 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 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' \
+			"${WORKDIR}/${NV_PACKAGE}"/Makefile.kbuild
+
+		# If you set this then it's your own fault when stuff breaks :)
+		[[ -n ${USE_CRAZY_OPTS} ]] && 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
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" \
+			CFLAGS="-Wno-sign-compare" || die "Failed to compile"
+	else
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	cd "${WORKDIR}"/${NV_PACKAGE}
+
+	if ! use x86-fbsd; 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 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		doins "${WORKDIR}"/nvidia || die
+	else
+		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,README}
+	dohtml "${NV_DOC}"/html/*
+	if ! use x86-fbsd; then
+		dodoc "${NV_DOC}"/NVIDIA_Changelog
+	fi
+
+	# Helper Apps
+	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)
+
+	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
+		# 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
+}
+
+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 "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
+}