diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-06-14 17:39:40 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-06-14 17:39:40 +0000 |
| commit | 9c71fe4ff5a58c8ea4054b32a2ff882142e7ed5c (patch) | |
| tree | e3414414997119ed5424cbe8989992e446dad14e /gnome-extra | |
| parent | [QA] Remove emul-linux-x86-* from dependencies. (diff) | |
| download | gentoo-2-9c71fe4ff5a58c8ea4054b32a2ff882142e7ed5c.tar.gz gentoo-2-9c71fe4ff5a58c8ea4054b32a2ff882142e7ed5c.tar.bz2 gentoo-2-9c71fe4ff5a58c8ea4054b32a2ff882142e7ed5c.zip | |
Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/cinnamon/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-2.6.7.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index c8df40661019..9af17ad266f1 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/cinnamon # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.59 2015/06/14 01:59:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.60 2015/06/14 17:39:40 tetromino Exp $ + + 14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + cinnamon-2.6.7.ebuild: + Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex. *cinnamon-2.6.7 (14 Jun 2015) diff --git a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild index 12a93504ec84..291576f5e102 100644 --- a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild +++ b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.1 2015/06/14 01:59:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.2 2015/06/14 17:39:40 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -83,7 +83,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-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 |