summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:57:06 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:57:06 +0000
commit7d04616f8bfb8183c5007ea26a00f1ea8c5916da (patch)
tree069c6f43b3576c3332678e8cff36784fb3ba756f /x11-plugins
parentFix dependencies to allow sys-power/upower-pm-utils. (diff)
downloadgentoo-2-7d04616f8bfb8183c5007ea26a00f1ea8c5916da.tar.gz
gentoo-2-7d04616f8bfb8183c5007ea26a00f1ea8c5916da.tar.bz2
gentoo-2-7d04616f8bfb8183c5007ea26a00f1ea8c5916da.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 'x11-plugins')
-rw-r--r--x11-plugins/wmbattery/ChangeLog5
-rw-r--r--x11-plugins/wmbattery/wmbattery-2.42.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index 853f8a4be6b4..503bcb4cce24 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmbattery
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.26 2014/02/12 08:54:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.27 2014/05/26 19:57:06 ssuominen Exp $
+
+ 26 May 2014; Samuli Suominen <ssuominen@gentoo.org> wmbattery-2.42.ebuild:
+ Fix dependencies to allow sys-power/upower-pm-utils.
12 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> wmbattery-2.42.ebuild:
Depend on virtual/pkgconfig too
diff --git a/x11-plugins/wmbattery/wmbattery-2.42.ebuild b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
index 12d7ff3b8ad6..a9cf97f41fd7 100644
--- a/x11-plugins/wmbattery/wmbattery-2.42.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.42.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/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.3 2014/02/12 08:54:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.4 2014/05/26 19:57:06 ssuominen Exp $
EAPI=5
inherit autotools
@@ -14,8 +14,11 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc -sparc ~x86"
IUSE=""
+#TODO FIXME: Does this release work with >=sys-power/upower-0.99 API?
+#If not, adjust dependencies accordingly to:
+#|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
RDEPEND="sys-apps/apmd
- sys-power/upower
+ || ( sys-power/upower sys-power/upower-pm-utils )
x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"