diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:42:15 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-26 19:42:15 +0000 |
| commit | 4def411a8fb247de4b715f3546aba231aa4c9109 (patch) | |
| tree | e713cac0c734e803c5fae0fb6ef47c60725b7747 /xfce-base/xfce4-session | |
| parent | Fix dependencies to allow sys-power/upower-pm-utils. (diff) | |
| download | gentoo-2-4def411a8fb247de4b715f3546aba231aa4c9109.tar.gz gentoo-2-4def411a8fb247de4b715f3546aba231aa4c9109.tar.bz2 gentoo-2-4def411a8fb247de4b715f3546aba231aa4c9109.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-session')
| -rw-r--r-- | xfce-base/xfce4-session/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index 1d6aeb72bc33..2c1e4ab5f9ca 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,10 @@ # 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.204 2014/04/22 13:41:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.205 2014/05/26 19:42:15 ssuominen Exp $ + + 26 May 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-session-4.10.1-r1.ebuild, xfce4-session-4.11.0.ebuild: + Fix dependencies to allow sys-power/upower-pm-utils. 22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml: Remove unused USE="consolekit" and USE="gnome-keyring" from metadata.xml 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 56d37ab34682..7bd2540c27b4 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.12 2014/04/20 08:50:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.13 2014/05/26 19:42:15 ssuominen Exp $ EAPI=5 inherit xfconf @@ -27,7 +27,7 @@ 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.9.20 ) + udev? ( || ( >=sys-power/upower-0.9.20 sys-power/upower-pm-utils ) ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild index 5eb87a51b1c3..ec9d1f472dcf 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.11.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-base/xfce4-session/xfce4-session-4.11.0.ebuild,v 1.2 2014/03/15 19:30:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild,v 1.3 2014/05/26 19:42:15 ssuominen Exp $ EAPI=5 inherit xfconf @@ -27,7 +27,7 @@ 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.9.20 ) + udev? ( || ( >=sys-power/upower-0.9.20 sys-power/upower-pm-utils ) ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 gnome-extra/gnome-screensaver |