Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qscintilla: ChangeLog qscintilla-2.4.ebuild qscintilla-2.3.2.ebuild qscintilla-1.5.1.ebuild
Date: Sat, 02 Jan 2010 18:59:22
Message-Id: E1NR9C3-0000Lz-75@stork.gentoo.org
1 yngwin 10/01/02 18:59:19
2
3 Modified: ChangeLog qscintilla-2.4.ebuild
4 qscintilla-2.3.2.ebuild
5 Removed: qscintilla-1.5.1.ebuild
6 Log:
7 Adjust qscintilla-python dep which no longer has qt4 useflag (qt4 is always enabled).
8 (Portage version: 2.2_rc61/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.37 x11-libs/qscintilla/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.37&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.37&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/ChangeLog?r1=1.36&r2=1.37
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v
20 retrieving revision 1.36
21 retrieving revision 1.37
22 diff -u -r1.36 -r1.37
23 --- ChangeLog 9 Nov 2009 10:53:36 -0000 1.36
24 +++ ChangeLog 2 Jan 2010 18:59:18 -0000 1.37
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-libs/qscintilla
27 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.36 2009/11/09 10:53:36 abcd Exp $
29 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.37 2010/01/02 18:59:18 yngwin Exp $
31 +
32 + 02 Jan 2010; Ben de Groot <yngwin@g.o> -qscintilla-1.5.1.ebuild,
33 + qscintilla-2.3.2.ebuild, qscintilla-2.4.ebuild:
34 + Adjust qscintilla-python dep which no longer has qt4 useflag (qt4 is
35 + always enabled). Remove obsolete version.
36
37 09 Nov 2009; Jonathan Callen <abcd@g.o>
38 -files/qscintilla-2.1-qt.patch, -files/qscintilla-2.1-qt4.patch:
39 @@ -415,14 +420,14 @@
40 Version bump
41
42 09 May 2003; Luca Barbato <lu_zero@g.o> qscintilla-1.52.ebuild :
43 - Keyworded ~ppc
44 + Keyworded ~ppc
45
46 *qscintilla-1.52 (29 Apr 2003)
47
48 29 Apr 2003; Michele Balistreri <brain@g.o> qscintilla-1.52.ebuild :
49 Version bump
50
51 -*qscintilla-1.49-r1 (1 Feb 2003)
52 +*qscintilla-1.49-r1 (1 Feb 2003)
53
54 01 Feb 2003; Joachim Blaabjerg <styx@g.o>
55
56 @@ -436,9 +441,9 @@
57
58 Fixed the ebuild a little, sandbox violations etc.
59
60 -*qscintilla-1.49 (19 Dec 2002)
61 +*qscintilla-1.49 (19 Dec 2002)
62
63 19 Dec 2002; Bart Verwilst <verwilst@g.o>
64 -
65 +
66 initial ebuild.
67
68
69
70
71 1.7 x11-libs/qscintilla/qscintilla-2.4.ebuild
72
73 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild?rev=1.7&view=markup
74 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild?rev=1.7&content-type=text/plain
75 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild?r1=1.6&r2=1.7
76
77 Index: qscintilla-2.4.ebuild
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v
80 retrieving revision 1.6
81 retrieving revision 1.7
82 diff -u -r1.6 -r1.7
83 --- qscintilla-2.4.ebuild 18 Oct 2009 14:48:05 -0000 1.6
84 +++ qscintilla-2.4.ebuild 2 Jan 2010 18:59:18 -0000 1.7
85 @@ -1,6 +1,6 @@
86 -# Copyright 1999-2009 Gentoo Foundation
87 +# Copyright 1999-2010 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.6 2009/10/18 14:48:05 armin76 Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.7 2010/01/02 18:59:18 yngwin Exp $
91
92 EAPI="2"
93
94 @@ -22,7 +22,7 @@
95 DEPEND="${RDEPEND}"
96 # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
97 # need dev-python/PyQt, bug 199543
98 -PDEPEND="python? ( ~dev-python/qscintilla-python-${PV}[qt4=] )"
99 +PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
100
101 S="${WORKDIR}"/${MY_P}
102
103
104
105
106 1.10 x11-libs/qscintilla/qscintilla-2.3.2.ebuild
107
108 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?rev=1.10&view=markup
109 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?rev=1.10&content-type=text/plain
110 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild?r1=1.9&r2=1.10
111
112 Index: qscintilla-2.3.2.ebuild
113 ===================================================================
114 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v
115 retrieving revision 1.9
116 retrieving revision 1.10
117 diff -u -r1.9 -r1.10
118 --- qscintilla-2.3.2.ebuild 1 Jun 2009 22:28:49 -0000 1.9
119 +++ qscintilla-2.3.2.ebuild 2 Jan 2010 18:59:18 -0000 1.10
120 @@ -1,6 +1,6 @@
121 -# Copyright 1999-2009 Gentoo Foundation
122 +# Copyright 1999-2010 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.9 2009/06/01 22:28:49 yngwin Exp $
125 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.10 2010/01/02 18:59:18 yngwin Exp $
126
127 EAPI=2
128 inherit eutils toolchain-funcs multilib
129 @@ -15,14 +15,14 @@
130 SLOT="0"
131 LICENSE="GPL-2"
132 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
133 -IUSE="qt4 +python doc examples debug"
134 +IUSE="+qt4 +python doc examples debug"
135
136 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
137 !qt4? ( x11-libs/qt:3 )"
138 DEPEND="${RDEPEND}"
139 # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
140 # need dev-python/PyQt, bug 199543
141 -PDEPEND="python? ( dev-python/qscintilla-python[qt4=] )"
142 +PDEPEND="python? ( dev-python/qscintilla-python )"
143
144 src_configure() {
145 local myqmake myqtdir