remove broken version. The kernel calls /sbin/modprobe directly, so that symbolic link cannot be removed at this time.

Package-Manager: portage-2.2.0_alpha117/cvs/Linux i686

5 files changed, 42 insertions, 32 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 1f2033f1b974..364c85080ad8 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,12 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.41 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.42 2012/07/13 16:27:28 williamh Exp $
+
+*kmod-9-r2 (13 Jul 2012)
+
+  13 Jul 2012; William Hubbs <williamh@gentoo.org> +kmod-9-r2.ebuild,
+  -kmod-9-r1.ebuild, kmod-9999.ebuild:
+  remove broken version. The kernel calls /sbin/modprobe directly, so that
+  symbolic link cannot be removed at this time.
 
 *kmod-9-r1 (13 Jul 2012)
 
@@ -175,4 +182,3 @@
   25 Dec 2011; Michał Górny <mgorny@gentoo.org> +kmod-2.ebuild,
   +metadata.xml:
   Introduce kmod module tools wrt bug #395863 and as a dep of udev.
-
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 4854b6e9998c..05219d0cf9e6 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX kmod-8-gc-sections.patch 3167 SHA256 d0f9a28f01b3ab7a00f53a97f8d1596977c945f9125e884e9eaa850e1f433281 SHA512 da6f05d784028536e5861c84add81b54f4e6338672aa576c92b95555dc75d18bdd5d6d689d7cc9ba0526866c23913e9bfbbccf3888e376fbaabd9053021e6a36 WHIRLPOOL ef143dd901a8b2dd46cbd45bfd030fb44ae67b7c333ae10dd7761ec5b12e3c7e93cc4e343c9c9642b410eef67051fe2a6542bab20418c805f526e9465ee5dfcf
 DIST kmod-7.tar.xz 981936 SHA256 9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7 SHA512 8cf1c4fdb7cc9eea43ceb8e5baecbd763d026eaf7bbc75dcbcd965b5523003f2be5e0dc7fb9c5ae7564bd28d35f1b6bdb3eda8f43aa2cbdd7cab44be21d74a62 WHIRLPOOL 7d5545182cff93504604646a934efe89a937f841e0b3d9be77f1636a5db7f1d0664dbd1dd8596e64b07290e45df46542fa44b01b9f240f1e99cb96ad022982bc
@@ -7,19 +7,15 @@ DIST kmod-8.tar.xz 986632 SHA256 35f7d1dfcf62ea3d6da1ed0ee41a7997333680033609c5e
 DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf SHA512 912404830d46ab27f9472a4ce0272c03b16b36291069f9cf1a51bc533429fe8f46d7a749edc399fb1631a435dea4077728d0a5b16961603fdde339d3e2b14f1f WHIRLPOOL 1f769b640b97aa248dcf8b0360f6733ce498bdac571b8710154c455d9971367c1d16204fd4acf1d898d4e0af93892c0f4c6e23ff62d50d96b75b69d5668ffb9b
 EBUILD kmod-7.ebuild 2043 SHA256 d3857975eeeb75bd43c89f930acc00493cf1ff50b4d55f784ac4d3901fc7a6e2 SHA512 c9be6f3cc835d15da7621fd463f98444e38814195c49808f5c66080fa9b3dc05aef2bebccbd2e42b2b59fe577768e5db4d6ece9e0249c52b28f3f3deaceb9759 WHIRLPOOL bebdca2513c3da37fb16bb4f5b9eca8ae8d0407142e8c864f533db4a87e854f609b36a01cf32bc8dc981480fbe683b40f409818746041ca5ca97fe5b0f3711aa
 EBUILD kmod-8.ebuild 2047 SHA256 64e6f1a538c996eafc0019e10265a40ebee231f6521dc95d4b5670c3a4558eba SHA512 b9bce18da0965e7cfb604a8ea50570ec834ec86fe388fd2eb573eeb2c82befb4539051ecb20047bba7777f94fdab14194dcb4f53bda26677cf4658b5967e45ab WHIRLPOOL 9091f6381e18fa326116c8fe1dee697cdba123abd9b359c1324a22433f36cef53f8c9136ed39829abea1fe498057652478992666b8a444b11ab19f4c4cc26222
