Changed pkg1 and pkg2 to pkg0 for bug #146182.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 38 insertions, 514 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 90f72e195cc4..2b7e9efce034 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -29,10 +29,10 @@ AUX 1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637 RMD160 f5401a1c4011ca0850b92d93e
 MD5 804a9ea8bf5164aa3248c89ab2f6792e files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637
 RMD160 f5401a1c4011ca0850b92d93e867e23c10393d6a files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637
 SHA256 0308a8a68ddc1295d6b5bfe1e839ae246bfb109a1ae3262436739d69862e1d9e files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637
-AUX 1.0.9625/NVIDIA-1.0.9625-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab SHA1 44e6e57bbf7a4cbcc9ee9056deaf15b74546ec55 SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6
-MD5 63fdbaa357289ab2db41aabe79cd0aba files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
-RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
-SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
+AUX 1.0.9626/NVIDIA-1.0.9626-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab SHA1 44e6e57bbf7a4cbcc9ee9056deaf15b74546ec55 SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6
+MD5 63fdbaa357289ab2db41aabe79cd0aba files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530
+RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530
+SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/NVIDIA_glx-defines.patch 437
 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/NVIDIA_glx-defines.patch 437
@@ -59,56 +59,46 @@ 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-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-FreeBSD-x86-1.0-9626.tar.gz 9731946 RMD160 9c0f9baafd921bab45b015b2553aed6b4a1fcdeb SHA1 321647502a973aa447074c0f05cd289386fd601f SHA256 98e9a71b8264436f3100bd145993ee710a193db4e1aae1be1b3bc9213f7f4b2b
-DIST NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641 RMD160 4075969c4229dd75467113b8eb22ab9645893385 SHA1 443cf4f3f608ddacc1023614f6e1b9c7f81a7ee8 SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9
-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-1.0-9626-pkg1.run 13407646 RMD160 9ae7bd524bd1c8c51e4d518da427808870ac60aa SHA1 3143f67a1e009c7a30d21844b83a413fb0f07eb5 SHA256 ceecc1d54827c5323a041c06ccd7c557f4245a8f42d2e1a1d6164bd7ceac1396
-DIST NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594 RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c SHA1 121f7c214370f832512f62a3b803833560af7de6 SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097
-DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214
-DIST NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484 RMD160 a97d4d52e290ff201fc644c2ecb530833315d83f SHA1 38a1f94a90a31569542ab588c1b755edc15cab73 SHA256 1e126198e40f8eaf4047048d0ebe08262fcc29e440e6bae1b9195a1c751b3329
-DIST NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145 RMD160 2bdbe5aff2ab7afebece102db62233748bd302e6 SHA1 778089b3d34bdcf763f0e6e58767816f62378214 SHA256 56e8bc38e8966fe7e7046071409a27f02af909432b54f82b2e8079c1d6c3cc5d
-EBUILD nvidia-drivers-1.0.8178.ebuild 12575 RMD160 800552e95dec7e3a9431ea5162ffdf6c891bcf40 SHA1 6eb150aedaf771407add4a8bdfb4620501ca47dd SHA256 50a77b81ad729508977ecfc3430b8d489f8968dc31b05136dc8bd3bff034f515
-MD5 263550997e9f1a2add8a4eafa174717d nvidia-drivers-1.0.8178.ebuild 12575
-RMD160 800552e95dec7e3a9431ea5162ffdf6c891bcf40 nvidia-drivers-1.0.8178.ebuild 12575
-SHA256 50a77b81ad729508977ecfc3430b8d489f8968dc31b05136dc8bd3bff034f515 nvidia-drivers-1.0.8178.ebuild 12575
-EBUILD nvidia-drivers-1.0.8774.ebuild 12585 RMD160 b0592d739eb4f2cbc1ba3cbd558496a3e3597583 SHA1 44dcfa4b76ec184fba2bec2958cd190dc00f6cfe SHA256 f173401c544e64cbb2ed04dd4ff95a7f9abc431cf51bcc06864d61cdb6ab78ff
-MD5 1537dfd082051bf75c6daf2ab9221e85 nvidia-drivers-1.0.8774.ebuild 12585
-RMD160 b0592d739eb4f2cbc1ba3cbd558496a3e3597583 nvidia-drivers-1.0.8774.ebuild 12585
-SHA256 f173401c544e64cbb2ed04dd4ff95a7f9abc431cf51bcc06864d61cdb6ab78ff nvidia-drivers-1.0.8774.ebuild 12585
-EBUILD nvidia-drivers-1.0.9625.ebuild 12727 RMD160 14353c970a7efe91589f40ed4f124bfc8ee687ff SHA1 90dba0145d5153e7b2cb2b0dbc2c832f1767b05e SHA256 0033f886e2acfbccef413880c4056200229762ca4d3223b4ae92269b8d74abba
-MD5 8957b2df717a93a8ec6c2d713ea2ffdc nvidia-drivers-1.0.9625.ebuild 12727
-RMD160 14353c970a7efe91589f40ed4f124bfc8ee687ff nvidia-drivers-1.0.9625.ebuild 12727
-SHA256 0033f886e2acfbccef413880c4056200229762ca4d3223b4ae92269b8d74abba nvidia-drivers-1.0.9625.ebuild 12727
-EBUILD nvidia-drivers-1.0.9626.ebuild 12731 RMD160 691cb18282f9d4048a91ab04b54dacf5c9875ddf SHA1 6dd3210a99dd936a328b9817d108fb7b8d440947 SHA256 dd158591371d43baf22155d6e69eb8fd69ca616872a3f04bbbbdd04b50518f1b
-MD5 366af9e15b9beb992fcfe45d298bbf4b nvidia-drivers-1.0.9626.ebuild 12731
-RMD160 691cb18282f9d4048a91ab04b54dacf5c9875ddf nvidia-drivers-1.0.9626.ebuild 12731
-SHA256 dd158591371d43baf22155d6e69eb8fd69ca616872a3f04bbbbdd04b50518f1b nvidia-drivers-1.0.9626.ebuild 12731
-MISC ChangeLog 4854 RMD160 dbb8973d0a16fa41c49ac8a3d75db6c66a8f434f SHA1 48c6d91b8925ddcbfe032821c05725374add7425 SHA256 e8db47ca4121ff24d2d7ababf2c1d85f51e62c384211f4230b07cb438775f627
-MD5 a7f684ed2783d5232f6472640d07943d ChangeLog 4854
-RMD160 dbb8973d0a16fa41c49ac8a3d75db6c66a8f434f ChangeLog 4854
-SHA256 e8db47ca4121ff24d2d7ababf2c1d85f51e62c384211f4230b07cb438775f627 ChangeLog 4854
+DIST NVIDIA-Linux-x86-1.0-8178-pkg0.run 6139948 RMD160 386e8009b7a458bdc161380e833de137eb43017d SHA1 928c6cceb0cad409b4dee3a077b59b145d5c3179 SHA256 c0d61f2276455c29467c6880f90b00ee105d4947cbf850f6bcfdf76b73901afc
+DIST NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697 RMD160 ada4a46bd70d11f1c337a3c4be8c3f860591562c SHA1 0a2e063da4bf9ccee23a30033280d660129aebe3 SHA256 79d86b5cc43e230584ffb93a7bc7e83d29ee8a7b3c376fbba30cf0b7dd7e9b01
+DIST NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792 RMD160 5d1fbbbde5a5bc5331b1cf8900c69f0b65bb23d8 SHA1 a50e04f2db7a382e60b98330d69b406e8328e436 SHA256 da92ca07761719d12a5b0eda428852f83ed7dd0cfd3f6a2aef44de8df09453ed
+DIST NVIDIA-Linux-x86_64-1.0-8178-pkg0.run 6967611 RMD160 23dc587b409e1d9cabf917a98fa88d17713cee11 SHA1 f77142b6443a01fce1c085b4e6fc991cbc0ead9c SHA256 498c901a3670c97e3dcac0efaa5d5dbf9eb66f74c7855af862e07225d9a2d0a0
+DIST NVIDIA-Linux-x86_64-1.0-8774-pkg0.run 7369606 RMD160 c8762a7eea178007fb329a224558bee74a539b4c SHA1 a1bf17935d31fafe5e51188ed226e0e6dac2508c SHA256 50d6c81ba1f576bf2c15775f67fc40b089c70fd2a685f3bd6df2f00cafbbd27d
+DIST NVIDIA-Linux-x86_64-1.0-9626-pkg0.run 7449076 RMD160 04c7bd9b232e3c7c12ddd213826236f113a2d247 SHA1 c1b7dd0ce444de9eba72fd7d64f278a91d9ee439 SHA256 4958d6bf5ba621894b72b54fcab00a8da98908a1dc04698147f0bcf055ae35e0
+EBUILD nvidia-drivers-1.0.8178.ebuild 12503 RMD160 945466e2e99a0aa9fdf001f8b6341f4370eea98a SHA1 d8cd3c69dfe6f01613837e64a125cf59bee047ff SHA256 977fc61f2cd107957c232c61defc241c2d352f6647e5451eab756359924d261f
+MD5 242a85e8c1dcd5d821915dc10857ecea nvidia-drivers-1.0.8178.ebuild 12503
+RMD160 945466e2e99a0aa9fdf001f8b6341f4370eea98a nvidia-drivers-1.0.8178.ebuild 12503
+SHA256 977fc61f2cd107957c232c61defc241c2d352f6647e5451eab756359924d261f nvidia-drivers-1.0.8178.ebuild 12503
+EBUILD nvidia-drivers-1.0.8774.ebuild 12513 RMD160 81ff34e86a040990a15f65d1779d1495a52c3454 SHA1 17fd98cd95c667a13ee056886c1299023990a23f SHA256 8121710a033a98873594bc60b7782cfd5eb7d0572d6d5761849d100ce729741a
+MD5 69d303e47c13c854f33a1c8c1db1f4ae nvidia-drivers-1.0.8774.ebuild 12513
+RMD160 81ff34e86a040990a15f65d1779d1495a52c3454 nvidia-drivers-1.0.8774.ebuild 12513
+SHA256 8121710a033a98873594bc60b7782cfd5eb7d0572d6d5761849d100ce729741a nvidia-drivers-1.0.8774.ebuild 12513
+EBUILD nvidia-drivers-1.0.9626.ebuild 12634 RMD160 927bc35f929aea4b8d2a1e099a6e42839a7621b3 SHA1 60055d4c720a53d95ceb70f5691278bd87d1cc78 SHA256 239a5fc667174502ddaa3b600a9df0ef094fbcc7d86064de54a67eeefd1d8484
+MD5 05cbf8b7726d27e234ef46f334daf11b nvidia-drivers-1.0.9626.ebuild 12634
+RMD160 927bc35f929aea4b8d2a1e099a6e42839a7621b3 nvidia-drivers-1.0.9626.ebuild 12634
+SHA256 239a5fc667174502ddaa3b600a9df0ef094fbcc7d86064de54a67eeefd1d8484 nvidia-drivers-1.0.9626.ebuild 12634
+MISC ChangeLog 5181 RMD160 1cf7a3ae3f040054ff06cd038722468379a2a0f5 SHA1 dfe95e1d02936a05a55f797affbc5a7ac598dff2 SHA256 d3904e219beb5216d5b0e7ac8a42e0b0643afe997bd0e7f9a8a9400586deeba1
+MD5 19b7846af13a23a7fb5cd2959edda1e1 ChangeLog 5181
+RMD160 1cf7a3ae3f040054ff06cd038722468379a2a0f5 ChangeLog 5181
+SHA256 d3904e219beb5216d5b0e7ac8a42e0b0643afe997bd0e7f9a8a9400586deeba1 ChangeLog 5181
 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 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
