Added 8178 ebuild for bug #143814. Also added a (masked) 9625 beta ebuild.

Package-Manager: portage-2.1.2_pre1-r2

10 files changed, 902 insertions, 23 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index af7cbfbf42b7..3c60c9cf3685 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.9 2006/08/27 19:14:18 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.10 2006/09/25 14:09:57 wolf31o2 Exp $
+
+*nvidia-drivers-1.0.9625 (25 Sep 2006)
+*nvidia-drivers-1.0.8178 (25 Sep 2006)
+
+  25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/NVIDIA_glx-makefile.patch, +nvidia-drivers-1.0.8178.ebuild,
+  nvidia-drivers-1.0.8762.ebuild, nvidia-drivers-1.0.8762-r1.ebuild,
+  nvidia-drivers-1.0.8774.ebuild, +nvidia-drivers-1.0.9625.ebuild:
+  Added 8178 ebuild for bug #143814.  Also added a (masked) 9625 beta ebuild.
 
   27 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/libGL.la-r2:
   Fix libdir in libGL.la (bug #140982).
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d581beccaf7d..810c5c11c3c0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -17,6 +17,10 @@ AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853b
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/NVIDIA_glx-glheader.patch 380
 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf files/NVIDIA_glx-glheader.patch 380
 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf files/NVIDIA_glx-glheader.patch 380
+AUX NVIDIA_glx-makefile.patch 602 RMD160 6c92e177c7a551ee43dc9bb0a58790d18497fef4 SHA1 cea7e59f91b0baa41d980a07de92d7dcde4baa77 SHA256 074d041899563641d65bf257b3835fe5aea9e7220af24830d96d1183cd18392e
+MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/NVIDIA_glx-makefile.patch 602
+RMD160 6c92e177c7a551ee43dc9bb0a58790d18497fef4 files/NVIDIA_glx-makefile.patch 602
+SHA256 074d041899563641d65bf257b3835fe5aea9e7220af24830d96d1183cd18392e files/NVIDIA_glx-makefile.patch 602
 AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b
 MD5 ca48410a5f23b1fa3c5895201a7161e6 files/libGL.la-r2 733
 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 files/libGL.la-r2 733
@@ -25,32 +29,49 @@ AUX nvidia 704 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e SHA1 f57628e6cd4d
 MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704
 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704
 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704
+DIST NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056 RMD160 75d3ef8bab67868056f540f580aa907c8a32d0b6 SHA1 4f1e7dd851a49249d9e64209ca97d6f4fa6ea3a7 SHA256 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280
 DIST NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 RMD160 5b75d9b5e852b0d5222951d9d99c93d7960ee8f6 SHA1 70e6b1ed826ea0851aaefba93a15d553b1d5e725 SHA256 f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875
 DIST NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff SHA1 e9e3635824815061fd01b4ece43f5ecd8f0a3424 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07
+DIST NVIDIA-FreeBSD-x86-1.0-9625.tar.gz 9715066 RMD160 4a276d71ee699c13d28d6869a6f60c69841a0395 SHA1 2f4e4b66379c443c25bad2a35585883182d781ea SHA256 14689225ad924451a87512f245a1d5ac48c18dde128ec4277802de602c545d9e
+DIST NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641 RMD160 4075969c4229dd75467113b8eb22ab9645893385 SHA1 443cf4f3f608ddacc1023614f6e1b9c7f81a7ee8 SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9
 DIST NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 SHA1 bf83c71cc04117cfa4c81e38e2df07fa4dc3e8be SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee
 DIST NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959 RMD160 2d7249f4ca06db151d80870ff0da27edb402ee8a SHA1 fcd38bad3240b6b24cfef278238014351af98062 SHA256 099b597b93d794ec74b34583d3cbe6ea39f8ac5b2f7ae96d3aafbdfdd89daa83
+DIST NVIDIA-Linux-x86-1.0-9625-pkg1.run 13392272 RMD160 7dbdfb791507ff340c39151ebb2377d5c2eb6e7e SHA1 9f4ffac1ee5379f33019292e003646e5b8a4f8f1 SHA256 1d04acc158e834b0d15866ad319882b49c02b32e68ecb8bc57cfa92fcc889d3b
+DIST NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594 RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c SHA1 121f7c214370f832512f62a3b803833560af7de6 SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097
 DIST NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 SHA1 7f2a73a2e96a94e5d44336db6a3d663cf68ad7f8 SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c
 DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214
-EBUILD nvidia-drivers-1.0.8762-r1.ebuild 11155 RMD160 b273b1a08b16b8ffe813352a9525a5fca187ae31 SHA1 53e04e7c8ff41bd9240c35cf791ef8da64c6f4e6 SHA256 3c1221cf1b4a146b8bc0d4b90bc2a96b87fe7dc1122be393a6fb660d1c465451
-MD5 92db60af59c0b85fd0ae7bc5ea46dbf5 nvidia-drivers-1.0.8762-r1.ebuild 11155
-RMD160 b273b1a08b16b8ffe813352a9525a5fca187ae31 nvidia-drivers-1.0.8762-r1.ebuild 11155
-SHA256 3c1221cf1b4a146b8bc0d4b90bc2a96b87fe7dc1122be393a6fb660d1c465451 nvidia-drivers-1.0.8762-r1.ebuild 11155
-EBUILD nvidia-drivers-1.0.8762.ebuild 11089 RMD160 5c1f106b01732864ee007bf567ebd05586da78aa SHA1 e39c381f070886e4a4e3481bf4da875464b23f34 SHA256 44047c3ecd9cf64bbb7e39e14839e4a0667c38288f8250ee5cbbeab5ccfb5840
-MD5 cdf785e2ad1e01b9b9b244fea4fec8a5 nvidia-drivers-1.0.8762.ebuild 11089
-RMD160 5c1f106b01732864ee007bf567ebd05586da78aa nvidia-drivers-1.0.8762.ebuild 11089
-SHA256 44047c3ecd9cf64bbb7e39e14839e4a0667c38288f8250ee5cbbeab5ccfb5840 nvidia-drivers-1.0.8762.ebuild 11089
-EBUILD nvidia-drivers-1.0.8774.ebuild 11099 RMD160 053ff84f33677da2d66784181f4fe3182e7394ac SHA1 8b911e043e6e80d5130825b50f316f3e6fd79cc2 SHA256 14fb2f7e69cae93bc07ad01182a5d83cdef8b8945a51eb190f62316e3f0ab41c
-MD5 60d5204eeab114cbefa0742907dc4098 nvidia-drivers-1.0.8774.ebuild 11099
-RMD160 053ff84f33677da2d66784181f4fe3182e7394ac nvidia-drivers-1.0.8774.ebuild 11099
-SHA256 14fb2f7e69cae93bc07ad01182a5d83cdef8b8945a51eb190f62316e3f0ab41c nvidia-drivers-1.0.8774.ebuild 11099
-MISC ChangeLog 1755 RMD160 220190d497d8e6d4d8f7951f574a9c2b98b5c35a SHA1 3197eda7ac43b15f0d6520391394db0fee9dda82 SHA256 8f26922d37100d4a5f095bbc026d1fe41c8498f12aafd64230128baf486341a7
-MD5 81e44563a66347f12a4e84009957d181 ChangeLog 1755
-RMD160 220190d497d8e6d4d8f7951f574a9c2b98b5c35a ChangeLog 1755
-SHA256 8f26922d37100d4a5f095bbc026d1fe41c8498f12aafd64230128baf486341a7 ChangeLog 1755
+DIST NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484 RMD160 a97d4d52e290ff201fc644c2ecb530833315d83f SHA1 38a1f94a90a31569542ab588c1b755edc15cab73 SHA256 1e126198e40f8eaf4047048d0ebe08262fcc29e440e6bae1b9195a1c751b3329
+EBUILD nvidia-drivers-1.0.8178.ebuild 11195 RMD160 f777f83ce4a550454b8667b4264261d512580c31 SHA1 6de8cf1e6fb80c61c265f4fd24e2e07fb30c2e89 SHA256 40950573171bfe3296d0decc35245ec1eaf1b3b794153d719fd8492ea0a785a4
+MD5 645c7b193df8766cdf56be735c5beeb1 nvidia-drivers-1.0.8178.ebuild 11195
+RMD160 f777f83ce4a550454b8667b4264261d512580c31 nvidia-drivers-1.0.8178.ebuild 11195
+SHA256 40950573171bfe3296d0decc35245ec1eaf1b3b794153d719fd8492ea0a785a4 nvidia-drivers-1.0.8178.ebuild 11195
+EBUILD nvidia-drivers-1.0.8762-r1.ebuild 11263 RMD160 134370aa4f7a1e0ffeed5a0a7530e2caa9d8d569 SHA1 281de26f7897dc95b88ca32ce74178e54188124c SHA256 e4f75fde782cf726e3280f74f430b4ae28eea56b1a9f56ddb208ae7377fb74bf
+MD5 30a849f0b3ac32bc2666c3bf8558769c nvidia-drivers-1.0.8762-r1.ebuild 11263
+RMD160 134370aa4f7a1e0ffeed5a0a7530e2caa9d8d569 nvidia-drivers-1.0.8762-r1.ebuild 11263
+SHA256 e4f75fde782cf726e3280f74f430b4ae28eea56b1a9f56ddb208ae7377fb74bf nvidia-drivers-1.0.8762-r1.ebuild 11263
+EBUILD nvidia-drivers-1.0.8762.ebuild 11195 RMD160 18f17d52789071537a5c886a3f80729222e6be23 SHA1 a45079281f4c8d2ffabff3b245556ab039942cd8 SHA256 59398d4b0979e3e50f03f66a68dcd253767a9aa0119f62863b9b66d94d9d2198
+MD5 34ce0cc2bf54cf65ef87f39655a8862e nvidia-drivers-1.0.8762.ebuild 11195
+RMD160 18f17d52789071537a5c886a3f80729222e6be23 nvidia-drivers-1.0.8762.ebuild 11195
+SHA256 59398d4b0979e3e50f03f66a68dcd253767a9aa0119f62863b9b66d94d9d2198 nvidia-drivers-1.0.8762.ebuild 11195
+EBUILD nvidia-drivers-1.0.8774.ebuild 11204 RMD160 b10950dd870f63b119e854a1c91c4f3c0a1288e9 SHA1 c8d8222e07438aa543880eda95af68df18c8d7f1 SHA256 c25b24dac7d8fbbb09c332c66dcf2fce8c12ee9c20379a7ee3b7660838fb8d0b
+MD5 648bc1dc6d0836c289f4ddc2ddebb09a nvidia-drivers-1.0.8774.ebuild 11204
+RMD160 b10950dd870f63b119e854a1c91c4f3c0a1288e9 nvidia-drivers-1.0.8774.ebuild 11204
+SHA256 c25b24dac7d8fbbb09c332c66dcf2fce8c12ee9c20379a7ee3b7660838fb8d0b nvidia-drivers-1.0.8774.ebuild 11204
+EBUILD nvidia-drivers-1.0.9625.ebuild 11204 RMD160 83682871644ea7c697051c65455bcde97668f551 SHA1 ad94c4026f6d12d6d96fffe7b3e33da992d0a673 SHA256 a9eaa3713982845daddd339bbb4650bb61d6f8504136d9d637df48ee4038d149
+MD5 38245c4876234931731ce913e67fd0fa nvidia-drivers-1.0.9625.ebuild 11204
+RMD160 83682871644ea7c697051c65455bcde97668f551 nvidia-drivers-1.0.9625.ebuild 11204
+SHA256 a9eaa3713982845daddd339bbb4650bb61d6f8504136d9d637df48ee4038d149 nvidia-drivers-1.0.9625.ebuild 11204
+MISC ChangeLog 2176 RMD160 3248458f8a3054109cc34652d3ae8859bcb42029 SHA1 197576c5e7e328a4c623c53fece3ff9c0cf6f469 SHA256 9454a32a65afd372af399cb5a7188fa42bc3600e76dc0c17f294ad606661b3ae
+MD5 8d315ed3ade7d2579b7a9ff893670a4c ChangeLog 2176
+RMD160 3248458f8a3054109cc34652d3ae8859bcb42029 ChangeLog 2176
+SHA256 9454a32a65afd372af399cb5a7188fa42bc3600e76dc0c17f294ad606661b3ae ChangeLog 2176
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f metadata.xml 302
+MD5 912d39198d3b3254ec00bf0bdac9c964 files/digest-nvidia-drivers-1.0.8178 870
+RMD160 98786a8b1dc700709f538dacb7b2ebc5bb418acc files/digest-nvidia-drivers-1.0.8178 870
+SHA256 40ddd0b9152f72be231fb6f701d528ab7e0c586c2f8b6dedfc8512b080f33bed files/digest-nvidia-drivers-1.0.8178 870
 MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762 870
 RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762 870
 SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762 870
@@ -60,10 +81,13 @@ SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/di
 MD5 001ce5de86d073b2f9d1f7075aca2787 files/digest-nvidia-drivers-1.0.8774 870
 RMD160 88f38c4e304f6b6c91063a373559721e3555c883 files/digest-nvidia-drivers-1.0.8774 870
 SHA256 dba7d0016db3321eac77d5136e3f0da180cbb687969d3c1303675d4bd2ba2fee files/digest-nvidia-drivers-1.0.8774 870
+MD5 b98d444e73ab9937ba4c9a37fdfabf2a files/digest-nvidia-drivers-1.0.9625 873
+RMD160 18c933932f9c39421b1afb703608f0378ee71611 files/digest-nvidia-drivers-1.0.9625 873
+SHA256 2b535b61b24af630d83d6617b3c809833616a867164d466812d56b87d8447709 files/digest-nvidia-drivers-1.0.9625 873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE8e8ur2QksT29OyARAnpBAJkB5nZFH54zZg7c0LfrakjmrWjC8wCfS0Wi
-YE/V498+gGM3Oo6yNmUJkBk=
-=lbW2
+iD8DBQFFF+NKkT4lNIS36YERAqqiAJ49zOp4Foc61VWgUSGeg+6ywlKZZACfQxZ9
+7UI5vxqZi3RpafCQ0fpyaBY=
+=2/vm
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch
new file mode 100644
index 000000000000..45e550bca1fe
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.old	2004-11-10 12:13:57.751853304 +1100
++++ Makefile	2004-11-10 12:14:22.439100272 +1100
+@@ -1,11 +1,5 @@
+ default:
+-	@ echo
+-	@ echo "It is NOT recommended that you use this Makefile to install"
+-	@ echo "the NVIDIA driver.  Instead, please use the nvidia-installer"
+-	@ echo "utility.  However, should nvidia-installer not operate for you,"
+-	@ echo "you may use this Makefile as a last resort.  To install using"
+-	@ echo "this Makefile, please run 'make install'."
+-	@ echo
++	@ echo "Gentoo Linux does not use nvidia-installer."
+ 
+ kernel_module_install:
+ 	cd usr/src/nv; make install
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178
new file mode 100644
index 000000000000..b1295173933f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178
@@ -0,0 +1,9 @@
+MD5 ef6d63b01ff062b9f5c2dd458e7e89b1 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
+RMD160 75d3ef8bab67868056f540f580aa907c8a32d0b6 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
+SHA256 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
+MD5 bc9d459bfeee93735e3959de041635df NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
+RMD160 4075969c4229dd75467113b8eb22ab9645893385 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
+SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
+MD5 524acaed325910bed26e880ce65e7405 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
+RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
+SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9625 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9625
new file mode 100644
index 000000000000..307e84d84932
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9625
@@ -0,0 +1,9 @@
+MD5 4958ecfa87745c6afed008b0067c9720 NVIDIA-FreeBSD-x86-1.0-9625.tar.gz 9715066
+RMD160 4a276d71ee699c13d28d6869a6f60c69841a0395 NVIDIA-FreeBSD-x86-1.0-9625.tar.gz 9715066
+SHA256 14689225ad924451a87512f245a1d5ac48c18dde128ec4277802de602c545d9e NVIDIA-FreeBSD-x86-1.0-9625.tar.gz 9715066
+MD5 0e15c3234b9c61a2e81b0c0c697f22ef NVIDIA-Linux-x86-1.0-9625-pkg1.run 13392272
+RMD160 7dbdfb791507ff340c39151ebb2377d5c2eb6e7e NVIDIA-Linux-x86-1.0-9625-pkg1.run 13392272
+SHA256 1d04acc158e834b0d15866ad319882b49c02b32e68ecb8bc57cfa92fcc889d3b NVIDIA-Linux-x86-1.0-9625-pkg1.run 13392272
+MD5 e346c7b835dff8dadc12c5c504772ac5 NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484
+RMD160 a97d4d52e290ff201fc644c2ecb530833315d83f NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484
+SHA256 1e126198e40f8eaf4047048d0ebe08262fcc29e440e6bae1b9195a1c751b3329 NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
new file mode 100644
index 000000000000..f1a1afa82ac8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.1 2006/09/25 14:09:57 wolf31o2 Exp $
+
+inherit eutils multilib versionator linux-mod
+
+X86_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
+	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="dlloader"
+RESTRICT="nostrip multilib-pkg-force"
+
+DEPEND="kernel_linux? ( virtual/linux-sources )"
+RDEPEND="kernel_linux? ( virtual/modutils )
+	 || ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 || ( media-libs/mesa virtual/x11 )
+	 app-admin/eselect-opengl
+	 kernel_linux? ( !media-video/nvidia-kernel )
+	 kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	 !app-emulation/emul-linux-x86-nvidia
+	 !x11-drivers/nvidia-legacy-drivers
+	 !media-video/nvidia-glx"
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+if use x86; then
+	PKG_V="-${X86_PKG_V}"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="-${AMD64_PKG_V}"
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+elif use x86-fbsd; then
+	PKG_V=""
+	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
+
+# On BSD userland it wants real make command
+MAKE="make"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "This version needs MTRR support for most chipsets!"
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+pkg_setup() {
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if ! use x86-fbsd; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S})"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+		mtrr_check
+	fi
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
+
+	if ! use x86-fbsd; then
+		if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
+			echo
+			ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			ewarn "This is not officially supported for ${P}. It is likely you"
+			ewarn "will not be able to compile or use the kernel module."
+			ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+			echo
+			ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+		fi
+	fi
+
+	if ! use x86-fbsd; then
+		cd ${WORKDIR}
+		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
+	else
+		unpack ${A}
+	fi
+
+	# Patchs 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
+
+		# Patch the Makefile to not warn about nvidia-installer
+		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+	if use x86-fbsd; then
+		cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
+		MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+	else
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+
+	if ! use x86-fbsd; then
+		linux-mod_src_install
+
+		# Add the aliases
+		sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+		insinto /etc/modules.d
+		newins ${WORKDIR}/nvidia nvidia
+	else
+		insinto /boot/modules
+		doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko"
+	fi
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif use amd64 ; then
+		src_install-libs lib32 $(get_multilibdir)
+		src_install-libs lib $(get_libdir)
+
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || return 0
+
+	if ! use x86-fbsd; then
+		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+		newdoc usr/share/doc/README.txt README
+		dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog
+		dodoc usr/share/doc/XF86Config.sample
+		dohtml usr/share/doc/html/*
+	else
+		dodoc doc/README doc/README.Linux doc/XF86Config.sample
+	fi
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second paramis the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [[ ${#} -eq 2 ]] ; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+		pkglibdir=lib32
+	fi
+
+	local usrpkglibdir=usr/${pkglibdir}
+	local libdir=usr/X11R6/${pkglibdir}
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
+	local incdir=usr/include/GL
+	local sover=${PV}
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
+
+	if ! has_version x11-base/xorg-server ; then
+		X11_LIB_DIR="/usr/${inslibdir}"
+	fi
+
+	if use x86-fbsd; then
+		# on FreeBSD everything is on obj/
+		pkglibdir=obj
+		usrpkglibdir=obj
+		x11pkglibdir=obj
+		drvdir=obj
+		extdir=obj
+
+		# don't ask me why the headers are there.. glxext.h is missing
+		incdir=doc
+
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
+
+	dodir ${NO_TLS_ROOT}
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
+
+	if ! use x86-fbsd; then
+		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
+	fi
+
+	if want_tls ; then
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	else
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	fi
+
+	if ! use x86-fbsd; then
+		# Not sure whether installing the .la file is neccessary;
+		# this is adopted from the `nvidia' ebuild
+		local ver1=$(get_version_component_range 1)
+		local ver2=$(get_version_component_range 2)
+		local ver3=$(get_version_component_range 3)
+		sed -e "s:\${PV}:${PV}:"     \
+			-e "s:\${ver1}:${ver1}:" \
+			-e "s:\${ver2}:${ver2}:" \
+			-e "s:\${ver3}:${ver3}:" \
+			-e "s:\${libdir}:${inslibdir}:" \
+			${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
+		has_version "x11-base/xorg-server"; then
+		[[ -f ${drvdir}/nvidia_drv.so ]] && \
+			doexe ${drvdir}/nvidia_drv.so
+	else
+		[[ -f ${drvdir}/nvidia_drv.o ]] && \
+			doexe ${drvdir}/nvidia_drv.o
+	fi
+
+	insinto /usr/${inslibdir}
+	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+		doins ${libdir}/libXvMCNVIDIA.a
+	exeinto /usr/${inslibdir}
+	# fix Bug 131315
+	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
+		dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
+			/usr/${inslibdir}/libXvMCNVIDIA.so
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
+}
+
+pkg_preinst() {
+	# Can we make up our minds ?!?!?
+	local NV_D=${IMAGE:-${D}}
+
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# Clean the dinamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
+		rm -f ${ROOT}/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	if ! use x86-fbsd; then
+		linux-mod_pkg_postinst
+	fi
+
+	#switch to the nvidia implementation
+	eselect opengl set --use-old nvidia
+
+	echo
+	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia has requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}
+
+want_tls() {
+	# For uclibc or anything non glibc, return false
+	has_version sys-libs/glibc || return 1
+
+	# Old versions of glibc were lt/no-tls only
+	has_version '<sys-libs/glibc-2.3.2' && return 1
+
+	local valid_chost="true"
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) valid_chost="false"
+		esac
+	fi
+
+	[[ ${valid_chost} == "false" ]] && return 1
+
+	# If we've got nptl, we've got tls
+	built_with_use sys-libs/glibc nptl && return 0
+
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
+	# These versions built linuxthreads version to support tls, too
+	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
+
+	return 1
+}
+
+pkg_postrm() {
+	eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild
index 5b8a51970d53..02b45c01446e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8762-r1.ebuild,v 1.3 2006/08/08 04:03:51 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild,v 1.4 2006/09/25 14:09:57 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -131,6 +131,9 @@ src_unpack() {
 
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		cd ${S}; convert_to_m Makefile.kbuild
+
+		# Patch the Makefile to not warn about nvidia-installer
+		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
 	fi
 }
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild
index 456f41905e7d..0573cb297a55 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild
@@ -1,6 +1,6 @@
 # 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.8762.ebuild,v 1.3 2006/07/07 18:54:48 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild,v 1.4 2006/09/25 14:09:57 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -128,6 +128,9 @@ src_unpack() {
 
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		cd ${S}; convert_to_m Makefile.kbuild
+
+		# Patch the Makefile to not warn about nvidia-installer
+		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
 	fi
 }
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
index c0119526643f..a3d06bce7ffc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.2 2006/08/27 08:09:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.3 2006/09/25 14:09:57 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -130,6 +130,9 @@ src_unpack() {
 
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		cd ${S}; convert_to_m Makefile.kbuild
+
+		# Patch the Makefile to not warn about nvidia-installer
+		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
 	fi
 }
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
new file mode 100644
index 000000000000..acf1ea0aa4b0
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
@@ -0,0 +1,403 @@
+# 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.9625.ebuild,v 1.1 2006/09/25 14:09:57 wolf31o2 Exp $
+
+inherit eutils multilib versionator linux-mod
+
+X86_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
+	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="dlloader"
+RESTRICT="nostrip multilib-pkg-force"
+
+DEPEND="kernel_linux? ( virtual/linux-sources )"
+RDEPEND="kernel_linux? ( virtual/modutils )
+	 || ( x11-base/xorg-server virtual/x11 )
+	 || ( media-libs/mesa virtual/x11 )
+	 app-admin/eselect-opengl
+	 kernel_linux? ( !media-video/nvidia-kernel )
+	 kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	 !app-emulation/emul-linux-x86-nvidia
+	 !x11-drivers/nvidia-legacy-drivers
+	 !media-video/nvidia-glx"
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+if use x86; then
+	PKG_V="-${X86_PKG_V}"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="-${AMD64_PKG_V}"
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+elif use x86-fbsd; then
+	PKG_V=""
+	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
+
+# On BSD userland it wants real make command
+MAKE="make"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "This version needs MTRR support for most chipsets!"
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+pkg_setup() {
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if ! use x86-fbsd; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S})"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+		mtrr_check
+	fi
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
+
+	if ! use x86-fbsd; then
+		if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
+			echo
+			ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			ewarn "This is not officially supported for ${P}. It is likely you"
+			ewarn "will not be able to compile or use the kernel module."
+			ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+			echo
+			ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+		fi
+	fi
+
+	if ! use x86-fbsd; then
+		cd ${WORKDIR}
+		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
+	else
+		unpack ${A}
+	fi
+
+	# Patches go below here, add breif description
+	use x86-fbsd \
+		&& cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
+		|| cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+	# Use the correct defines to make gtkglext build work
+	epatch ${FILESDIR}/NVIDIA_glx-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
+
+	if ! use x86-fbsd; then
+		# Zander kernel patches
+		# None yet.
+
+		# Quiet down warnings the user do not need to see
+		sed -i \
+			-e 's:-Wpointer-arith::g' \
+			-e 's:-Wsign-compare::g' \
+			${S}/Makefile.kbuild
+
+		# If you set this then it's your own fault when stuff breaks :)
+		[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		cd ${S}; convert_to_m Makefile.kbuild
+
+		# Patch the Makefile to not warn about nvidia-installer
+		epatch ${FILESDIR}/NVIDIA_glx-makefile.patch
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+	if use x86-fbsd; then
+		cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
+		MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+	else
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+
+	if ! use x86-fbsd; then
+		linux-mod_src_install
+
+		# Add the aliases
+		sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+		insinto /etc/modules.d
+		newins ${WORKDIR}/nvidia nvidia
+	else
+		insinto /boot/modules
+		doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko"
+	fi
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif use amd64 ; then
+		src_install-libs lib32 $(get_multilibdir)
+		src_install-libs lib $(get_libdir)
+
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || return 0
+
+	if ! use x86-fbsd; then
+		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+		newdoc usr/share/doc/README.txt README
+		dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog
+		dodoc usr/share/doc/XF86Config.sample
+		dohtml usr/share/doc/html/*
+	else
+		dodoc doc/README doc/README.Linux doc/XF86Config.sample
+	fi
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second paramis the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [[ ${#} -eq 2 ]] ; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+		pkglibdir=lib32
+	fi
+
+	local usrpkglibdir=usr/${pkglibdir}
+	local libdir=usr/X11R6/${pkglibdir}
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
+	local incdir=usr/include/GL
+	local sover=${PV}
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
+
+	if ! has_version x11-base/xorg-server ; then
+		X11_LIB_DIR="/usr/${inslibdir}"
+	fi
+
+	if use x86-fbsd; then
+		# on FreeBSD everything is on obj/
+		pkglibdir=obj
+		usrpkglibdir=obj
+		x11pkglibdir=obj
+		drvdir=obj
+		extdir=obj
+
+		# don't ask me why the headers are there.. glxext.h is missing
+		incdir=doc
+
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
+
+	dodir ${NO_TLS_ROOT}
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
+
+	if ! use x86-fbsd; then
+		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
+	fi
+
+	if want_tls ; then
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	else
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
+	fi
+
+	if ! use x86-fbsd; then
+		# Not sure whether installing the .la file is neccessary;
+		# this is adopted from the `nvidia' ebuild
+		local ver1=$(get_version_component_range 1)
+		local ver2=$(get_version_component_range 2)
+		local ver3=$(get_version_component_range 3)
+		sed -e "s:\${PV}:${PV}:"     \
+			-e "s:\${ver1}:${ver1}:" \
+			-e "s:\${ver2}:${ver2}:" \
+			-e "s:\${ver3}:${ver3}:" \
+			-e "s:\${libdir}:${inslibdir}:" \
+			${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ||
+		has_version "x11-base/xorg-server"; then
+		[[ -f ${drvdir}/nvidia_drv.so ]] && \
+			doexe ${drvdir}/nvidia_drv.so
+	else
+		[[ -f ${drvdir}/nvidia_drv.o ]] && \
+			doexe ${drvdir}/nvidia_drv.o
+	fi
+
+	insinto /usr/${inslibdir}
+	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+		doins ${libdir}/libXvMCNVIDIA.a
+	exeinto /usr/${inslibdir}
+	# fix Bug 131315
+	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
+		dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
+			/usr/${inslibdir}/libXvMCNVIDIA.so
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
+}
+
+pkg_preinst() {
+	# Can we make up our minds ?!?!?
+	local NV_D=${IMAGE:-${D}}
+
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# Clean the dinamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
+		rm -f ${ROOT}/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	if ! use x86-fbsd; then
+		linux-mod_pkg_postinst
+	fi
+
+	#switch to the nvidia implementation
+	eselect opengl set --use-old nvidia
+
+	echo
+	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia has requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}
+
+want_tls() {
+	# For uclibc or anything non glibc, return false
+	has_version sys-libs/glibc || return 1
+
+	# Old versions of glibc were lt/no-tls only
+	has_version '<sys-libs/glibc-2.3.2' && return 1
+
+	local valid_chost="true"
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) valid_chost="false"
+		esac
+	fi
+
+	[[ ${valid_chost} == "false" ]] && return 1
+
+	# If we've got nptl, we've got tls
+	built_with_use sys-libs/glibc nptl && return 0
+
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
+	# These versions built linuxthreads version to support tls, too
+	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
+
+	return 1
+}
+
+pkg_postrm() {
+	eselect opengl set --use-old xorg-x11
+}