sys-auth/polkit: Add USE consolekit

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index 348a3151d8b67d01b713928d32c950332417adda..c60e1e361ab310b54c4887c001a91061428aaf58 100644 (file)
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -5,7 +5,8 @@
                <email>freedesktop-bugs@gentoo.org</email>
        </maintainer>
        <use>
-               <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-               <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+               <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+               <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+               <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-auth/polkit/polkit-0.115-r3.ebuild b/sys-auth/polkit/polkit-0.115-r3.ebuild
index ab8043864f7146ac0fda60952f55c025228e7a60..3746fd8658a41bbfc078a1d5bbce2a8f3cfb5dd3 100644 (file)
--- a/sys-auth/polkit/polkit-0.115-r3.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r3.ebuild
@@ -12,9 +12,9 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
+IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
 
 CDEPEND="
        dev-lang/spidermonkey:52[-debug]
@@ -43,12 +43,12 @@ RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-policykit )
 "
 PDEPEND="
+       consolekit? ( sys-auth/consolekit[policykit] )
        gtk? ( || (
                >=gnome-extra/polkit-gnome-0.105
                >=lxde-base/lxsession-0.5.2
        ) )
        kde? ( kde-plasma/polkit-kde-agent )
-       !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
 "
 
 DOCS=( docs/TODO HACKING NEWS README )

diff --git a/sys-auth/polkit/polkit-0.115-r4.ebuild b/sys-auth/polkit/polkit-0.115-r4.ebuild
index ecc024a27d3c869811b61ec2d09bef8585f5ee16..c2b9220030ec868705129843aa601d06a2395619 100644 (file)
--- a/sys-auth/polkit/polkit-0.115-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r4.ebuild
@@ -12,9 +12,9 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
+IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
 
 BDEPEND="
        app-text/docbook-xml-dtd:4.1.2
@@ -43,12 +43,12 @@ RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-policykit )
 "
 PDEPEND="
+       consolekit? ( sys-auth/consolekit[policykit] )
        gtk? ( || (
                >=gnome-extra/polkit-gnome-0.105
                >=lxde-base/lxsession-0.5.2
        ) )
        kde? ( kde-plasma/polkit-kde-agent )
-       !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
 "
 
 DOCS=( docs/TODO HACKING NEWS README )