Move kernel/device checks to pkg_pretend() in 304. Raise compatible kernel version in 343 properly.

Package-Manager: portage-2.2.11-r1/cvs/Linux i686
Manifest-Sign-Key: 0xA792A613

4 files changed, 34 insertions, 29 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 8f8ba3c03b9d..fd37e546ec33 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.566 2014/08/07 10:24:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.567 2014/08/08 12:02:07 jer Exp $
+
+  08 Aug 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-304.123.ebuild,
+  nvidia-drivers-343.13.ebuild:
+  Move kernel/device checks to pkg_pretend() in 304. Raise compatible kernel
+  version in 343 properly.
 
   07 Aug 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-343.13.ebuild:
   Raise kernel version compatibility.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 8972085718c9..d493c077c4e3 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -45,20 +45,20 @@ DIST NVIDIA-Linux-x86_64-340.24.run 69647833 SHA256 db0f4f45ece587b95a8ceb0d1acf
 DIST NVIDIA-Linux-x86_64-343.13.run 74289137 SHA256 424a7d0fbf668c94454a140c880c298c71496ad7dee699a0bfc594c70e499e54 SHA512 5a22d5967c2a72c135cdee26bb2d5512db38ce82085a2485f6b1280c7b65fae390d4653a630b6634dcc46868db394a046d71b73131f5a37c3a5b302ea3984c3f WHIRLPOOL dd79c4fa0324a39e2c7a5c46eb7a1af2c13b21d720c7815431f1b727bc6fa18503110048bb2a1bff7c6c4d7723734007babe434e9b64b629d213327eb99ad343
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.39.ebuild 16633 SHA256 544ab6b35347cf0043fd7489d6cfce2432e87c22f209886edc6eff9a68c57908 SHA512 044c5caa4a6f63c16665d54652c24b082eea4caedc8337a3942d6fae03c22438830a0e3d45a0d6de7e6fe6bc5069e8110c2b6172581071666026b061a2b05d39 WHIRLPOOL b117b6925b02ca2724b325a959e4b7694a404d363d14c3b852f8dee3c82d6a8b0be316601ccd209cbd2cb5d06d34a1d792ff2c470a712071ba301025083ff063
-EBUILD nvidia-drivers-304.123.ebuild 12610 SHA256 fea939909e7dca0ea473b3d257b594974ce29dfafc6486e60f643ad13f388fbe SHA512 0d412c74c764d36680e52b81798a28e2383b07a11fcbed689d1f4ef2f0b65a7baa2ee76555b54980b4e5f9a11a82deff0bc30ab46eb5607181d0afae1c0d6578 WHIRLPOOL 828ff9310a26c7a6e438abc6c5ddf0ff4965ed8807de4d5e5cebc2233be34d97453050c856ef5f24338972123ba7033dd7d67cc6ef01cff4f046e794076b9c94
+EBUILD nvidia-drivers-304.123.ebuild 12604 SHA256 0577772161667746d029ec7a6488a9b865e866958ae2e78f4027bece9d7c8041 SHA512 fe6d8da73e65008e0e4cdfe7f1a8af62d3cc982d11b719b57f4e0884de3b235b93c1225ba731fc01f2fef9faa54ff36cdbb85da35eb4de5b3935066c0a49c61f WHIRLPOOL 287194f3477e76696538411bfb77b5ea438b640f9ee237cbb4aa913bc62476482ae1f641864035d9527b4900a33a8f3f0d8a57029c33edb33d3f7b906eeedb27
 EBUILD nvidia-drivers-331.89.ebuild 12986 SHA256 c23d399d847b0f813eec522aae9702996fba38d6ef760d66e1c4f5ad02d2f36f SHA512 119fc804f7b7c6319707af9ad4edeebae4632f94f294ed81b8042d3afb630ffc54056785cb9b0c6c2e508c6732ebf8905fe25b542325ee39de0a8bb183de7499 WHIRLPOOL 73e634a01878642c4cf27664d55e7200ec98fd3a5061bd34e74e75b82654b962d8b234ef0e598e7b31191b25a5fd3fcb12a6f2241d5bf45529d8c06e9b9ec479
 EBUILD nvidia-drivers-334.21-r3.ebuild 13265 SHA256 fc05447975d06771e47ffa420daedea99c365c733f0f313ff0274d64d791dab1 SHA512 c0642c508616edd7e1a742f3a3ea20bc3f185e92c9e7a6b0a50ed179eb75cf07d5f1869098af9ad5822691f30ab91866f70e96dd01061ad10229f2c3d83b1987 WHIRLPOOL 3b64e50e871ad31e830b64b8248741e61d906bb31758fd76b63c5aaff1a098ef6938b372c9937305784ce03f2b731adf6117f48f409dd80320f661f299d38d2a
 EBUILD nvidia-drivers-337.25.ebuild 13268 SHA256 c3ebd456f9ad1ed91c699e1628b6c8cd85468099771afaca3957f512c8a9e2a4 SHA512 fdd60e6ccee344037ca31cf5ce952f4382ca70ad78288076af03799bfb3e070693dfb58f60e1e3918341909638312b2465dff4b6fb83d60cf9d7d075474a82ad WHIRLPOOL 2c3ec9ddafb5e3bedaee1d0448ba9843ddcd2488c5ef5c9d02deef673a50ab1668efe8f6ffbf6997051e2efc26928c76c84de49cc2399566b0725b582185c270
 EBUILD nvidia-drivers-340.24.ebuild 13268 SHA256 50b2a114deca587e61745b287b6dd12a9d881e95e7e37662ffe4ba7d8a3a022f SHA512 f3554133e5e27e664926546b62f649300bc9ef9a92fb4036b24b100355249ea965465f54275824a6f0bb0599ceb01d9d8c4c762154d1a572fef4757704fcf6c7 WHIRLPOOL cc1509bebd413dc1ad093db141c026bf00666d465b0a62e6e40e13d2d7937314b68f8afcf54ef8c6917bec26dac20a24592e642c6e3252dce614d5fa99e3ac66
