Patch does not apply to 96.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index e8b3c870086e7f989a556343d0d9be10b63e8430..cee1ac4c2a001388c2954aab261737d11e60a44a 100644 (file)
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.292 2011/07/27 14:45:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.293 2011/07/28 06:05:29 jer Exp $
+
+  28 Jul 2011; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.20.ebuild:
+  Patch does not apply to 96.
 
 *nvidia-drivers-275.21 (26 Jul 2011)
 *nvidia-drivers-173.14.31 (26 Jul 2011)

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 54efacf3476f8d0c78e118b9e2685acf316ead56..978fac3ab876de3c2efb36179d11f87649afeca1 100644 (file)
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
 AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
@@ -60,6 +63,13 @@ EBUILD nvidia-drivers-275.09.07.ebuild 16567 RMD160 62681e0310cedb499400dc10bc4a
 EBUILD nvidia-drivers-275.19.ebuild 16579 RMD160 bb5678405936be6622b0a46327c39e67d0d80098 SHA1 c00020d197cc4f583fbd81c6870a7fef359fe0d8 SHA256 78b57a0b7617c5e2727326d35a93552faa7dd40d6fb86d1b7ff2e0ab25902108
 EBUILD nvidia-drivers-275.21.ebuild 16579 RMD160 4e5e5565d76f8bfef78d9333957a6034f7541f16 SHA1 273093ba394feaa02a27f5ff5156f20361cab749 SHA256 58f1c35f9eedf44b62df69c82cabf1ef1bbc72bf0615bead34ac2970c373b498
 EBUILD nvidia-drivers-96.43.19.ebuild 15643 RMD160 191d8bc638f28a713ad4aee08808ac9b41fbe6c5 SHA1 9dbee7e6497f06235325ba25cb245ba971a9bd53 SHA256 c05c182e870bd8b0363259edcf08d6c464696fb6221e9aeb4680664d171e1f8e
-EBUILD nvidia-drivers-96.43.20.ebuild 15648 RMD160 3015246483d093f939e4ba353043f0fd004a5ead SHA1 2ce14a2443d66a22235faf795405708d7374a470 SHA256 82705dc81246c7381b40e0ea5c8105168aed351705608020ad0f0ce7715341da
-MISC ChangeLog 63082 RMD160 025d92da16e2768419621d6ec07f809d47ff79a5 SHA1 b8d539b10c8198daa5609de0cad6e1d359b0ba33 SHA256 96d6256109c07530756a03decd6de4ea4432e9d57173ea21e7e89f7497acfb97
+EBUILD nvidia-drivers-96.43.20.ebuild 15584 RMD160 55c9da9be059793df879a2a4e4c376ba03bb6017 SHA1 bfe867ab82cc7e49b62f8db0b2198a0efec99764 SHA256 e63031c05251bb01d0c5adf930a969dfcb1009d3797647156f356b970d0af3c7
+MISC ChangeLog 63189 RMD160 ef1a28a0ba19ee982e1d83ee17b82ecde1e07925 SHA1 a92883b3877b638e794e581590c323f90292bdf0 SHA256 6b8c9c02b1145fea7de1c64ed5084dcc14e5082ada94503644cca01b50939a9f
 MISC metadata.xml 549 RMD160 b6f8cfd5fe9668f4031b43d2167ba4712b3cb508 SHA1 c48be9c87aa8b237fa09848a53625f8312fa2056 SHA256 22653e2d8ee95e57ce47b6292a9988feecada431dde56c2c97198efd6f4b9354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4w/DAACgkQVWmRsqeSphNEegCdGX03LN7fhV5yXzI1uKcNbKpw
+W+MAn17n0wBIKL13uBzGGLuDKlVL07So
+=z7rd
+-----END PGP SIGNATURE-----

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
index 1ddb896b3fbd138e294ef45ee5bda14fb67eb73b..d8b8bca53b677c70b1a82d9e05e50a136b244dee 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.1 2011/07/27 14:45:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.2 2011/07/28 06:05:29 jer Exp $
 
 EAPI="2"
 
@@ -266,8 +266,6 @@ src_prepare() {
                        -e 's:-Wsign-compare::g' \
                        "${NV_SRC}"/Makefile.kbuild
 
-               epatch "${FILESDIR}"/${PN}-173.14.30-2.6.39.patch #368939
-
                # If you set this then it's your own fault when stuff breaks :)
                use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*