Forcably enable kmod due to bug 511924.

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

4 files changed, 17 insertions, 15 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 8aaef43afb2f..52b02591b164 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.258 2014/05/30 02:29:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.259 2014/05/31 16:48:06 floppym Exp $
+
+  31 May 2014; Mike Gilbert <floppym@gentoo.org> systemd-213.ebuild,
+  systemd-9999.ebuild:
+  Forcably enable kmod due to bug 511924.
 
 *systemd-212-r5 (30 May 2014)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 8d7d95f351f2..90079b189f87 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,14 +9,14 @@ DIST systemd-213.tar.xz 2782712 SHA256 8a8f73c4a9c0602f3125d6a59e45c9d3fc6db86eb
 DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417
 EBUILD systemd-208-r3.ebuild 11235 SHA256 0017e2c10d85a05862e5e609f03c02c96e4a450a8693a9619575902ec71851e6 SHA512 36c2df2a640b5c5c70b21fea1d99fff0fd2fa4fc0e2354cf3d8aa5806e3274ed89c0bdd2b34372b79aa573d630f2a1db0519d5d000dd6bdfaef82a6a414ca281 WHIRLPOOL c75a977bae455e0e8b2e14df2c13bb146cc60adedef8058b9ee3a58e4ccd9f35f2f364c86adc01a728ac1f12916530c3f75a445321627032556995a39b1e1a62
 EBUILD systemd-212-r5.ebuild 14033 SHA256 3189079db1c76af0399aae79eff837bc7da6c9dcd21eba8aaf2a7c582c9f364b SHA512 bb71506aeda6459d4c45fa595add7e8afea5e1460277fbb54426076f65b1ef3c34058ee58f92811b1b47c563a005e2e125ede53fc17e34a855668649a9bcf611 WHIRLPOOL 2b66a92c0ab03dc00d408323e4b950aae68f20c13a6e104499b1467d806c59f69ea90fdeb71f3e8dff90b40be9b78f46cb14949abb72142e217c5ddbcc83087c