-EBUILD nvidia-drivers-343.13.ebuild 13264 SHA256 16fafb768bf9a88dffd8ce674689aea9005e68a1cd4db663e9c15ec33e74635a SHA512 95ac4ae7cc601938c549efb97281560d434aff9e193d00a8952904623177059d23e4baee283e6eb1508ab4ef2b4b48c1686e527f96a4ea6175342d04cdc5cae0 WHIRLPOOL 2d9342921bdf023359461b11e4b94f9e3b78219267d9a3abec47092bf60aa4bd886fe6f233c4bce55ba7645627b4f985baa443f6952ff61bbd16f2437f7ae47e
+EBUILD nvidia-drivers-343.13.ebuild 13264 SHA256 fb56802b21169eb92d4f45b744cd607646ca66db483bd168948b575c0199ab0f SHA512 0fe813fbec52375120faa53f47c21543a16eec604c7ca1022be1b055f5a7dc0d5d2f7b360757be7ac02ecf57b3e8be56b88dc957557a73ab28bdd4ea7bf55b10 WHIRLPOOL c72e8ef2055b424fbe987084e64c3deeecf24a1063d504657ddcefa1aaa2180ec1979659e3a00a9c15814a64492dc964f05fef5b0a544b0a58e7d77af8c8c98e
 EBUILD nvidia-drivers-96.43.23.ebuild 14900 SHA256 5c91c2cfe129887c8f7c6b810da0a19b95c732fd9bc0bfe983e8217b10c02e73 SHA512 6eb6d56c35dcbc009a1d59e28cc2a43b83f713ba6090efe60878c4ed76d316f51fab5a97893691b28908c3eb9618d53c2805e3d22538277825e9d9e13ac8ecbd WHIRLPOOL c3dc75f852b23b967490032280110c39e96b6141ef051b82003201ce99f7475ebccdeb109cdc318d39b504d8708bbbad73fe458be4a808398ffabafbdfd02a69
-MISC ChangeLog 10340 SHA256 b8088829090ce1750b8201adcd3ab67be286896a22eed1b849bc6d0f41ed1c2a SHA512 7a31b35259f90c376cb46bca1ecc91b0b8ad23d60954b2660a647b3a18e531c11bcba3b03d3bc56dafff1d7df88aaaad2f002c62790c83b4e15534ec83c85869 WHIRLPOOL a4e2668d9b043f7d436821b94a50f2df2353f9599041baaad5e05eb673314c4060aedd39e649ed903f40c6069fca3014bb7b8806c931cc6135c7bc0817e6d104
+MISC ChangeLog 10555 SHA256 cd6e0238d3779bb6fe27ad956bde364a1e470542a49e471a65f771232b9a86e7 SHA512 995889d638d83fc37d9243044735e9c813bbe0d95feeba19ed2463835d16c52611900071ec8d07aadca49d18c32c264da0da257c94f66fc625c4e4eff64bcd94 WHIRLPOOL 6f6bfebb4136dc93af07f45f75fd287fe3b1a649b27bc1928a44f48798a47618692e631df2c56bd5ecd3e6283baa2465130c6a52797f1a81a9d38814720dcd45
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 591 SHA256 1b2f8667e5aae901fd45390fe287245faf07dfaed57f7243037c290c01db3e4a SHA512 8a4d1e029a0c7633244a1853fc26b2ea31608aa13f947bb453d99bfe8e0937d46e8abe4c0704382a992a486d92f66bfd5cce7406a0f129ac97ef1fc0b602e5df WHIRLPOOL 3061925c0c8172c1bab032bc79d664668921682e5bac4b926b17ee5d15357a6eec959c7f8618a97fe3e181ab1229baf500400aa4ba3480d3373dbdc3185b9d80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPjU/QACgkQVWmRsqeSphOCiQCfVDP9dql99Sp71xeLceW2xfnk
-3toAniSfdnMmLJBHEfTlu/0eUpsGqbRq
-=qpqc
+iEYEAREIAAYFAlPkvEIACgkQVWmRsqeSphND4gCcDeF/TvcvT2Pr7OAkX5888098
+yhUAn2ELike4Jq0dC+DkM3mOeuZF6ER+
+=zGSs
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild
index 0bac53522279..73861d78f5e9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild,v 1.3 2014/07/30 19:22:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.123.ebuild,v 1.4 2014/08/08 12:02:07 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -80,6 +80,25 @@ pkg_pretend() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
+	if use kernel_linux && kernel_is ge 3 14 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.16"
+		ewarn "<sys-kernel/vanilla-sources-3.16"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# 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
+
 	# Kernel features/options to check for
 	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
@@ -105,25 +124,6 @@ pkg_setup() {
 		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
 	fi
 
-	if use kernel_linux && kernel_is ge 3 14 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.16"
-		ewarn "<sys-kernel/vanilla-sources-3.16"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# 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
 		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild
index 64f67f8b476a..6ecc6326e0cb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild,v 1.2 2014/08/07 10:24:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.13.ebuild,v 1.3 2014/08/08 12:02:07 jer Exp $
 
 EAPI=5
 
@@ -82,7 +82,7 @@ pkg_pretend() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if use kernel_linux && kernel_is ge 3 16 ; then
+	if use kernel_linux && kernel_is ge 3 17 ; then
 		ewarn "Gentoo supports kernels which are supported by NVIDIA"
 		ewarn "which are limited to the following kernels:"
 		ewarn "<sys-kernel/gentoo-sources-3.17"