-MD5 160ffed3719fda32c2b3e84e0c2047f6 files/digest-nvidia-drivers-1.0.9626 873
-RMD160 34e2b02246a49605f34e1eee6185bc87ba93fa35 files/digest-nvidia-drivers-1.0.9626 873
-SHA256 7e90ed9135bb2e1bd36a855785b78d74cae6907df69cc84db484ba7975be393f files/digest-nvidia-drivers-1.0.9626 873
+MD5 f3769129ffbdad4762f8e1b419db6775 files/digest-nvidia-drivers-1.0.8178 867
+RMD160 1a7299116dd9af2701666b9699b573224f004d21 files/digest-nvidia-drivers-1.0.8178 867
+SHA256 634a7306eebb638a417321bf2f2430e57b3627260143339a909b87b0f67f3c96 files/digest-nvidia-drivers-1.0.8178 867
+MD5 5517ec2b48324ba828b004338c0a7acc files/digest-nvidia-drivers-1.0.8774 867
+RMD160 ad760cd9232909d2bb26b2c04d8ab5592b02c0d3 files/digest-nvidia-drivers-1.0.8774 867
+SHA256 6b52da71d5a6bd5fe1a040eb249825f27c991d1351c4c1ce82972c2f126ce7f8 files/digest-nvidia-drivers-1.0.8774 867
+MD5 a5f04860c141452fdc099c5584f59a00 files/digest-nvidia-drivers-1.0.9626 867
+RMD160 40e793d0d174dcf879b984ac42c8a37e66cadbe3 files/digest-nvidia-drivers-1.0.9626 867
+SHA256 c693895386fd913123aab13c61ca5fcfd7748503672047ee8e84041c9a0d73de files/digest-nvidia-drivers-1.0.9626 867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNCQYmOfEJZHYOKcRAo01AKCduZS9srg926Fm7V2cjqROFnNsPgCggBJa
-TV9Ptjzh3gzxzwL7qLve+7I=
-=8/sV
+iD8DBQFFNN9PkT4lNIS36YERAqUVAJ9LiOH1oaTNRvcdVtAl36p2TUeoywCbBrsn
+ypWCG/rnJQdp/2/9pVV+IsU=
+=nLwk
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff b/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff
deleted file mode 100644
index cae4581af6bf..000000000000
--- a/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c
---- usr/src/nv/nv-i2c.c	2006-09-15 01:10:17.000000000 +0200
-+++ usr/src/nv.NOSMBUS/nv-i2c.c	2006-09-22 21:56:17.259789750 +0200
-@@ -138,11 +138,7 @@
- 
- static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap)
- {
--    return (I2C_FUNC_I2C |
--            I2C_FUNC_SMBUS_QUICK |
--            I2C_FUNC_SMBUS_BYTE |
--            I2C_FUNC_SMBUS_BYTE_DATA |
--            I2C_FUNC_SMBUS_WORD_DATA);
-+    return I2C_FUNC_I2C;
- }
- 
- static struct i2c_algorithm nv_i2c_algo = {
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
deleted file mode 100644
index 307e84d84932..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9625
+++ /dev/null
@@ -1,9 +0,0 @@
-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.9625.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
deleted file mode 100644
index 256b36f73a8f..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
+++ /dev/null
@@ -1,441 +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.9625.ebuild,v 1.7 2006/10/13 16:26:22 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
-	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/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/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/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="-${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.
-		# Zander i2c patch
-		epatch ${NV_PATCH_PREFIX}-i2c.diff
-
-		# 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
-
-		# Patch for kernel 2.6.19 from Daniel Drake <dsd@gentoo.org>
-		epatch ${FILESDIR}/NVIDIA_kernel-2.6.19.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
-	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() {
-	eselect opengl set --use-old xorg-x11
-}