[gentoo-commits] proj/xfce:master commit in: xfce-base/xfce4-settings/

[Christoph Mende]

commit:     4d36fe02e353d3f4e9a181dcfff4061b542ab429
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 25 20:15:28 2014 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 25 20:15:28 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=4d36fe02

xfce4-settings: Sync with gentoo-x86

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 84F20B43

---
 xfce-base/xfce4-settings/xfce4-settings-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild 
b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 80acc90..dcbaef5 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.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-base/xfce4-settings/xfce4-settings-4.11.2.ebuild,v 
1.1 2014/03/11 15:11:55 ssuominen Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild,v
 1.1 2014/05/31 19:13:04 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
        >=xfce-base/xfconf-4.10
        libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
        libnotify? ( >=x11-libs/libnotify-0.7 )
-       udev? ( >=sys-power/upower-0.9.8 )
+       udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
        xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
        dev-util/intltool
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
        x11-proto/xproto"
 
 pkg_setup() {
+       PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
+
        XFCONF=(
                $(use_enable udev upower-glib)
                $(use_enable libnotify)