Use remove instead of softdep in nvidia-uvm.conf (bug #506168).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 20 insertions, 11 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index bdd30e6bace0..95dc821a5744 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.542 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.543 2014/03/31 20:24:35 jer Exp $
+
+*nvidia-drivers-334.21-r3 (31 Mar 2014)
+*nvidia-drivers-331.49-r3 (31 Mar 2014)
+
+  31 Mar 2014; Jeroen Roovers <jer@gentoo.org>
+  -nvidia-drivers-331.49-r2.ebuild, +nvidia-drivers-331.49-r3.ebuild,
+  -nvidia-drivers-334.21-r2.ebuild, +nvidia-drivers-334.21-r3.ebuild,
+  files/nvidia-uvm.conf:
+  Use remove instead of softdep in nvidia-uvm.conf (bug #506168).
 
   31 Mar 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
   nvidia-drivers-173.14.39.ebuild, nvidia-drivers-304.121.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1ffbf6fcae9a..b1fc5c8bf011 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -12,7 +12,7 @@ AUX nvidia-drivers-pax-usercopy.patch 2350 SHA256 56980f43db38d582bc6a9bfd881973
 AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b
 AUX nvidia-smi.init 664 SHA256 c996033b81cc1512d8370d62575a0ea0c694f6e1b91cc948b4529625130601a7 SHA512 f7cc27d6cce7c13adecb0b927680979ca6a398bc742a93492ab7f85702e4442d8fc00c476f381a0177ae031a9ae45c5cbb6777f20c545d5cd695150f9551a4ce WHIRLPOOL 66bf1a70fa0038a54ca9254cd5543f61bdc69a4c070544660f4ef9b2a004d28f1defdb26b1bc102b1eabd24e679f36fec14c9b313fba4b54c7a9a51a73ca021e
 AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14
-AUX nvidia-uvm.conf 54 SHA256 fc731a2083fef3c8c5e61d5f5efd2e868ea146efaafca4cee53ffdcc4523dcda SHA512 cda14cb1b418273773c1bb289e7abd01a6c418040b8c9306dd5fba6ca466677e7138141a5ae8f5602c4e74082e3943562befac1f6bac84875186170b783f23c2 WHIRLPOOL bdad510acb4fba27e38244b840d4137161f2a7788815afed72d99da299be34176767086fb315d01f81fe72f8af64b8633e3f2fa01b7ab06f48da6ba8fb12e3b3
+AUX nvidia-uvm.conf 82 SHA256 4407c7ceed58ead98492560c07fc44d4285a70ed5165407f1b959e46d6e6d081 SHA512 cbdb946934a0b7c7d0fab0937ead0a161ff20238e0b53f9e05ea18a4fa0507df8d37594bd13402e3ec2001d488daeb2bec718d612f68202768d62a3cec97aacb WHIRLPOOL a79d65d67b0ff446bb2c65f5f3ec16ffaf0268ab0abbc137b413168aa7f5e617e502eaaf00fd21a149778bdd134da532b25bb066fc70bfa601caa97397aaf424
 AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
 DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
 DIST NVIDIA-FreeBSD-x86-304.121.tar.gz 33977409 SHA256 980e613a5f969741f15ce8b87077c3b4343c72f2762613bf96237ba11d963ec0 SHA512 e031d7ce8f2db917a54792792901ce46d9a939bd818ed5167b5dabf58d102b54c687addfb083283db3091e54bdd71479dc4d87699be22abefe65662d93c4e49f WHIRLPOOL facc59cea0ff57819dafb9465b697d34b1f309ef7b4eae072b3af93ff64672845b747de57a77bb66fd62f224df4cad85b97efbd6ff79726ba51995abfe7f871a
@@ -34,18 +34,18 @@ DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.39.ebuild 16614 SHA256 ae887bb6ceac7514c08609cca6776e773d0511555a006e9bde8892bf040d6153 SHA512 bbfe1ae7c969105039c04f895b22703f093a0d7f81a60c0d77723566d0f0cd76edbecb8af1627dbb0d0f50ae27f9040fd703413c973a1e4dfe49620c2cba3194 WHIRLPOOL 0351e366306c958089c5035c9901f0ddb7fdfef54e314ce2f2ee0b8c4bc443827dbdc35ab53f1501dfaf6c289fca412b0826388a38925ad721cef7c61eb0a4fa
 EBUILD nvidia-drivers-304.121.ebuild 12593 SHA256 8f889a4e51dd37e2a385831a05b852abcce6d7cf6b31faea62bbf9fe9dcbd3ce SHA512 f35368b850cdc78106ecb0cac6a5b9c2f3655111762965e7f8189f368f92b1ad5a596692c8556b61350e53c90e498dc8367ee1c1d67dac73e60fde37f3abd0f3 WHIRLPOOL 7faa5e0a3627c48c9168fa7056914d7338dd233436aa8e00b94c04d89818c11ddbca29e4cf57803cbed688df1de8f14cf84b4c7f104f57b3fd82f6b4fccf2349
-EBUILD nvidia-drivers-331.49-r2.ebuild 13136 SHA256 5504d3f969538b12242901d7f11c9c1846ac83d9caed3f6f27bebc7e4da36a11 SHA512 ff7aa4f94fe7974c98e957e7f2e7653f3ff1d7db527c37f55dd5746e7c6396e69ed5312bebbf9445267bd39a4a84994e55dfd6e76a09fc0f12546ff906f93179 WHIRLPOOL d20ea2b0f431a2e44c50b40dad23ba592203380d24f0e27fafcd95b308562df5c0f0cbd2f95dda60fa2e9bb880fd78571c19321c716a77263abe013fa0affad5
+EBUILD nvidia-drivers-331.49-r3.ebuild 13136 SHA256 423ce3fcdb6548cbbe95184644d5a9e2b60ae40bf8fa64244e7fb0ee6bbfb84e SHA512 8144b81a32e20ab562d50b232821a39eaaa4c1127ea96f5cb65094c34d4a54a772183a02b3dd2fca6d26a40296eec2774000177fb5bcdb1dc7b573e3787254c8 WHIRLPOOL 60f79b8783dedcb8bc946432b14a5442306d86bd4f0700f73f3a72352a1d180343148f5fcba153f4b2325aab65e0399a0968439d2b7fbff8acd8469d9a02de55
 EBUILD nvidia-drivers-331.49.ebuild 12883 SHA256 12d574db28067e5508b610553e3f213e2e7e400d507a6d21e4c86d8c8fb53189 SHA512 1fc7a8ace8db4dcb47b30dd9349926151e0f54c17ed3a06a2c91717edb330ecf325232131d3d948f54f363028691f68e5150524f21494632339ce8282a103ef6 WHIRLPOOL 305306e11ec0ff78330a40034e09059978bc735fa38e2869177ff8f2695981fe5cd52d36f1029685b3f4914852505ae70df9e6e71c1e950ad6f1380831448bfe
-EBUILD nvidia-drivers-334.21-r2.ebuild 13536 SHA256 a131396b3e2aee8cc68bd20b6477fccdbb0edd3eb6726eb10026e5d72964f5c0 SHA512 6a07f03e46972f32998b93fc7b8d5d9ecb7aacff3a4bcd8d349665c1544cd5d5d3fa17a3e1e4b08a64f1f3e01044dabbe2443a00ad8d25f9d0f68c8531891815 WHIRLPOOL f76106c0c06f07975881f2beb30204a509d78a5db26a6e8c597df33207fc38474ca9c4bd773aa0d5020ba1d9ceeebdab7bddf7125be2566641f42c42f0b8d081
+EBUILD nvidia-drivers-334.21-r3.ebuild 13536 SHA256 61fd9753b19bc6f71c5afd43f2b018a0f2894f2c97272ec9a99b28909a315fae SHA512 c4e7ff3477e11df78e2d358e69536d2b15c4745ac0ebdcfb82cc4c98fa38b62a638f1b9b2255c595c0479949d499df77cbccf6bceefac367853c4701eb80996d WHIRLPOOL 0c3b7a8ec4aa8198c46db17da2980614f587703ccbca09cb2f830d7f3287d713959983fd3ea42f01f80dae2a87ff648fcdeb71fed72416734663f19017c7a5e6
 EBUILD nvidia-drivers-334.21.ebuild 13283 SHA256 5e24c1c7ab663f35a6a35b0a135ee86240c6e7b9e457b0fb64d6066e136577d5 SHA512 1b669ad23d40f1a77ded74336e75ee1f309e704eb851c603800047e5fe584de4d9c9f34ad8d2c99db05daa8e38972422d104d620e76fe8d53cd740d75aec23e8 WHIRLPOOL 57650878216739d9a4d8b0b3909b542fde0c44f015e0e07e9efeddecb14a9369b522580b01882ba5189f71edd93c260a652b64f8859f86b1a4c7fa80b7fe673b
 EBUILD nvidia-drivers-96.43.23.ebuild 14881 SHA256 d10341d00b552518b6cc075552b958d9f6bdf9237e28bd4392c17419d52190b8 SHA512 edbb8d34b02db54b071abaa977cd5a1adb2650282aefcf31bc608e743ae0f3c68d4c1c420b729b80bc2321b6f2b720ad666448b0d6b3804467005a2ac06091ed WHIRLPOOL d786cbf75263aa70d4cd66bea752e607ea4b6511ad78e970bb22e15c7f0ee38104ba85398dff7e72e3781d79dad9a2e4bcaacbb5d64da39e8b702cf9b7af827d
-MISC ChangeLog 5806 SHA256 e451565a775cab8f84feedcc0a5878459dd4020007d8c33978591a3cededb8e9 SHA512 1b4646aa508d5346d6371e1775fd81c04593ec26380358175ce83071a3d3265e05d9a604851f78eedc251f62516cb6feec445101c26646acc3f90673a7dd75f2 WHIRLPOOL bccbcc37d0e8f37f2d30fa698f7f4203a8cae9902e3c1be9c8cbd83c1101706cf62a79d5f4f4a48aedbb4f22c736adb93dc37f1d946ba74e433846d532c9efb2
+MISC ChangeLog 6166 SHA256 e9c0ae427a10c7f30a522c4dcccf736b6d257ff8e6a0defeb38de903df0f7530 SHA512 d94bd4b0851f9fcc5566580511691b05b080b0c21315f4f0085ea75d7b47f0348cc488309bb4f3e9d3f3ed0aafd6159b23bbf548b3e996cfc2b46bd06c9afcbd WHIRLPOOL e63947b8841a6e6b4561d3d59a8c21ee6cb61ae994bae83f7bbadfebf979049a92db077b24af85c798d989df97f54e1d8da82af595a3465420fd0cd69b48580f
 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.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM5vAQACgkQVWmRsqeSphM2xwCeNfqTJWHZK2FJyWpH+jfca1Fe
-CVYAn2w5JFJS0mPYpgo535cT35G2xabM
-=b43K
+iEYEAREIAAYFAlM5zwUACgkQVWmRsqeSphNxQwCfditr0xP4cz80Dh7IrUliprfu
+e/gAn3adFkl3nP/3N5OS+/reVSnLtNz1
+=pFm9
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf b/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf
index 18566d7dc0f3..222c5ba39265 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf
@@ -1,3 +1,3 @@
 # Nvidia UVM support
 
-softdep nvidia post: nvidia-uvm
+remove nvidia modprobe -r --ignore-remove nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild
index 5d69e427764b..dbb7d1ddd86a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.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-331.49-r2.ebuild,v 1.2 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild,v 1.1 2014/03/31 20:24:35 jer Exp $
 
 EAPI=5
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild
index a763fd6d2317..72414238c0f9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.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-334.21-r2.ebuild,v 1.2 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.1 2014/03/31 20:24:35 jer Exp $
 
 EAPI=5