-EBUILD kmod-9-r1.ebuild 1948 SHA256 b3f89a4b2b688848cb3771c815fbdbaa6bd6d7d21e75941267afb9541d7f3cf2 SHA512 3050d4bd39630693eb3fa05ac2f7ce7839ff086c42f91f21c24bc2a89fee2ab4537c1962c98a00d19b9598501fecbc6b0d7a2d2886cb689716fb4f3ba4dfc209 WHIRLPOOL 688da3682438c677079b369cba59bc4decdfabffea1143379087211f90b800eb2fc9c488800598570701a3b61fa91c28148126a039f10f5b97775ceed93b7ecd
+EBUILD kmod-9-r2.ebuild 2101 SHA256 afec3a7d2e0eb7bb28ac497f7b427374aaaa3e4fb5bce7448edc13beabb8a6b8 SHA512 78f6e7b2508fdbd89bbab15bfa6eafa2aa0a2e2e38825e22e7d0d7235ca3955d7fdf7fe6f87bbaa8926edce744afe79785f58929b61539c295e001d36b292f5c WHIRLPOOL 9f924907c6a7a7b7256e1135bdb71c43d8d6e7793b9c799d11e5a67a96aab4c606de29e7650ae4a24e62b77eb92333d5a1adcfbd121ebf6bb4ad1fa464e076b0
 EBUILD kmod-9.ebuild 2004 SHA256 106abde60c03dac6a0c850c7afa066b3586aef84ba4442760cb67825231bbd55 SHA512 7f50074e5f60201dfc8bdac6b6d570c3b55c5d221e498943e458c9a740e0ad95e18b50c424395356b50a93ca3687f1300a1280c448a35e530c3277cad0619183 WHIRLPOOL 6c16bd94577dd0e7ec1b15a4f29967cadcb56a8cf7ddeb4aebb49c627e0bafc9b7857e9d20fc80ee4e9c1f6f6516223e048ab64245c8920d2ec32e3cac23c388
-EBUILD kmod-9999.ebuild 1967 SHA256 21cb9c28ef1cc32955045ffa94d39c64ce5005dbaa38ce452dcc2d815eb33dad SHA512 663554f9d516c41dc40f506b29175bf4d654e4fa6befddf16359dea942daeb95d7285c7c4a603ed8b54ace83d4311629b5fd67d51fd28739416eaae0683639b1 WHIRLPOOL be91c9745255715838ac4428636e4f2a84f3aa73325716c4e28c8d4acfde2db9a336b4c16e657c8f8ab40e9978f8045b4dc87b52ee223dabecca4854b4177f6e
-MISC ChangeLog 5882 SHA256 729ce6d2c8df8e53ce9b98938c25431337331568424ace11d35659651ec152b1 SHA512 b29eeaf2a7191be1bb26552a22b70d502ed73005358e76d706cb18dc9b375e4a18331173fd6a2474ad1247b53bd27b250c773be6f36585d3660fcb219cbcc052 WHIRLPOOL 0969cfa7dffafd4eb6aa33b9c0b8a152ed65f34254377978596e00bdaf2fa7f9879101d17a930b987032475df222aa84a89f06f4903d11b0b93f49098fa12dc0
+EBUILD kmod-9999.ebuild 2120 SHA256 15b785b0fc1650be8d319ca9ea9a8da95fd2fb93ffcfbf1b58ac9f230c527e24 SHA512 d556ab2cef5d9b6e3efd88db8d8ebdc399952df0dd55ce1e65c0ed07c6952dab0e6dcbb14312c87d40d137cc5120cdc5c215319564c4abee0eb8c50d312cbe39 WHIRLPOOL 2d6aa176ff44d7492057b632896be417b79b19eef393137eec1019ddff41dad4483fd596cd85f93bc441a761a9ccf64d313e4a2dbd6d1ece80d0701337af085a
+MISC ChangeLog 6139 SHA256 f087e3c4bda25c18e233f8d25104e62492cfd3038158d534c0a013681e433e09 SHA512 ccc176d7508d6686152db2391d788a8e4e6922f9cdd25f59db24a73052b38f6618116122b72139df8239e1825706e5da95617c74df43cf3a7b0e730f88648e39 WHIRLPOOL 7f1ccc385fe70f493a2629783c8794177b80f752155095884e229226b59a9a57adb25049221c31fb985b5559ec4262853f22e8487401b070786ad37f035c9ba5
 MISC metadata.xml 317 SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4 SHA512 0bc79bc83389f92e10f16b206d78331ed202132ed5648f299443ff4f912b68f753563e040d933deafb1b96e45a9f0212af50475e091c87921e67bcb814e2b881 WHIRLPOOL 57ce9247535050840bc4bfed021fa883e31ad4f24b2f3629416bf73e069f0848a99280c66b42457566138c24ce1274b3e41ef4bb89f387ddf713a6dac79a33c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP/++7AAoJEEdUh39IaPFNoDoH/jLCDjyQI02zSlRQT4ygDte2
