udev-141-r1 can use blacklist-146 instead of blacklist-110 (because the only difference is in commented out example for usblp)

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

4 files changed, 17 insertions, 39 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index d473467220b0..67606b81279c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.698 2012/07/30 22:36:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.699 2012/07/30 22:41:09 ssuominen Exp $
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -files/blacklist-110,
+  udev-141-r1.ebuild:
+  udev-141-r1 can use blacklist-146 instead of blacklist-110 (because the only
+  difference is in commented out example for usblp)
 
   30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r6.ebuild,
   metadata.xml:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index f59e2eaee635..ac07f93841f4 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -29,7 +29,6 @@ AUX 151-r4/udev-stop.sh 237 SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c2
 AUX 151-r4/udev.confd 2002 SHA256 b797379b93d03accf9d8b65f0c4a2f26de1c634c8ba7846f3238dea9211aa153 SHA512 cf93c549345e952d9cceb42f40979e3f5f6790506b60385b50295f18b833c83e5cda6dfbd6f019d68e9ab86bcd398cc0c26e48ce6035075b23cbd9d42794177f WHIRLPOOL b85e8a128027569a32304f844d0981a05050265ebef1ffb10c74c5e645a22f6b12234cffc73d2fcc741c58ecfe4cc4573704eff65bb692628dcc9dffe68b4187
 AUX 151-r4/udev.initd 6719 SHA256 f10b0a19e29f4a78f68d30454549010f680ed64140fcd3bccb6e0788ff489818 SHA512 c6a23312bd23ce5e11e53c1f96c1e403279195000043d9f11db1b77e0e4416e52b66210250252a4392c582265fec74d21d7b7107958744dd4b765b3a3ed7ddbd WHIRLPOOL 15d0c9073ad519ac739cad04d026176a27f4d3de7610f694bdc51758dd9a14580ab3777881b3c01b930b361e6f8860ddee584617f3624699a6a3988753db15fb
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
-AUX blacklist-110 854 SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd SHA512 8b75711e21f19f6cb03984052767ec1d71cecb62047d50d645e61020a1ac6340e00eb8485039c23afcf6b5247bd204d2f27abe5950309970007eee36c5224448 WHIRLPOOL 5547c9feb12e2e928d13dab5e532709752cfda3732d0fffe7df9344ad29a8e095b10ff713dc0d032057a463efc131375db4c25db4ffdf116bcd8744735bc46d3
 AUX blacklist-146 950 SHA256 12d60698be657c9c5b40c8cb6c3649d02f8d8c8f05d63dab7c8bee0a30c339c4 SHA512 38a18a804c9d716a8ee49377273d749f4c97af15d3768813ab1d2977b3ae8c5715f5179872b4ed4ae95104a6f28bf9644f63ff15e4ef89f942b3651bf5f66555 WHIRLPOOL f437ceee332175afab91ff6c01fa2a7d3a0a49ead9837435a083d5622e654d93ba4eef2719267613c3af7815847c587194ef5e7697afba82a56a80b69612f91d
 AUX move_tmp_persistent_rules-112-r1.sh 646 SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400 SHA512 b8c4a906c4139f91c108064ab7502d675dd9f509fe86e5cc577a187c0549060dc67eae1fd451c6a83e5c9293fdc8a047fe5f983f60d6eda2f9b36cd10f3dc72c WHIRLPOOL b1035dd9f7cf40fa04a4b37f7ee318dfb78f776099c4bd4413439a29dbf6f7c597d4780c628ce509ec672765b050bf5ab7bba4346475715d6ead50fbdff99976
 AUX net-130-r1.sh 865 SHA256 54897b58aba92d9765e8da4349ad777f9d8328bf94922d28cb3210ee0664a6a4 SHA512 23462c0e83094c4e0aaa33f5613b914b69a73328696513c80469914b498971bb6c3ab0e54913552994433c1bd611449cb545b3cb0f232a9f480210ccd39952ea WHIRLPOOL 5527733d1c4d3864f4fb027e312186efdde780847ef4bbb87dd819dded6d76ff073a1af35660acf558ccc42057d581ac1edd6bf02681185454e83e7c733a307a
