summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:40:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:40:50 +0000
commitdf95d9e3f7d74b9ae85466ed1f2bd3d14f3f8351 (patch)
tree9958ad201cc88cfedb877de659543c7ac11776a7 /xfce-extra/xfce4-power-manager
parentFix DESCRIPTION lenght for last commit. (diff)
downloadgentoo-2-df95d9e3f7d74b9ae85466ed1f2bd3d14f3f8351.tar.gz
gentoo-2-df95d9e3f7d74b9ae85466ed1f2bd3d14f3f8351.tar.bz2
gentoo-2-df95d9e3f7d74b9ae85466ed1f2bd3d14f3f8351.zip
Fix dependencies to allow sys-power/upower-pm-utils.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-extra/xfce4-power-manager')
-rw-r--r--xfce-extra/xfce4-power-manager/ChangeLog7
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild4
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index ac14359e8d76..cdfca44723e4 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for xfce-extra/xfce4-power-manager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.71 2014/05/12 18:31:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.72 2014/05/26 19:40:50 ssuominen Exp $
+
+ 26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-power-manager-1.2.0-r2.ebuild,
+ xfce4-power-manager-1.2.0_p20140511.ebuild:
+ Fix dependencies to allow sys-power/upower-pm-utils.
12 May 2014; Samuli Suominen <ssuominen@gentoo.org>
xfce4-power-manager-1.2.0_p20140511.ebuild:
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
index 6a406accf8e3..5de41f755974 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild,v 1.7 2014/05/11 17:06:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild,v 1.8 2014/05/26 19:40:50 ssuominen Exp $
EAPI=5
inherit flag-o-matic linux-info xfconf
@@ -16,7 +16,7 @@ IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightne
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
>=dev-libs/glib-2.24
- <sys-power/upower-0.99
+ || ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
>=x11-libs/gtk+-2.20:2
>=x11-libs/libnotify-0.7
x11-libs/libX11
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild
index 5d6d4d9b4e6c..7c85c0c6cacf 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild,v 1.3 2014/05/12 18:31:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0_p20140511.ebuild,v 1.4 2014/05/26 19:40:50 ssuominen Exp $
EAPI=5
[[ ${PV} == *_p* ]] && EAUTORECONF=1
@@ -20,7 +20,7 @@ IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightne
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
>=dev-libs/glib-2.30
>=sys-apps/dbus-1.6.18
- >=sys-power/upower-0.9.23
+ || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
>=x11-libs/gtk+-2.24:2
>=x11-libs/libnotify-0.7
x11-libs/libX11