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>
