gnome-extra/cinnamon-session: Rely on IUSE=elogind for non-systemd

There are (probably obsolete) deps on polkit[elogind] for non-systemd
case, which is a problem now that we use.mask elogind on systemd
profiles. No-one hits this problem in practice (as elogind users
don't have systemd profiles active), but the CI and repoman trips up
on this.
Rework this into a REQUIRED_USE="^^ ( elogind systemd )" like in
other packages, until this polkit dep is there, to make repoman happy.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
similarity index 88%
rename from gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
index 2be2b7170fa6cf89d96fb7da121a323727ff279e..a3760072b6df7bec0564e68e81500d998b56ceb6 100644 (file)
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,8 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc ipv6 systemd"
+IUSE="doc elogind ipv6 systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-libs/dbus-glib-0.88
@@ -32,13 +33,13 @@ COMMON_DEPEND="
        virtual/opengl
        systemd? ( >=sys-apps/systemd-183
                           sys-auth/polkit )
-       !systemd? ( sys-power/upower
+       elogind? ( sys-power/upower
                           sys-auth/polkit[elogind] )
 "
 
 RDEPEND="${COMMON_DEPEND}
        >=gnome-extra/cinnamon-desktop-2.6[systemd=]
-       !systemd? ( sys-auth/elogind[policykit] )
+       elogind? ( sys-auth/elogind[policykit] )
 "
 DEPEND="${COMMON_DEPEND}
        dev-libs/libxslt

diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
similarity index 88%
rename from gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
index 199699e2688b1ef4509bbfda61047e3bb7e9be88..5a7e3a61c7dc3410f65dfad305f7cefac2499bfc 100644 (file)
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,8 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6 systemd"
+IUSE="doc elogind ipv6 systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-libs/dbus-glib-0.88
@@ -33,13 +34,13 @@ COMMON_DEPEND="
        virtual/opengl
        systemd? ( >=sys-apps/systemd-183
                           sys-auth/polkit )
-       !systemd? ( sys-power/upower
+       elogind? ( sys-power/upower
                           sys-auth/polkit[elogind] )
 "
 
 RDEPEND="${COMMON_DEPEND}
        >=gnome-extra/cinnamon-desktop-2.6[systemd=]
-       !systemd? ( sys-auth/elogind[policykit] )
+       elogind? ( sys-auth/elogind[policykit] )
 "
 DEPEND="${COMMON_DEPEND}
        dev-libs/libxslt

diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
similarity index 88%
rename from gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
index 80d2ae516f7eeadf91ae9b54668d7319168c9c24..5a7e3a61c7dc3410f65dfad305f7cefac2499bfc 100644 (file)
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,8 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6 systemd"
+IUSE="doc elogind ipv6 systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-libs/dbus-glib-0.88
@@ -33,13 +34,13 @@ COMMON_DEPEND="
        virtual/opengl
        systemd? ( >=sys-apps/systemd-183
                           sys-auth/polkit )
-       !systemd? ( sys-power/upower
+       elogind? ( sys-power/upower
                           sys-auth/polkit[elogind] )
 "
 
 RDEPEND="${COMMON_DEPEND}
        >=gnome-extra/cinnamon-desktop-2.6[systemd=]
-       !systemd? ( sys-auth/elogind[policykit] )
+       elogind? ( sys-auth/elogind[policykit] )
 "
 DEPEND="${COMMON_DEPEND}
        dev-libs/libxslt

diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index ad3cba8d7130f64677616dea0703072e9bff1d89..9739e1997aa1396099f698541f2dc0035f3c91a0 100644 (file)
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -5,6 +5,9 @@
                <email>cinnamon@gentoo.org</email>
                <name>Cinnamon Project</name>
        </maintainer>
+       <use>
+               <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
+       </use>
        <upstream>
                <remote-id type="github">linuxmint/cinnamon-session</remote-id>
        </upstream>