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/libXinerama: ChangeLog libXinerama-1.1.ebuild
Date: Sun, 01 Nov 2009 20:26:33
Message-Id: E1N4h0Q-0007tt-Ne@stork.gentoo.org
1 zmedico 09/11/01 20:26:30
2
3 Modified: ChangeLog libXinerama-1.1.ebuild
4 Log:
5 Block older versions of xineramaproto, 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.50 x11-libs/libXinerama/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/ChangeLog?rev=1.50&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/ChangeLog?rev=1.50&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/ChangeLog?r1=1.49&r2=1.50
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v
18 retrieving revision 1.49
19 retrieving revision 1.50
20 diff -u -r1.49 -r1.50
21 --- ChangeLog 3 Oct 2009 15:29:10 -0000 1.49
22 +++ ChangeLog 1 Nov 2009 20:26:30 -0000 1.50
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-libs/libXinerama
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.49 2009/10/03 15:29:10 scarabeus Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.50 2009/11/01 20:26:30 zmedico Exp $
28 +
29 + 01 Nov 2009; Zac Medico <zmedico@g.o> libXinerama-1.1.ebuild:
30 + Block older versions of xineramaproto, in order to avoid file collisions
31 + when installing from binary packages.
32
33 *libXinerama-1.1 (03 Oct 2009)
34
35
36
37
38 1.2 x11-libs/libXinerama/libXinerama-1.1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild?r1=1.1&r2=1.2
43
44 Index: libXinerama-1.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- libXinerama-1.1.ebuild 3 Oct 2009 15:29:10 -0000 1.1
51 +++ libXinerama-1.1.ebuild 1 Nov 2009 20:26:30 -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/libXinerama/libXinerama-1.1.ebuild,v 1.1 2009/10/03 15:29:10 scarabeus Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild,v 1.2 2009/11/01 20:26:30 zmedico Exp $
57
58 # Must be before x-modular eclass is inherited
59 #SNAPSHOT="yes"
60 @@ -11,8 +11,10 @@
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/xineramaproto-1.2"
70 +DEPEND="${COMMON_DEPEND}
71 x11-proto/xextproto
72 >=x11-proto/xineramaproto-1.2"