diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:44:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:44:23 +0000 |
| commit | ebaef5d09c3db4708f9a95f1139c786cd30e185c (patch) | |
| tree | c353c3cdaeaddf6087e7b70f7e0293471c454b1f /xfce-base/xfce4-settings | |
| parent | Fix dependencies to allow sys-power/upower-pm-utils. (diff) | |
| download | gentoo-2-ebaef5d09c3db4708f9a95f1139c786cd30e185c.tar.gz gentoo-2-ebaef5d09c3db4708f9a95f1139c786cd30e185c.tar.bz2 gentoo-2-ebaef5d09c3db4708f9a95f1139c786cd30e185c.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-base/xfce4-settings')
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index 11b680d47ccd..aa86fd1ae8b9 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.119 2014/04/22 13:50:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.120 2014/05/26 19:44:23 ssuominen Exp $ + + 26 May 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-settings-4.11.2.ebuild: + Fix dependencies to allow sys-power/upower-pm-utils. 22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -xfce4-settings-4.10.0.ebuild: diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild index 1c4a59badb75..7aa27dc07874 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.11.2.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.ebuild,v 1.2 2014/05/26 19:44:23 ssuominen Exp $ EAPI=5 inherit xfconf @@ -29,7 +29,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.8 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )" DEPEND="${RDEPEND} dev-util/intltool |