tetromino 14/05/11 02:30:15 Modified: cinnamon-screensaver-2.2.3.ebuild ChangeLog Log: 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)
Revision Changes Path 1.2 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild?r1=1.1&r2=1.2 Index: cinnamon-screensaver-2.2.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cinnamon-screensaver-2.2.3.ebuild 10 May 2014 18:21:06 -0000 1.1 +++ cinnamon-screensaver-2.2.3.ebuild 11 May 2014 02:30:14 -0000 1.2 @@ -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 @@ 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} 1.2 gnome-extra/cinnamon-screensaver/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 10 May 2014 18:21:06 -0000 1.1 +++ ChangeLog 11 May 2014 02:30:14 -0000 1.2 @@ -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 <tetrom...@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)