@@ -55,7 +54,7 @@ DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53
 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef SHA512 ead3f34a906bd18a6895029f6d5f5a771fc237d437b621151d40142376ba6fa10e408a881c7dafcd308d5c5a66766ce9db8f612f0f78899362e8b30eda4aa0c5 WHIRLPOOL 4558a8d3073a7aa79d522e459f7c212b2a97f726f67a6f9665a3e9abd3dea6b2c888d52dd716de4b53628002af354fb5de41a83cdd71fdfc853e35978c6d5db6
 DIST udev-gentoo-scripts-7.tar.bz2 16248 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7 SHA512 16d37cb5f2289b789b569a799e62ab282f0667b1c47e54a325a310133212592a051242e137a02db928946278417a7745c5b17bb95d84f25ae071d71d5a4afd3b WHIRLPOOL 5b14aaad1a1771d02e3e6a78e6ecbc5122fbc48ac542f5dfc26539d2b1f64136de5633a2b9bd5bfce414fbffec12799a09bf2b29c375e033a4ea986ffc3ef878
-EBUILD udev-141-r1.ebuild 13066 SHA256 975c1729321c4063e31bc92db62e7af8d5f28f745534187e7464de26120c5011 SHA512 6ce102f0a51a854882d459cd74a2265cd7ec6047b78336323b1e53a43b21722ee2d4c2d857ee27288de9cae70514704ee410a9343fa2e1d7e8717e9e60d3adf2 WHIRLPOOL 9836adaca4c432874bd94ca2d59e28b4b84ca1b8d0db6c9817fa8a9ec02cd832a127644f4b011ce208b6dfbcadea8aa91e2d75742c116aa2b56b3bdaf89ad822
+EBUILD udev-141-r1.ebuild 13067 SHA256 9e26e77a99b8b28e346449aff11c22d47b8f6ff077cd8699a1e0ba46be749efa SHA512 14876741d689e573fa9a596ae781eaffc3a53d879b9081227d587b2d73b2ff3d31021278c5b8687ff0ee3a2942fc09c969c441a3e85a5483f352cb633cbb8c47 WHIRLPOOL 8c9493c7308dc9950d1cfd8b436c8c18150be58229bce31a4578c07d10dad31f3e84387fe8b394c7b7f9d4cabaea1f6212d562ccdbd112097aa021df8199f75e
 EBUILD udev-146-r1.ebuild 15330 SHA256 a0287bc63dccad342ff4b419bff74a45d9830d7291488ee4fae65c090d448b2e SHA512 c98f19842abb6aeb3162e32f3b2a7615322bd91df43bfc96257d0c027512bb0a0879452de90407bfb90f0ffb20420414702923300fc6eb6308accdb9aa232fcb WHIRLPOOL 43359b3279d7a6e7bac360714efaeefe6a0e9fa9eae86d7f6d3269b0330d33e9a3df48ea5d7994d64f20d2915c96fe8aadca132b8178ef407f88c43b7d4294bc
 EBUILD udev-149.ebuild 16487 SHA256 019f85b3c3563829fb702539d404e682a06f68dec6ee18d70d6349ce117927ef SHA512 4088975eaad67e0c7169fa00a782fbe622de89e9bc30a0f68bf8ea105343fdcf145c0e5d038356fa0d909d6cf1756c6b5b31e59f65f186a02ac7118f9b110c1a WHIRLPOOL 558f4f390a10af4ec18ee52e1fa8eb7f4f8d0ef32ce2d4ea7acb0de13058330d574cb640995a6c53b536a97b22cf643fe670382e8545b012c499353bddd6ccdd
 EBUILD udev-151-r4.ebuild 16726 SHA256 b13a59a4067a95ced0f0cfe62806f23bd9b7c075a62f1a80592bc49cc468316f SHA512 2a0f779a61e26912485f7918c1e20881a653846ba0acce17b2a393938ff03606ae0cdc7e8a6aaef2554700b7b6a9f993fb0ee7288e2f088675aa9e7c725ae0cf WHIRLPOOL 37f623e936def4d2f2bfc82b7d54c83d57efda0521134ac99eca173515b449c89fa51c31a0b15a20a76e44df191e1f21efa90b0b1b5f1574f9d9d1df2ae79a4c
