summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:50:06 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-26 19:50:06 +0000
commitda6bc15b385cb04ccfc462c9211e6d36162f5531 (patch)
treec1dba7e853553e8b32287a74647d4a167faa394a /xfce-extra
parentFix dependencies to allow sys-power/upower-pm-utils. (diff)
downloadgentoo-2-da6bc15b385cb04ccfc462c9211e6d36162f5531.tar.gz
gentoo-2-da6bc15b385cb04ccfc462c9211e6d36162f5531.tar.bz2
gentoo-2-da6bc15b385cb04ccfc462c9211e6d36162f5531.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')
-rw-r--r--xfce-extra/xfce4-systemload-plugin/ChangeLog9
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild6
2 files changed, 9 insertions, 6 deletions
diff --git a/xfce-extra/xfce4-systemload-plugin/ChangeLog b/xfce-extra/xfce4-systemload-plugin/ChangeLog
index 501d38841511..8d17bed4ced2 100644
--- a/xfce-extra/xfce4-systemload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-systemload-plugin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-extra/xfce4-systemload-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.32 2012/11/28 12:19:32 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.33 2014/05/26 19:50:06 ssuominen Exp $
+
+ 26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-systemload-plugin-1.1.1.ebuild:
+ Fix dependencies to allow sys-power/upower-pm-utils.
28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
xfce4-systemload-plugin-1.1.1.ebuild:
@@ -140,4 +144,3 @@
+xfce4-systemload-plugin-0.4.2.ebuild,
+files/xfce4-systemload-plugin-0.4.2-libtool.patch:
Rename xfce4-systemload to xfce4-systemload-plugin.
-
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild
index 8a4b5ec69285..2463801d33bd 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild,v 1.5 2012/11/28 12:19:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1.ebuild,v 1.6 2014/05/26 19:50:06 ssuominen Exp $
EAPI=5
inherit xfconf
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2
>=xfce-base/libxfce4ui-4.8
>=xfce-base/libxfce4util-4.8
>=xfce-base/xfce4-panel-4.8
- udev? ( >=sys-power/upower-0.9.16 )"
+ udev? ( || ( >=sys-power/upower-0.9.16 sys-power/upower-pm-utils ) )"
DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig"