From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19F52138334 for ; Sun, 17 Mar 2019 21:44:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21EA1E08BB; Sun, 17 Mar 2019 21:44:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D449BE08BB for ; Sun, 17 Mar 2019 21:44:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F644335D26 for ; Sun, 17 Mar 2019 21:44:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BA0053F for ; Sun, 17 Mar 2019 21:44:41 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1552858967.44e85b3ca237c16d8261f3e11504fc3420db8e6b.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild gnome-extra/cinnamon-session/cinnamon-session-4.0.0-r1.ebuild gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild gnome-extra/cinnamon-session/metadata.xml X-VCS-Directories: gnome-extra/cinnamon-session/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 44e85b3ca237c16d8261f3e11504fc3420db8e6b X-VCS-Branch: master Date: Sun, 17 Mar 2019 21:44:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba796e77-365f-4990-ab7c-33b17861fb67 X-Archives-Hash: 2978a7d8e65213cbfa116e8a2553463c commit: 44e85b3ca237c16d8261f3e11504fc3420db8e6b Author: Mart Raudsepp gentoo org> AuthorDate: Sun Mar 17 21:38:16 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Mar 17 21:42:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e85b3c 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 gentoo.org> ...-session-3.6.1-r4.ebuild => cinnamon-session-3.6.1-r5.ebuild} | 9 +++++---- ...mon-session-3.8.0.ebuild => cinnamon-session-3.8.0-r1.ebuild} | 9 +++++---- ...mon-session-4.0.0.ebuild => cinnamon-session-4.0.0-r1.ebuild} | 9 +++++---- gnome-extra/cinnamon-session/metadata.xml | 3 +++ 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 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 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 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 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 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 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 @@ cinnamon@gentoo.org Cinnamon Project + + Rely on sys-auth/elogind as runtime logind provider + linuxmint/cinnamon-session