diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-06-19 16:33:04 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-06-19 16:33:04 +0000 |
| commit | 78649fda31838d45857f4f28989cd27a26814fe2 (patch) | |
| tree | b0c8b2f6c2399922de230cbe113ae14583241c4b /xfce-base | |
| parent | old (diff) | |
| download | gentoo-2-78649fda31838d45857f4f28989cd27a26814fe2.tar.gz gentoo-2-78649fda31838d45857f4f28989cd27a26814fe2.tar.bz2 gentoo-2-78649fda31838d45857f4f28989cd27a26814fe2.zip | |
Fix dependency of sys-power/upower in -r1 (current stable) to match that of -r2.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfce4-session/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index 6d9430ed3a1f..d3465be600a4 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/xfce4-session # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.210 2014/06/02 16:40:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.211 2014/06/19 16:33:04 ssuominen Exp $ + + 19 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-session-4.10.1-r1.ebuild: + Fix dependency of sys-power/upower in -r1 (current stable) to match that of + -r2. 02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> -xfce4-session-4.11.0.ebuild: diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild index 3597dce1e423..041bc179948b 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.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-session/xfce4-session-4.10.1-r1.ebuild,v 1.14 2014/05/26 19:48:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.15 2014/06/19 16:33:04 ssuominen Exp $ EAPI=5 inherit xfconf @@ -27,7 +27,10 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 RDEPEND="${COMMON_DEPEND} x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) - udev? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) + udev? ( + systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + !systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) + ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver |