Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libXScrnSaver: ChangeLog libXScrnSaver-1.2.0.ebuild
Date: Sun, 01 Nov 2009 20:42:40
Message-Id: E1N4hG0-0000fX-Dp@stork.gentoo.org
1 zmedico 09/11/01 20:42:36
2
3 Modified: ChangeLog libXScrnSaver-1.2.0.ebuild
4 Log:
5 Block older versions of scrnsaverproto, in order to avoid file collisions when installing from binary packages.
6 (Portage version: 2.2_rc48/cvs/Linux i686)
7
8 Revision Changes Path
9 1.60 x11-libs/libXScrnSaver/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog?rev=1.60&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog?rev=1.60&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog?r1=1.59&r2=1.60
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v
18 retrieving revision 1.59
19 retrieving revision 1.60
20 diff -u -r1.59 -r1.60
21 --- ChangeLog 3 Oct 2009 15:10:55 -0000 1.59
22 +++ ChangeLog 1 Nov 2009 20:42:35 -0000 1.60
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-libs/libXScrnSaver
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.59 2009/10/03 15:10:55 scarabeus Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.60 2009/11/01 20:42:35 zmedico Exp $
28 +
29 + 01 Nov 2009; Zac Medico <zmedico@g.o> libXScrnSaver-1.2.0.ebuild:
30 + Block older versions of scrnsaverproto, in order to avoid file collisions
31 + when installing from binary packages.
32
33 *libXScrnSaver-1.2.0 (03 Oct 2009)
34
35
36
37
38 1.2 x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild?r1=1.1&r2=1.2
43
44 Index: libXScrnSaver-1.2.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- libXScrnSaver-1.2.0.ebuild 3 Oct 2009 15:10:55 -0000 1.1
51 +++ libXScrnSaver-1.2.0.ebuild 1 Nov 2009 20:42:35 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.1 2009/10/03 15:10:55 scarabeus Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.2 2009/11/01 20:42:35 zmedico Exp $
57
58 # Must be before x-modular eclass is inherited
59 #SNAPSHOT="yes"
60 @@ -11,7 +11,9 @@
61 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
62 IUSE=""
63
64 -RDEPEND="x11-libs/libX11
65 +COMMON_DEPEND="x11-libs/libX11
66 x11-libs/libXext"
67 -DEPEND="${RDEPEND}
68 +RDEPEND="${COMMON_DEPEND}
69 + !<x11-proto/scrnsaverproto-1.2"
70 +DEPEND="${COMMON_DEPEND}
71 >=x11-proto/scrnsaverproto-1.2"