summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-03-17 23:38:16 +0200
committerMart Raudsepp <leio@gentoo.org>2019-03-17 23:42:47 +0200
commit44e85b3ca237c16d8261f3e11504fc3420db8e6b (patch)
treef040824427c591646b4fc5b94137ad14a99b08a3 /gnome-extra
parentdev-vcs/subversion-1.10.4: ppc64 stable, bug 676094 (diff)
downloadgentoo-44e85b3ca237c16d8261f3e11504fc3420db8e6b.tar.gz
gentoo-44e85b3ca237c16d8261f3e11504fc3420db8e6b.tar.bz2
gentoo-44e85b3ca237c16d8261f3e11504fc3420db8e6b.zip
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>
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild (renamed from gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild)9
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild (renamed from gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild)9
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild (renamed from gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild)9
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml3
4 files changed, 18 insertions, 12 deletions
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
index 2be2b7170fa..a3760072b6d 100644
--- 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
index 199699e2688..5a7e3a61c7d 100644
--- 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
index 80d2ae516f7..5a7e3a61c7d 100644
--- 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 ad3cba8d713..9739e1997aa 100644
--- 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>