summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <perfinion@gentoo.org>2015-08-18 12:37:15 +0800
committerJason Zaman <perfinion@gentoo.org>2015-08-18 12:57:48 +0800
commitc9fe1f0d52045d295cf16099169f598e972f4e7a (patch)
tree4b4d6d5615255c9e0980ea675421d8c3811c0413
parentnet-analyzer/mtr: Clean up patch. (diff)
downloadgentoo-c9fe1f0d52045d295cf16099169f598e972f4e7a.tar.gz
gentoo-c9fe1f0d52045d295cf16099169f598e972f4e7a.tar.bz2
gentoo-c9fe1f0d52045d295cf16099169f598e972f4e7a.zip
Revert "sys-auth/consolekit: Make pm-utils optional"
This reverts commit 1a6fa659a609adbca78b9a65fa217e20b9abf6ea. USE-flags should not control runtime-deps unless linked to.
-rw-r--r--sys-auth/consolekit/consolekit-1.0.0.ebuild6
-rw-r--r--sys-auth/consolekit/metadata.xml1
2 files changed, 3 insertions, 4 deletions
diff --git a/sys-auth/consolekit/consolekit-1.0.0.ebuild b/sys-auth/consolekit/consolekit-1.0.0.ebuild
index 9bce1e6a088..43253beefee 100644
--- a/sys-auth/consolekit/consolekit-1.0.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam +pm-utils policykit selinux test"
+IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
COMMON_DEPEND=">=dev-libs/glib-2.40:2=
>=sys-devel/gettext-0.19
@@ -34,8 +34,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.40:2=
policykit? ( >=sys-auth/polkit-0.110 )"
RDEPEND="${COMMON_DEPEND}
kernel_linux? ( sys-apps/coreutils[acl?] )
- pm-utils? ( sys-power/pm-utils )
- selinux? ( sec-policy/selinux-consolekit )"
+ selinux? ( sec-policy/selinux-consolekit )
+ sys-power/pm-utils"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
virtual/pkgconfig
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
index 37eb9aa5914..47e5fd75213 100644
--- a/sys-auth/consolekit/metadata.xml
+++ b/sys-auth/consolekit/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="cgroups">Use the kernel to track processes instead of the session cookie.</flag>
- <flag name="pm-utils">Adds support for suspend/resume using <pkg>sys-power/pm-utils</pkg></flag>
<flag name="policykit">Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get authorization for suspend/shutdown.</flag>
<flag name="systemd-units">Install systemd unit files to replace the modern functionality of logind in <pkg>sys-apps/systemd</pkg>. Not recommended.</flag>
</use>