summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-06-23 04:10:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-06-23 04:10:31 +0000
commit37355f1d4f24c178a742092fb19d4e52f65934e9 (patch)
treef4362d0ecb46d43bd84c0ff3659aa1d8a993b4ba /xfce-extra
parentold (diff)
downloadgentoo-2-37355f1d4f24c178a742092fb19d4e52f65934e9.tar.gz
gentoo-2-37355f1d4f24c178a742092fb19d4e52f65934e9.tar.bz2
gentoo-2-37355f1d4f24c178a742092fb19d4e52f65934e9.zip
Raise sys-power/upower-pm-utils dependency to -r2 for consistent use of sys-power/pm-utils and to get -DUPOWER_ENABLE_DEPRECATED from sys-power/upower-pm-utils pkg-config file.
(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-power-manager/ChangeLog8
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild10
2 files changed, 9 insertions, 9 deletions
diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 5ae623a23feb..35431ce9a2a3 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,12 @@
# 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.79 2014/06/22 03:50:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.80 2014/06/23 04:10:31 ssuominen Exp $
+
+ 23 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-power-manager-1.3.0.ebuild:
+ Raise sys-power/upower-pm-utils dependency to -r2 for consistent use of sys-
+ power/pm-utils and to get -DUPOWER_ENABLE_DEPRECATED from sys-power/upower-pm-
+ utils pkg-config file.
22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
xfce4-power-manager-1.3.0.ebuild:
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
index c32b0699a807..b5c4a321d454 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.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.3.0.ebuild,v 1.4 2014/06/22 03:50:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.5 2014/06/23 04:10:31 ssuominen Exp $
EAPI=5
inherit flag-o-matic linux-info multilib xfconf
@@ -17,7 +17,7 @@ IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_
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-pm-utils )
+ || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
>=x11-libs/gtk+-2.24:2
>=x11-libs/libnotify-0.7
x11-libs/libX11
@@ -62,12 +62,6 @@ pkg_setup() {
DOCS=( AUTHORS NEWS README TODO )
}
-src_configure() {
- # http://bugzilla.xfce.org/show_bug.cgi?id=10931
- has_version 'sys-power/upower-pm-utils' && append-cppflags -DUPOWER_ENABLE_DEPRECATED
- xfconf_src_configure
-}
-
src_install() {
xfconf_src_install