@@ -63,17 +62,17 @@ EBUILD udev-164-r2.ebuild 15093 SHA256 053e8a6a34dc09a04b4699352fca63002ec93e43e
 EBUILD udev-171-r6.ebuild 15656 SHA256 8e7ec8febaa1f01fa099e224db36542fb7512934f1e5753fabb02acb7315b4b4 SHA512 e6dfbc6ec25503a21727b5f209146a2a9963c6ff5f45d9f47e1127a7d47ddf3607a268b9c86f91429a743faf5e46992d650b06170ac2a82b42a1f3dc3a9cd496 WHIRLPOOL 18e7e380ece2c2fc3a8d9676733378f8c39be078b088fa386cf420f202a5ac157e6cefdd584e480b277ff5ed7fdae9d9848df903f2113aa9c7e979a3570fdcb2
 EBUILD udev-186.ebuild 9793 SHA256 87c3229e5206a49788ff16954bc319cfc4b7616a78c9ef3f440a011ced1d95e6 SHA512 2f1f0f82403052507e305077479942bb577cd5d195d01090563a4007e7a790f7ed5ff9063dcb4664a1d7bb04967840785f08dc73c481dc6a9c911e83959c7ca4 WHIRLPOOL 671312a575fc27fc8dd5ac0b62f832d4f1da3990283e9705b97e5b1eb3cce025b79ca8c81c54e86c1225af89537a625426321caff1bfb1803a936c018d3c41f3
 EBUILD udev-9999.ebuild 8897 SHA256 20ea04b26e8ef06aacc81143010fe1e6e9c7310ed874d2298c61e40ed679be91 SHA512 f4d9244271580ba509d50dc8fc2d6be32bb5faad5455b8739c93f8ed939fa61b016bc7bcdfd33b19f22e694bc15096f256b75b6aa606a36947d9d638649cdc9a WHIRLPOOL 3f347a98876c3d0e4ea8c5e8ca3ad65f78d2b9c8b32aaed5a45daccfd7666caa83b3478454488f9ff14b9c43cd37b8253566de3e8226bc2804defddc44d41d15
