Module loading is now optional, so add the kmod use flag. Also update

the dependency on kmod to the correct version and create a unique
patchset for udev-196.
The kmod use flag is defaulted to on because I think this is the most
common use case.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 19 insertions, 19 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a30b3b6c65cd..b1f098fd0ada 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -17,6 +17,7 @@ DIST udev-171-gentoo-patchset-v1.tar.bz2 796 SHA256 9524e64068d67bb55ddad16dd36a
 DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253
 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
 DIST udev-195-patches-1.tar.bz2 1288 SHA256 d0995c6dea2c62d234f25b24ebb6e45ea7860f2036d4356ff0c727442cb8643a SHA512 760443b298ab0acb0a0c3cf7c1ff85ae0c2cbbf2c50e335fb14910b362c60abf2de1471abe5e14522f0524bca6f3e2390593c2a94ab336c175ab5df2ef98ea6b WHIRLPOOL a4645389fb302659804f2687830e0e288cbc0dad7c6f9a53de8810568d2ff10f91b5b20bb4fce6852097a41835225229b0e95092ce0ea14ba75955c94d440a8d
+DIST udev-196-patches-1.tar.bz2 1272 SHA256 0e4e6907df4a223a278340c4e82eea19be18f3fd727a5ecd8b6359912604ef2d SHA512 7da1a57f7b357ce474d3c505a163349d3bba09bf3355da774621730768ef830711370cbcb633c56d78fec53d566d65448d4a011d16efde22921ab5c298fc0446 WHIRLPOOL 861e06714f6e6a068932891b1c877d6f1aa5e4abc5a1dbf025c97fe78bca52ec6ce97e49e96b9bcec7457b4b6764aca3dfba7339bdd79a95bc690d489f06dec2
 DIST udev-gentoo-legacy-patchset-1.tar.bz2 14039 SHA256 0a82fd7a6ed4212dc26d7b562d91e9bb7174581717683d447902f308110b635a SHA512 4a64d972ab361c781ebde7f9360d7842f8be2c945fbcf526019a49194197af9f2575e5ba399d7494c84b12489fe09333bf225f697b786fb6ccef7b287e58c9cc WHIRLPOOL 70e84987aa3c5ef93d624014bd13156a95d456ade17389b2a89261f57dee32d1dd7f416dd2397c4e6e2bbc09d0fee7acde8325bdf203021f45c49adf7c6e72ba
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef SHA512 ead3f34a906bd18a6895029f6d5f5a771fc237d437b621151d40142376ba6fa10e408a881c7dafcd308d5c5a66766ce9db8f612f0f78899362e8b30eda4aa0c5 WHIRLPOOL 4558a8d3073a7aa79d522e459f7c212b2a97f726f67a6f9665a3e9abd3dea6b2c888d52dd716de4b53628002af354fb5de41a83cdd71fdfc853e35978c6d5db6
@@ -28,19 +29,15 @@ EBUILD udev-151-r4.ebuild 16804 SHA256 7315f6e89edd97ef057259e64465aa669b53fe020
 EBUILD udev-164-r2.ebuild 15179 SHA256 e957e7d9bb99f29a20de5f5666c19db0e645fdf70751741926819cf85dfe8365 SHA512 8c9143207389a70ff3919753d250ef1d68bbdae6b4ca224d43a3f3314a5f80e2617d4b0af4678bf1d08afb7ada6984459d1bc10ec502bf278f093e058c6fde8e WHIRLPOOL e778db14702ae5e9559afef46b70315829f7c0d0f4c40a1e85c8af5a6ef9be7ab2e8e15274f2f82b363f75123dfee631ced2aa56c7c0997babb4d25ba702c064
 EBUILD udev-171-r9.ebuild 16105 SHA256 1b21d6b2fd4af6382ab5cf3c255cb6c2b2f026ffbfbd808db8662b958de30f1b SHA512 efce00bbb87120a476fc2bfd497a460b3656024389fc2ac999dcaac8e95e2450d101038b0838d0a9f8dbc948c4b1f42e6cc3819df2857839564806f7293e5af9 WHIRLPOOL 7e73e343a7778bffdb5002fa0994a3d4e55972d230877d6501afc777717244eb81b16a50e9a28ed698b8842c8b5c44b182825ac9c551217a2401009eb31b1761
 EBUILD udev-195.ebuild 11412 SHA256 f653139c9ea79bc7c743c9991febf1e74fc38e04aa487698492e0e34c2b278f7 SHA512 88d74d73158f3a7d4d2f24935abbfd60afae80c9778493d30558555852762b0356625e67ed2327baf1d0c9bb4ade41911b19ffc702ae4153e1f0a17d1b683f51 WHIRLPOOL 113a3d56da645744dbfc8c8278dd429807dae42f2179c502725412dec155681c0e70fe4d36d0420c3506a69bedc6523c344a258e4510d0349439108484394314
