summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-05-31 16:48:06 +0000
committerMike Gilbert <floppym@gentoo.org>2014-05-31 16:48:06 +0000
commitd2003c3e588575f44550b5aed4e26e3b46a8440e (patch)
tree7403a5d2ecf6793ff71723a4a1bc6f32187dd8ab /sys-apps
parentUse AC_CONFIG_HEADERS instead of the obsolete AM_CONFIG_HEADER wrt #467600 by... (diff)
downloadgentoo-2-d2003c3e588575f44550b5aed4e26e3b46a8440e.tar.gz
gentoo-2-d2003c3e588575f44550b5aed4e26e3b46a8440e.tar.bz2
gentoo-2-d2003c3e588575f44550b5aed4e26e3b46a8440e.zip
Forcably enable kmod due to bug 511924.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-213.ebuild7
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild7
3 files changed, 11 insertions, 9 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/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)