-MISC ChangeLog 35755 SHA256 51b9fe0c7ebcab82949d3dd82ed21f2fffc5d93283bd165c32a410f5328c7ca9 SHA512 9197fd0c6b9832f228bdda4b31247a135bddb2295ea54cb05002bd4fb85239ca90017a8786def935c23ecbe169ecd6cbf821a9220b910efffb0530ff05b65354 WHIRLPOOL cc47c4a161a525b524c2aadb4bbd47f4566dae15df4393387531545eff878542b24ff4f890b1096d61944c20dfbc432b9d073b2b7de570a2d3d152b0bc3fff1a
+MISC ChangeLog 35985 SHA256 da075c81e06080d9cac471f37649a03a7f3c3b8c48a83fe2287b4475fbb67069 SHA512 c0e87f35d28bbe98a8ae970e930e870516b3bdb9139dd79cce9402a021770fcb4077e00253c851960ef11fc56ea0344740a35b28a0a1785429de1a379103daf5 WHIRLPOOL 131729c48cab988de50d9091d421421d5b438218875dc957366ca97892b8ad241a8e7d6e8961213ee8915d861f00d2b39a448e7bcd2ae01f643b5f20377e83e0
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQFwxmAAoJEEdUh39IaPFN31MH/jHE6L2JwJ/2IPhvukx1bKAT
-qh3H2HR0LDj2/oaF0z8VqxQD3J73QQbFRUf0+8lbIl0qdv81gAiewLpF+8npJBtO
-eEtcuwDua1B5MYRl17uQC4m8/AESGNn2jCdKJztqAPgGoNwZflUKEJC7mCf/KxR4
-2S9FFRmOYVXQA8ZT1ZriRn+81NFJKKHDUA3G35RNyjQvbHJu+yF3n439DC4WXXYs
-KB46Xm4AVYNbStDmDaFRbRcOiX1ztfqAUxLWosop/TOarAlMkyTVdW077pJhE6VU
-JZ/oR6zNZxmU6L+w0Cb02KmGy9mvmhGXZ5Ja4Sy9elb6Pv42aOqMT2MAwQOta9g=
-=kdhJ
+iQEcBAEBAgAGBQJQFw1hAAoJEEdUh39IaPFN3xAH/iKzGrmU5KOcwE8XQlhYPbkQ
+HWis3UtTuDelTBrPSHEustm2EjCllt7tuP3VmR142/E4UJkWvPNw6FTP9lMNl461
+1THmcsEAhYb3W8I/NeU6rfoaLqubEaiCe73D46baGZ+KIfSApX+qrXXsaNsaXlyh
+GtuutPmskaSpuaV20jMNezuSiWhVfL+v4POEdfo8e/2+vpEugW0na6Kjd55CDI7J
+V4aWO1gfz//fW8TitB6yD/Uni3aOHjsWMo8ilSSSKnzYwty87wQeoFXKDrKGT6La
+cyZCW82Dc6FvVEVkVjzY96y1Ku2hBL5m6OcSJEDU1J+A9YxIYDK35bh4QP/Y8hA=
+=2UAm
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/blacklist-110 b/sys-fs/udev/files/blacklist-110
deleted file mode 100644
index 1a1ee584ad08..000000000000
--- a/sys-fs/udev/files/blacklist-110
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file lists modules which will not be loaded by udev,
-# not at coldplugging and not on hotplug events.
-
-# Add your own entries to this file
-# in the format "blacklist <name of module>"
-
-# Some examples:
-# evbug is a debug tool and should be loaded explicitly
-blacklist evbug
-
-# Autoloading eth1394 most of the time re-orders your network
-# interfaces, and with buggy kernel 2.6.21, udev persistent-net
-# is not able to rename these devices, so you get eth?_rename devices
-# plus an exceeded 30sec boot timeout
-blacklist eth1394
-
-# You probably want this to not get the console beep loud on every tab :)
-#blacklist pcspkr
-
-# these drivers are very simple, the HID drivers are usually preferred
-#blacklist usbmouse
-#blacklist usbkbd
-
-# Sometimes loading a framebuffer driver at boot gets the console black
-#install pci:v*d*sv*sd*bc03sc*i* /bin/true
-
diff --git a/sys-fs/udev/udev-141-r1.ebuild b/sys-fs/udev/udev-141-r1.ebuild
index aa3a2a62597c..335102d14b31 100644
--- a/sys-fs/udev/udev-141-r1.ebuild
+++ b/sys-fs/udev/udev-141-r1.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-fs/udev/udev-141-r1.ebuild,v 1.7 2012/01/03 00:22:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.8 2012/07/30 22:41:09 ssuominen Exp $
 
 #
 # Please do not remove this version:
@@ -224,7 +224,7 @@ src_install() {
 		|| die "config file not installed properly"
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/blacklist-110 blacklist.conf
+	newins "${FILESDIR}"/blacklist-146 blacklist.conf
 	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
 
 	# convert /lib/udev to real used dir