-7Ww0Wey4jgaqduXjLfOmJJZYSMIQxZe04wJGegfcQiPRPyW6JQMNn3MddoBk46bw
-lKJ0SH49lm6CwHlikyEiVYf/3MgKa73eZ1YDnxw2FLjwH4KRJw0BaxOM4NLM1WDx
-EUyZu0gHXQ/Goi8Lkyj0CRveLy4IJFaLjr6mOUSzuqyxsGkgS6JucmrkpMvplrFe
-WxVdDeoufToNHc7cspht7Zp+DZScnwIVCoscp7iBXitCY6m6MnsRsN7HGxM3qn1G
-mduC7YGN1Gc5iAaD4j+lWDnaY1/bLOBhjPXYtG8yykbkNe7akuJ353DwG29Rfss=
-=MKNx
+iEYEAREIAAYFAlAATI0ACgkQblQW9DDEZTiQqQCdF2cJw1g5CSwyOQKpS4eFvUks
+PV8Ani2/pgTTgu7raNdFRb8YV0aKa6f+
+=MD4K
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-9-r1.ebuild b/sys-apps/kmod/kmod-9-r2.ebuild
index f73793d140f9..6b3ba12ff195 100644
--- a/sys-apps/kmod/kmod-9-r1.ebuild
+++ b/sys-apps/kmod/kmod-9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r1.ebuild,v 1.1 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r2.ebuild,v 1.1 2012/07/13 16:27:28 williamh Exp $
 
 EAPI=4
 
@@ -76,8 +76,11 @@ src_install()
 
 	if use tools; then
 		local cmd
-		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+		for cmd in depmod insmod lsmod modinfo rmmod; do
 			dosym kmod /usr/bin/${cmd}
 		done
+		# according to upstream, modprobe can be called directly by the kernel,
+		# so it cannot be moved to /usr/bin at this time.
+		dosym /usr/bin/kmod /sbin/modprobe
 	fi
 }
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 74dc57e605c4..63153008905d 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.28 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.29 2012/07/13 16:27:28 williamh Exp $
 
 EAPI=4
 
@@ -76,8 +76,11 @@ src_install()
 
 	if use tools; then
 		local cmd
-		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+		for cmd in depmod insmod lsmod modinfo rmmod; do
 			dosym kmod /usr/bin/${cmd}
 		done
