public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "NP Hardass" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-power-manager/
Date: Thu, 11 Aug 2016 06:06:54 +0000 (UTC)	[thread overview]
Message-ID: <1470891035.59bc5e82f1ba40b20c6bf91e731703540d983127.np-hardass@gentoo> (raw)

commit:     59bc5e82f1ba40b20c6bf91e731703540d983127
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 04:50:35 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 04:50:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=59bc5e82

mate-extra/mate-power-manager: Temporary solution for #586302

Package-Manager: portage-2.3.0

 ...r-manager-1.10.2.ebuild => mate-power-manager-1.10.2-r1.ebuild} | 7 ++++---
 ...r-manager-1.12.1.ebuild => mate-power-manager-1.12.1-r1.ebuild} | 7 ++++---
 mate-extra/mate-power-manager/mate-power-manager-9999.ebuild       | 7 ++++---
 mate-extra/mate-power-manager/metadata.xml                         | 3 +++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.10.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.10.2-r1.ebuild
similarity index 90%
rename from mate-extra/mate-power-manager/mate-power-manager-1.10.2.ebuild
rename to mate-extra/mate-power-manager/mate-power-manager-1.10.2-r1.ebuild
index a76aaac..5f3e8d5 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.10.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.10.2-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="+applet gnome-keyring man policykit test unique"
+IUSE="+applet gnome-keyring man pm-utils policykit test unique"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -30,7 +30,6 @@ COMMON_DEPEND="app-text/rarian:0
 	>=mate-base/mate-desktop-1.10:0
 	>=media-libs/libcanberra-0.10:0[gtk]
 	>=sys-apps/dbus-1:0
-	|| ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 )
 	>=x11-apps/xrandr-1.2:0
 	>=x11-libs/cairo-1:0
 	>=x11-libs/gdk-pixbuf-2.11:2
@@ -41,7 +40,9 @@ COMMON_DEPEND="app-text/rarian:0
 	>=x11-libs/libnotify-0.7:0
 	x11-libs/pango:0
 	applet? ( >=mate-base/mate-panel-1.10:0 )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )"
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
 
 RDEPEND="${COMMON_DEPEND}
 	policykit? ( >=mate-extra/mate-polkit-1.8:0 )"

diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.12.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r1.ebuild
similarity index 92%
rename from mate-extra/mate-power-manager/mate-power-manager-1.12.1.ebuild
rename to mate-extra/mate-power-manager/mate-power-manager-1.12.1-r1.ebuild
index 62a91fb..ded161e 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.12.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+applet gnome-keyring gtk3 man policykit test"
+IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -24,7 +24,6 @@ COMMON_DEPEND="app-text/rarian:0
 	>=dev-libs/glib-2.36:2
 	>=mate-base/mate-desktop-1.9[gtk3(-)=]
 	>=sys-apps/dbus-1:0
-	|| ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 )
 	>=x11-apps/xrandr-1.3:0
 	>=x11-libs/cairo-1:0
 	>=x11-libs/gdk-pixbuf-2.11:2
@@ -44,7 +43,9 @@ COMMON_DEPEND="app-text/rarian:0
 		>=dev-libs/libunique-3:3
 		>=media-libs/libcanberra-0.10:0[gtk3]
 		>=x11-libs/gtk+-3.0:3
-	)"
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
 
 RDEPEND="${COMMON_DEPEND}
 	policykit? ( >=mate-extra/mate-polkit-1.6[gtk3(-)=] )"

diff --git a/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild b/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild
index 62a91fb..ded161e 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+applet gnome-keyring gtk3 man policykit test"
+IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -24,7 +24,6 @@ COMMON_DEPEND="app-text/rarian:0
 	>=dev-libs/glib-2.36:2
 	>=mate-base/mate-desktop-1.9[gtk3(-)=]
 	>=sys-apps/dbus-1:0
-	|| ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 )
 	>=x11-apps/xrandr-1.3:0
 	>=x11-libs/cairo-1:0
 	>=x11-libs/gdk-pixbuf-2.11:2
@@ -44,7 +43,9 @@ COMMON_DEPEND="app-text/rarian:0
 		>=dev-libs/libunique-3:3
 		>=media-libs/libcanberra-0.10:0[gtk3]
 		>=x11-libs/gtk+-3.0:3
-	)"
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
 
 RDEPEND="${COMMON_DEPEND}
 	policykit? ( >=mate-extra/mate-polkit-1.6[gtk3(-)=] )"

diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index 70677a0..bd6615a 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -9,6 +9,9 @@
 		<flag name="applet">Enable building of the MATE applet.</flag>
 		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="man">Build power manager's man page.</flag>
+		<flag name="pm-utils">Adds support for suspend/resume using
+			<pkg>sys-power/upower-pm-utils</pkg> instead of
+			<pkg>sys-power/upower</pkg></flag>
 		<flag name="unique">Enable single instance support using 
 		<pkg>dev-libs/libunique</pkg>.</flag>
 	</use>


             reply	other threads:[~2016-08-11  6:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-11  6:06 NP Hardass [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-02  2:01 [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-power-manager/ Adam Feldman
2021-06-10 15:36 Adam Feldman
2021-06-08 22:14 Adam Feldman
2021-05-23 20:07 Adam Feldman
2018-02-11 13:49 Ettore Di Giacinto
2018-01-14 10:52 Ettore Di Giacinto
2016-11-29 19:49 Ettore Di Giacinto
2016-11-22 11:11 Ettore Di Giacinto
2016-10-15  2:58 NP Hardass
2016-08-13 18:49 NP Hardass
2016-06-17 17:39 NP Hardass
2016-01-26 18:09 NP Hardass
2015-12-31  6:27 NP Hardass
2015-07-19 20:36 NP Hardass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470891035.59bc5e82f1ba40b20c6bf91e731703540d983127.np-hardass@gentoo \
    --to=np-hardass@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox