diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-11 02:30:14 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-11 02:30:14 +0000 |
| commit | 22d9d1ceff609d2ca3fb6707223ab81ce41bc57f (patch) | |
| tree | 6a9d1b6d99ed5555691c85b0af06b3d6e82fe095 /gnome-extra/cinnamon-screensaver | |
| parent | Version bump. (diff) | |
| download | gentoo-2-22d9d1ceff609d2ca3fb6707223ab81ce41bc57f.tar.gz gentoo-2-22d9d1ceff609d2ca3fb6707223ab81ce41bc57f.tar.bz2 gentoo-2-22d9d1ceff609d2ca3fb6707223ab81ce41bc57f.zip | |
Prevent file collision with cinnamon-1.8.8.1-r2
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4F1D4860)
Diffstat (limited to 'gnome-extra/cinnamon-screensaver')
| -rw-r--r-- | gnome-extra/cinnamon-screensaver/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog index 8fa2fa79c229..c42fa897917a 100644 --- a/gnome-extra/cinnamon-screensaver/ChangeLog +++ b/gnome-extra/cinnamon-screensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/cinnamon-screensaver # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.1 2014/05/10 18:21:06 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.2 2014/05/11 02:30:14 tetromino Exp $ + + 11 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + cinnamon-screensaver-2.2.3.ebuild: + Prevent file collision with cinnamon-1.8.8.1-r2 *cinnamon-screensaver-2.2.3 (10 May 2014) diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild index 61c4b29ea411..873e411943bd 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.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-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.1 2014/05/10 18:21:06 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.2 2014/05/11 02:30:14 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -37,7 +37,9 @@ COMMON_DEPEND=" pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) " +# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack RDEPEND=" + !~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) " DEPEND="${COMMON_DEPEND} |