+		# according to upstream, modprobe can be called directly by the kernel,
+		# so it cannot be moved to /usr/bin at this time.
+		dosym /usr/bin/kmod /sbin/modprobe
 	fi
 }
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 8e9787ec6f92..450106eceedf 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX udevil-0.2.8-flags.patch 1514 RMD160 04410da67b4c8fd72d79b912f139803a4c85d760 SHA1 0405799cb36b5bd8748551f5e1aac36ed4d3939d SHA256 155ee3734f3d58f645761920f08f6a5307f1df0e2ce5b860bdeb7db3036a5a04
-DIST udevil-0.2.8.tar.xz 278748 RMD160 9eb83f04b8aea2d21572520b5194cd4a52f1bf58 SHA1 ebefd08fb000756c9b56408396891f52b7d828e2 SHA256 3ffdd11283772f4a66c8ac928cf5e03072a1497ae70c9a131ec06d1dae9297cb
-DIST udevil-0.2.9.tar.xz 278988 RMD160 9eb1c155dad34dae4ef2d5f9a02599f128f58fd9 SHA1 f02d6dc98e60b632fe221dc048e2b3d11dca79a5 SHA256 224f10b20726fd544cade37284533fba2daa268073bdfaccbf53632f44b2ffdd
-EBUILD udevil-0.2.8.ebuild 1816 RMD160 bc3ed3000c0b69418af2e205d05f577676b3de41 SHA1 15eca54c35699cacb8e06e23d4d98e437a48ec1f SHA256 49f9ab39cde806744f137048b5c2d42b47c35956385e25f9ba4aa10189edc1a6
-EBUILD udevil-0.2.9.ebuild 1823 RMD160 bdc7e245c0f2671371f0273fc58e8cd0e9853e71 SHA1 505e0c0eb7bee6835dc771d4d6491a4c9c28c253 SHA256 a76516c271d5a6f92c60828a6997f14459d2f8139864432a02bcbaffd34ae880
-MISC ChangeLog 749 RMD160 c39af60f625717bf34e2119f57ef0c64c8a6ee2c SHA1 d4cb33c8b58c23d8a7a5dd8e1f3044c29e0a5f6a SHA256 9a7236582f4335cd6faf1beca1d0adab2d430fd6eb1917e7370e1160d90edbf6
-MISC metadata.xml 406 RMD160 f57444e66e1ac2299e6d010da8bd8a03a78ac5f3 SHA1 d5b63f19a1342db23a3ef93fc33e21a49caeb96d SHA256 eecf01b30a8484b2ac0e54102fd7abd16ffd15bdd9ead2caec8ed7683e6f0bb2
+AUX udevil-0.2.8-flags.patch 1514 SHA256 155ee3734f3d58f645761920f08f6a5307f1df0e2ce5b860bdeb7db3036a5a04 SHA512 692ecbf7aee080ba5af676379e5482b23c0a2e2b31135d281f325c7fc2a36498410016c76c431f75a6ada58ff329b2753bb4d4faf6f351f653fe9f14d3ac689f WHIRLPOOL 0f200b4c72fc3010a314f66400acba92349afa622b93c24b23d245d9912bd523119d9d860091abb429bbc8b4f6b6d6b24194f54e10b352109fbc05e42e70039d
+DIST udevil-0.2.8.tar.xz 278748 SHA256 3ffdd11283772f4a66c8ac928cf5e03072a1497ae70c9a131ec06d1dae9297cb SHA512 2f7b248ee49b9b5ee9127f4198539c6535bbaceae2986e734dbf1b0570adf4864ed431822824db917ebf9b0a54c9dd3ec516478ce3db7ac6b87d4d856a4552d5 WHIRLPOOL 2ce83bb141ccbb392b8143f412d674783ec0b4c8651a60db412990bd55dbd3c3ce071eb6493d4452f6578cdff10ecc9211ed1f35441ce666832a93f16488a848
+DIST udevil-0.2.9.tar.xz 278988 SHA256 224f10b20726fd544cade37284533fba2daa268073bdfaccbf53632f44b2ffdd SHA512 20c53d245629e0abe1f280d17f1733fa3d7a04fedd2db6ec97916c93fa41602f24bfb435a0ca6e78a95213e54b4be75ad178c58450db4539d91573f23a7795b5 WHIRLPOOL ea53797a5b3af7552128c3d7b35591f4e6d2d61af6dad7c38450565db71dbca310b1bcb3ae622c6ef87727c94a819eddc729859e4f65c5d67ea4560d26244a2b
+DIST udevil-0.3.0.tar.xz 279416 SHA256 675331a7c9dca52088234a88b82b450f0231cbf5b39f9e58f591e18a95d10fc3 SHA512 9881a035bb1123370ec7a3725683c6d76fb157aee7259699ed60ac837ba59bcce74c970b05daa45495bd02ed2b98abdd1d72c1f28ecba1b008d15094c2400161 WHIRLPOOL a6a61d885f933a91874b7c24ffea9786ff95ecbb5b849cadebc152c6c6cf3e146b201a3124cbc7f63b29b533ed55053c7a3bff2636c7eead639f6290181e3093
+EBUILD udevil-0.2.8.ebuild 1816 SHA256 49f9ab39cde806744f137048b5c2d42b47c35956385e25f9ba4aa10189edc1a6 SHA512 7db68f09155cd2f8b38562cee9d19b426c12bc40120afc907785e20973046d7912837c3db0e748e13dc1bb8fbe2fbe56deb6e69feac371945505475c0d7b75fc WHIRLPOOL b6c02bb5bc238e4215e066783cfc51a7f3ac2391d94698187fc3b27500825e9d74ab88dbb1922599d3e66e3d2f579d12b558025543fd87a67b1c2df6f251ee17
+EBUILD udevil-0.2.9.ebuild 1823 SHA256 a76516c271d5a6f92c60828a6997f14459d2f8139864432a02bcbaffd34ae880 SHA512 d5926c8f397ce8b78ffb70e52e7b5b852e9fd4d8eefdd24b80a87685327642b43e5704c69e7fb3049fac102577be5ba4d246afdfa06e36e33ee43a4c166c02e1 WHIRLPOOL c0d12c760a1d54a8a83d846776eae986563ddfebe2d65c32b080cda08f089d3aa5494ccedad6dee91cf4c461cc8b1a41d6aeaf4c5387bafa20077c7cb2982086
+EBUILD udevil-0.3.0.ebuild 1863 SHA256 58188d65fc8d0078eb628b86b6f91d1a2c3a3e12aa997ee462366b68d16e2296 SHA512 d63d5f5bd7a1411adada7f8235b3ef6952ecfda84dc2a4f55aa9a122bb8963af934fe010372689f735a876668bae1af7f86ece035c2b2a7a8573ca5d317f8437 WHIRLPOOL 7d91faa688b173b024d11d15ab05ef29b88f7fcbb257b509ee2ff0b269f0b5111116024fdff5028c411a779415f492f501d0821e5132470c9a94062d05d4cb12
+MISC ChangeLog 867 SHA256 7d5ce1394ecf756b843959c0574b967c1fef094ef682c6b7cde556ca7b7fdf57 SHA512 246ab884ca19d9355fb9ba5d361de1a4cc240c2813072e0cd871c044e678ea17263f36b1cb0a86017a1414c11cffd98dcfbeee2111fd898d9e51b5c41d0baff3 WHIRLPOOL db7fa19898dd89adf0ee7be13236e9083f72f716b2cd3ce98e437c5e3d47b9c0eb68184b6fafec7bc1c1f6dd8cbbceab6556c3ee6776ba24c371bc4bf3969f64
+MISC metadata.xml 406 SHA256 eecf01b30a8484b2ac0e54102fd7abd16ffd15bdd9ead2caec8ed7683e6f0bb2 SHA512 e8302eada109db766d42b7beccab10d9df3bf8b68a9e4087db3e3920f260f26d42784e13a934997aadcdd140ed2346317ced2a3a328f13fa6e716c5c8dd59e19 WHIRLPOOL 63a61231b0dd68adddb193f7cd6199722bb422ff0d495a8492f1cf8da595e5a8848822c9340b929ca7bc8cfe0556c2f0e8ef5c9d6a18de50ba48b3e626f794f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP7i1PAAoJEFpvPKfnPDWzQokH/2d+NdgyfdAmZRFetTvheXkL
-4OYrd1hsSL9Cf0wFr++6wmVMwObYTAwZkQqgqZsuxn5vId9NS+076JBW5nZXR+Rx
-+5pxETeVcDhkkJPqnFmFQgQNhDamkiJ2WXYVz20HQEvhmUdxEEJvv0l41KSTvrzB
-jX8vgaqQ27OizHo0kYPaOmjs/LSIoOUAo/hHncsd2ylax/jtHtUQ72asjtjrxXbP
-Z9KxnvLFwKJTClInMduXQNdSCAvnOMN0MtbYW2eb2nfd+NphPDsBvHBr8VtZiHDD
-NlRiCc00aJknMI/m2YK/8xM3yZosNXGov+kumhK1ezAqclPQ8iRRTvXj7rvRqWk=
-=KzRO
+iQEcBAEBCAAGBQJQAEucAAoJEFpvPKfnPDWzjUEIAIGmhM1peo3nldF8+ooUmphv
+RVc6/KeL1xKYwOg4HORLkvu/VY7/MDXqcG2k7G5oIA4iRwVBXzkyxRPE5omkDm6H
+31+70B8vFg0fDWR7E9ygU8Ct40rT5hRrJh7qGb0G8RFRVvgxwLeLTQRi4B+h9D1G
+Lp9aLVvZ49pfPMhMLd30Bpz4sX4OJxmkfmClIWrX9YffUWoKRMSM34VPyjm6aYMw
+zt9OT4jyz1KBNLccwMB5OaPmFqfllAq5CytY0ac+BJEiSGsOA7R3SVW4oIK+isbN
+B2X+l0LGjH+6pRfFtD6UR8GOLK2snHXUEbXY4kHi9EHWxlpDLgMgu3FHf0Ftr30=
+=WVBd
 -----END PGP SIGNATURE-----