summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-06-03 00:46:36 +0000
committerMike Gilbert <floppym@gentoo.org>2014-06-03 00:46:36 +0000
commitdc8fa8f9359ddcc20b762842da2bd15c445f048e (patch)
treee43adc26e57ee1d480141e8b42172a30037321a9 /sys-apps
parentAdd proxy-maint herd. (diff)
downloadgentoo-2-dc8fa8f9359ddcc20b762842da2bd15c445f048e.tar.gz
gentoo-2-dc8fa8f9359ddcc20b762842da2bd15c445f048e.tar.bz2
gentoo-2-dc8fa8f9359ddcc20b762842da2bd15c445f048e.zip
Make kmod optional again due to changes upstream.
(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/ChangeLog5
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 461ecc6f2058..a3de0f540eb0 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
# 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.261 2014/06/01 07:33:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.262 2014/06/03 00:46:36 floppym Exp $
+
+ 03 Jun 2014; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
+ Make kmod optional again due to changes upstream.
01 Jun 2014; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
Create user&group for systemd-network.
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index e75e7c56ca28..cfa6dae4b186 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.112 2014/06/01 07:33:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.113 2014/06/03 00:46:36 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 lzma pam policykit python qrcode +seccomp selinux ssl
+ kdbus +kmod 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= )
- >=sys-apps/kmod-15:0=
+ kmod? ( >=sys-apps/kmod-15:0= )
lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
pam? ( virtual/pam:= )
python? ( ${PYTHON_DEPS} )
@@ -203,6 +203,7 @@ 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)