-EBUILD udev-196-r1.ebuild 10269 SHA256 67af44b5bb9a2cb5c739c1648220c389b193d573d3de73ec2e48b04a5e55535f SHA512 ffd974a9a2e80608badc70ac5d0a7163f9281c72077b43a49619a758c123bc3dc6e135389e7526507a679b1ffacaa5f9df63801a279e42f81d2f8df51397af09 WHIRLPOOL 0dc8ea4ecd4088d50fd4c7d76c9c0e599ed23948557cc66ac5956f33124e88e29e78e9bf880ac224bfc4070ad42c00e56056c883e285376ae4c5ba80f80bb025
-EBUILD udev-9999.ebuild 10284 SHA256 b57c1f2f963d357ef1083d8939dbbb43223c355bc799d76d3b2a15a3f2abc0d1 SHA512 f848d0935c48f3d675524cbb37d75e2f039f74dac93069a1a23d1ad0558a66cd6e766184d9a8662b82bd0839084eb58bec265b3ec0397c0b7f62c5f23d9a551b WHIRLPOOL a467f944c3de75034e61009de95d3f75bc9c83222fb93391e7d4036855901ea8c2cbbbb356d07d8d8b5f5f5271c893d68fc168b2face759c988aff00df7afc77
+EBUILD udev-196-r1.ebuild 10318 SHA256 59fc1cc0540202d2406c4ad2ddb3d902b17f7fd67eecf8d727901aeee1fd57b4 SHA512 e9871d9d3258867d3f62444bd471b76504affeb1738e1e2059c59d493ab6d9735f3beed3234a9a9f080e1622a23593c85cc9ec80dfe9483b23d37d6cbb46373e WHIRLPOOL 0e58f4f2e68db2667e9e4e9e31eb0e447951b975aaf5f992150e5ed8f92fff35cf9e5766c2fd812c2a9b9d08b15c97c3689181fecbbe6be89dfb4ce488dd0537
+EBUILD udev-9999.ebuild 10317 SHA256 26b5f903176eec7dfa6699ef6aad61522c59acb9bbebbb06e1b34070d7791869 SHA512 ad1eec7e1445aa77521e7319411fa13b6fd6f134938798fb47b90c8f4543a69e8461c89cd7b322046298aef9059463dcaef06140c71e5fc561a7a1fb16613106 WHIRLPOOL d7a0a815a4f8774874bcebf5aea4e49b1ecd1663c4b6a7f9568d5f3f9cbf941367def50cd3099931eac164c03bea06014750b53d600b40982f1be2f163fc1a84
 MISC ChangeLog 45096 SHA256 815693ed3665b05a0c51b464785f4e393fb2d0c2a6dca4db4e8d9a47d56ba6d6 SHA512 bc1642a11557b2b4d9cc134f43f2a9788666202efaed1ede7c83fcfd82af70f9451badd750000da22fda7091a5a472284cb36a6b0848c7e348ce574aeabb9cfc WHIRLPOOL cc7fa13306c98323e691f3f23ce107c2f66f9c61118e21271deff9ae4d71ec1bfe568a834d068dd206f86568169e2c66554d0ab28c4c1aaca8b9b8f6935954a4
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
-MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
+MISC metadata.xml 1281 SHA256 6315e69296f31468a999b4fbfce2e2a5ff3246d653e5f6337778fd7b068ef790 SHA512 aa5da08d7c6e2c9d20c85b46875c9a5707e173ded718bba6258c68ac2b04e43e0370b5cadac2eae06689cb2f37a7c5bc0406117f4ae519ce55d8230c5a25f5f4 WHIRLPOOL 88cc83f43ad815497b524847ed19a140c171c7a170356f9f3b38330da7ffa86f94b1758803efe2b0d412a2b9106a43fca48bca38d360abe97b909b791b756607
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQux+dAAoJEEdUh39IaPFN610H/22Q1Id9MHy90yKMFZxHPpnj
-TgqTmLMIquiMwmyFq1Z0mdcKGtn5mnjlNiCexxeBRccDQLJTzwTjIQj3yIxEihUq
-r5aLK6HkDHljSUZKTyKNDmgWPegqeS78eOMYCF3mDJUKVnfkBGo+Io+vvxNOevrK
-V8zkfs6Sv09tnpv3AzEIDWGItp1c24/ObY+wfWPuEFDvbCw62tPcHSlumjZ9MFNX
-56sdhtcsJGUevpsDoLUZfzINadz5esmTScIEgQ2E+Qa3ZPSdBi/EEJCq1YF+P5uI
-SrkSLFA6PwTYnTC85ALL/qdCWT5RKqkGK0GFifgNvVBrpDqwJVqCo0j5Em/Hcp0=
-=6VB/
+iEYEAREIAAYFAlC/sAQACgkQblQW9DDEZTgsAwCgq/pzYEzXmTX5okeHSLJSHdDu
+oxkAoIAQcTF/YZQNfWu8oGYSqZO8LuUf
+=jLLw
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml
index 1e3051f622bd..8bc838574d76 100644
--- a/sys-fs/udev/metadata.xml
+++ b/sys-fs/udev/metadata.xml
@@ -15,6 +15,7 @@
   <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
   	for introspection</flag>
   <flag name="keymap">map custom hardware's multimedia keys</flag>