-EBUILD systemd-213.ebuild 13728 SHA256 b03809e8136dbdf79b1a696907ee3189f826af1932bc14ce1ef5e5e1ce5060d8 SHA512 0a9c4491ff5a5cc474812267d45a05937203bbc50bec34168522b3e799ea1754089a3586262e725b72bd4bdbeb64214fd3932c1118afc6c62cd7f32d521a3469 WHIRLPOOL 1fccea6e4bd62b78570a3542141825042c6236c0fe636d257d75f98bc0d538a9397cd070179aaa6b4ee7ee533b297d47401d2cedabcb4ebb509159d20f7b434f
-EBUILD systemd-9999.ebuild 14243 SHA256 a118d1ec0cfe4ad15fe66b1d8d760efd598835e00e1b6663f4d42b1d95c3ffcf SHA512 2b5bfe13d7d1e651478f75b2ecb2125cb5bc8bb5c20b5da7279765a580a2831c1f2324f6f98aa3468125ff4d6f6776451a651fb7164088e9db1de3b69bd18f7b WHIRLPOOL 00ec211183c34327c1a3336f41a49da291a7d350d700411749818e7dd663a4366d80a5b0b8d86a84c33c60783fdfd59d8874f6a8e50514560784d3a3587a9469
-MISC ChangeLog 48417 SHA256 6f4e0ea79f28dcf738ba67812b63159da523842882491e1466763233ea137e42 SHA512 2b6239833050a4d3dd0c055cdcad8413126706d7edc7a50e9f0f3aa7f805d56fa56356d9b5a34ead3581d6e1c88310c0b469ae12624425ae59d45e66ad442326 WHIRLPOOL d64cea80c13f23fb5c80c54514301b157278ffe083f23fdbe1ae8f85b69b02feccc39f6035fe32211a279b62b8f70fe1a2c142815ddb90bb94c53d93216ac1b1
+EBUILD systemd-213.ebuild 13692 SHA256 517621c333b801f1d71c2e2632446b3641f66df37d89c99c373116de91fdc11f SHA512 d5f47a0a10538ca8faec739e6e8b8d4d29b6578eea2fa0950f9b90873273c0c0b49dada53e97e1b2efa948735eedde7974eb8594762a3019728db292f86c7f78 WHIRLPOOL d982b1d7a8d68ac554e74c9780afb598418ed1c80c8e85b7a306b999f540570bf24f7bebfa99b701419a043928840191c6d98da1669003100367d30f228c59e3
+EBUILD systemd-9999.ebuild 14206 SHA256 e14a5575cf9e7de2e2383eb6b13b01a0ce2e85687dcdb2e609782a5f7b20d1dc SHA512 4c846ff2dfff8ba420e72de6783afb83cbf34cbbb1de81bb7898bfd9e0bab68d7f5a26b30c4587e1fabc036222d5e25d7cf722f0e4b6f74adfa42e786ce92ec2 WHIRLPOOL bc0114f9b754ecdc7b225d602fc9bf15b11fd19a33bb3cb5476ee146b00423a1745695d8387ee46dd194c077f8a6a2c5b03e4f92bcf3175988a58cdedfd22e1e
+MISC ChangeLog 48552 SHA256 7d13aff86849316aa48ff9249560e5aaa3580829a00f21f93f2fa69c52d17cc8 SHA512 dfa41927dd98b55f9188381326bb37a2d9a2518054f325a5528ad09507b29d56506361ded60e125127e827823db831889f7aebcdf9af1fabdb4d06c51d3ce4a4 WHIRLPOOL 83f50aa9fe5727ca0eb645a406ddf66028df52c8218676214bab1974b95141622dde7b0662d6373787c674d76c77079d490b1ae20850dceda49a4be39cf2c4fc
 MISC metadata.xml 1135 SHA256 b08dc3cad5afe2ed29a0d4c528efc9e97dccf235bdabe4451c3f064ccd5df804 SHA512 860e15b483c5b9a0310c4c5a58a1ffe9143105fdd171e7a8b66295f9a46d5bd14a03f96ec921cc1b31343d92f318ede8f035314dd96cb64de8578089eaa80226 WHIRLPOOL ec1a1762433afb7ffbf1475909ddd9b876919e4b7889a6db76fb3ce00694bdcc5c8971c2f040797afc4e7699a832c457c07972a9dddae138c4837da1376dc374
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOH7PsACgkQC77qH+pIQ6RIUQEAueZoJdGNkbFdZTuw5xYP8Ja5
-MeV1bCLIVP+AOIqeu+4A/1gr4pT4xopPS6AcfdReKUfKgRdmEAaKKhcSpsymUngW
-=PEdp
+iF4EAREIAAYFAlOKB8sACgkQC77qH+pIQ6QXzwD/cArg8DiJZcVtehmQlXCnL/Ee
+1Ea6D8hHiERuliP6UUMBAIGg+FhEklWhMUkbv6BsuWI5+4+BAgRgWxt9SvuUgn48
+=i/wq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-213.ebuild b/sys-apps/systemd/systemd-213.ebuild
index 2130af4f9335..0b86b9f42375 100644
--- a/sys-apps/systemd/systemd-213.ebuild
+++ b/sys-apps/systemd/systemd-213.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/sys-apps/systemd/systemd-213.ebuild,v 1.1 2014/05/29 13:34:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-213.ebuild,v 1.2 2014/05/31 16:48:06 floppym Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
-	kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
+	kdbus lzma pam policykit python qrcode +seccomp selinux ssl
 	test vanilla xattr"
 
 MINKV="3.10"
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
 		ssl? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
-	kmod? ( >=sys-apps/kmod-15:0= )
+	>=sys-apps/kmod-15:0=
 	lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
 	pam? ( virtual/pam:= )
 	python? ( ${PYTHON_DEPS} )
@@ -174,7 +174,6 @@ multilib_src_configure() {
 		$(usex http $(use_enable ssl gnutls) --disable-gnutls)
 		$(use_enable introspection)
 		$(use_enable kdbus)
-		$(use_enable kmod)
 		$(use_enable lzma xz)
 		$(use_enable pam)
 		$(use_enable policykit polkit)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 86a736629c14..932890719bf6 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.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/sys-apps/systemd/systemd-9999.ebuild,v 1.110 2014/05/29 01:11:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.111 2014/05/31 16:48:06 floppym Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
-	kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
+	kdbus lzma pam policykit python qrcode +seccomp selinux ssl
 	test vanilla xattr"
 
 MINKV="3.10"
@@ -43,7 +43,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
 		ssl? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
-	kmod? ( >=sys-apps/kmod-15:0= )
+	>=sys-apps/kmod-15:0=
 	lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
 	pam? ( virtual/pam:= )
 	python? ( ${PYTHON_DEPS} )
@@ -203,7 +203,6 @@ multilib_src_configure() {
 		$(usex http $(use_enable ssl gnutls) --disable-gnutls)
 		$(use_enable introspection)
 		$(use_enable kdbus)
-		$(use_enable kmod)
 		$(use_enable lzma xz)
 		$(use_enable pam)
 		$(use_enable policykit polkit)