diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-05-31 22:30:15 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-31 22:30:15 +0000 |
| commit | e4cc5d68ba503606c309849f050a77d17a3342b5 (patch) | |
| tree | d4c93b2fcf3f2236a69cbe4e3f254c84e9492d0c /gnome-extra | |
| parent | Allow falling back to sys-power/upower-pm-utils. (diff) | |
| download | gentoo-2-e4cc5d68ba503606c309849f050a77d17a3342b5.tar.gz gentoo-2-e4cc5d68ba503606c309849f050a77d17a3342b5.tar.bz2 gentoo-2-e4cc5d68ba503606c309849f050a77d17a3342b5.zip | |
Allow falling back to sys-power/upower-pm-utils.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/cinnamon/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild | 4 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-2.2.9.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index 0ca123ab1f30..365265d0d53c 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/cinnamon # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.39 2014/05/25 13:54:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.40 2014/05/31 22:30:15 ssuominen Exp $ + + 31 May 2014; Samuli Suominen <ssuominen@gentoo.org> + cinnamon-1.8.8.1-r2.ebuild, cinnamon-2.2.9.ebuild: + Allow falling back to sys-power/upower-pm-utils. 25 May 2014; Pacho Ramos <pacho@gentoo.org> -cinnamon-2.2.6.ebuild, cinnamon-2.2.9.ebuild: diff --git a/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild index f5517d57f165..e0caa81567a5 100644 --- a/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild +++ b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.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/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.4 2014/04/26 08:23:05 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.5 2014/05/31 22:30:15 ssuominen Exp $ EAPI="5" GCONF_DEBUG="no" @@ -89,7 +89,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] + || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-base/gnome-session-3.8 diff --git a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild index 4ed31943b244..5f93a4379524 100644 --- a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild +++ b/gnome-extra/cinnamon/cinnamon-2.2.9.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/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.2 2014/05/25 13:54:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.3 2014/05/31 22:30:15 ssuominen Exp $ EAPI="5" GCONF_DEBUG="no" @@ -79,7 +79,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] + || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) gnome-extra/cinnamon-session |