+  <flag name="kmod">enable udev to load kernel modules</flag>
   <flag name="old-hd-rules">Install rules for /dev/hd* devices, removed upstream at udev-148</flag>
   <flag name="rule_generator">enable persistent network and optical device rule generator</flag>
   <flag name="openrc">install the OpenRC init scripts</flag>
diff --git a/sys-fs/udev/udev-196-r1.ebuild b/sys-fs/udev/udev-196-r1.ebuild
index dcb8e70972e9..1fb62a443442 100644
--- a/sys-fs/udev/udev-196-r1.ebuild
+++ b/sys-fs/udev/udev-196-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-196-r1.ebuild,v 1.1 2012/12/02 07:29:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-196-r1.ebuild,v 1.2 2012/12/05 20:34:52 williamh Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ else
 	if [[ -n "${patchset}" ]]
 		then
 				SRC_URI="${SRC_URI}
-					mirror://gentoo/${PN}-195-patches-${patchset}.tar.bz2"
+					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2"
 			fi
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
@@ -28,15 +28,15 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl doc gudev hwdb introspection keymap +openrc selinux static-libs"
+IUSE="acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
 
 RESTRICT="test"
 
-COMMON_DEPEND=">=sys-apps/kmod-11-r3
-	>=sys-apps/util-linux-2.20
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	acl? ( sys-apps/acl )
 	gudev? ( >=dev-libs/glib-2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	kmod? ( >=sys-apps/kmod-12 )
 	selinux? ( sys-libs/libselinux )
 	!<sys-libs/glibc-2.11"
 
@@ -185,6 +185,7 @@ src_configure()
 		$(use_enable gudev)
 		$(use_enable introspection)
 		$(use_enable keymap)
+		$(use_enable kmod)
 		$(use_enable selinux)
 		$(use_enable static-libs static)
 	)
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index a29019df195d..0f7a13a1f657 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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-fs/udev/udev-9999.ebuild,v 1.122 2012/12/02 07:29:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.123 2012/12/05 20:34:52 williamh Exp $
 
 EAPI=4
 
@@ -28,15 +28,15 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl doc gudev hwdb introspection keymap +openrc selinux static-libs"
+IUSE="acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
 
 RESTRICT="test"
 
-COMMON_DEPEND=">=sys-apps/kmod-11-r3
-	>=sys-apps/util-linux-2.20
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	acl? ( sys-apps/acl )
 	gudev? ( >=dev-libs/glib-2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	kmod? ( >=sys-apps/kmod-12 )
 	selinux? ( sys-libs/libselinux )
 	!<sys-libs/glibc-2.11"
 
@@ -185,6 +185,7 @@ src_configure()
 		$(use_enable gudev)
 		$(use_enable introspection)
 		$(use_enable keymap)
+		$(use_enable kmod)
 		$(use_enable selinux)
 		$(use_enable static-libs static)
 	)