Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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 dev-python/qscintilla-python: qscintilla-python-2.3.2-r2.ebuild ChangeLog qscintilla-python-2.4.ebuild
Date: Sat, 02 Jan 2010 16:45:10
Message-Id: E1NR76B-0001yb-V0@stork.gentoo.org
1 yngwin 10/01/02 16:45:07
2
3 Modified: qscintilla-python-2.3.2-r2.ebuild ChangeLog
4 qscintilla-python-2.4.ebuild
5 Log:
6 Removing qt3 support, dropping qt4 useflag as it is now the only option.
7 (Portage version: 2.2_rc61/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.9 dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild?r1=1.8&r2=1.9
15
16 Index: qscintilla-python-2.3.2-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- qscintilla-python-2.3.2-r2.ebuild 29 Aug 2009 18:02:21 -0000 1.8
23 +++ qscintilla-python-2.3.2-r2.ebuild 2 Jan 2010 16:45:07 -0000 1.9
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2009 Gentoo Foundation
26 +# Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild,v 1.8 2009/08/29 18:02:21 nixnut Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild,v 1.9 2010/01/02 16:45:07 yngwin Exp $
30
31 EAPI="2"
32
33 @@ -16,12 +16,11 @@
34 LICENSE="GPL-2"
35 SLOT="0"
36 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
37 -IUSE="qt4"
38 +IUSE=""
39
40 -DEPEND=">=dev-python/sip-4.4
41 - =x11-libs/qscintilla-${PV}*[qt4=]
42 - qt4? ( >=dev-python/PyQt4-4.4 )
43 - !qt4? ( >=dev-python/PyQt-3.17.6 )"
44 +DEPEND="dev-python/sip
45 + ~x11-libs/qscintilla-${PV}[qt4]
46 + dev-python/PyQt4"
47 RDEPEND="${DEPEND}"
48
49 S=${WORKDIR}/${MY_P}/Python
50 @@ -32,13 +31,7 @@
51 }
52
53 src_configure() {
54 - local myconf="-o /usr/lib -n /usr/include"
55 - if use qt4; then
56 - myconf="${myconf} -p 4"
57 - else
58 - myconf="${myconf} -p 3"
59 - fi
60 -
61 + local myconf="-o /usr/lib -n /usr/include -p 4"
62 python_version
63 ${python} configure.py ${myconf} || die "configure.py failed"
64 }
65
66
67
68 1.46 dev-python/qscintilla-python/ChangeLog
69
70 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?rev=1.46&view=markup
71 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?rev=1.46&content-type=text/plain
72 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/ChangeLog?r1=1.45&r2=1.46
73
74 Index: ChangeLog
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v
77 retrieving revision 1.45
78 retrieving revision 1.46
79 diff -u -r1.45 -r1.46
80 --- ChangeLog 18 Oct 2009 14:47:12 -0000 1.45
81 +++ ChangeLog 2 Jan 2010 16:45:07 -0000 1.46
82 @@ -1,6 +1,10 @@
83 # ChangeLog for dev-python/qscintilla-python
84 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
85 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.45 2009/10/18 14:47:12 armin76 Exp $
86 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
87 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.46 2010/01/02 16:45:07 yngwin Exp $
88 +
89 + 02 Jan 2010; Ben de Groot <yngwin@g.o>
90 + qscintilla-python-2.3.2-r2.ebuild, qscintilla-python-2.4.ebuild:
91 + Removing qt3 support, dropping qt4 useflag as it is now the only option.
92
93 18 Oct 2009; Raúl Porcel <armin76@g.o>
94 qscintilla-python-2.4.ebuild:
95
96
97
98 1.14 dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
99
100 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild?rev=1.14&view=markup
101 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild?rev=1.14&content-type=text/plain
102 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild?r1=1.13&r2=1.14
103
104 Index: qscintilla-python-2.4.ebuild
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v
107 retrieving revision 1.13
108 retrieving revision 1.14
109 diff -u -r1.13 -r1.14
110 --- qscintilla-python-2.4.ebuild 18 Oct 2009 14:47:12 -0000 1.13
111 +++ qscintilla-python-2.4.ebuild 2 Jan 2010 16:45:07 -0000 1.14
112 @@ -1,6 +1,6 @@
113 -# Copyright 1999-2009 Gentoo Foundation
114 +# Copyright 1999-2010 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.13 2009/10/18 14:47:12 armin76 Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.14 2010/01/02 16:45:07 yngwin Exp $
118
119 EAPI="2"
120 SUPPORT_PYTHON_ABIS="1"
121 @@ -16,12 +16,11 @@
122 LICENSE="|| ( GPL-2 GPL-3 )"
123 SLOT="0"
124 KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
125 -IUSE="debug +qt4"
126 +IUSE="debug"
127
128 DEPEND=">=dev-python/sip-4.8
129 - ~x11-libs/qscintilla-${PV}[qt4=]
130 - qt4? ( >=dev-python/PyQt4-4.5[X] )
131 - !qt4? ( >=dev-python/PyQt-3.18 )"
132 + ~x11-libs/qscintilla-${PV}[qt4]
133 + dev-python/PyQt4[X]"
134 RDEPEND="${DEPEND}"
135
136 S="${WORKDIR}/${MY_P}/Python"
137 @@ -35,10 +34,10 @@
138 src_configure() {
139 configuration() {
140 local myconf="$(PYTHON) configure.py
141 - --destdir=$(python_get_sitedir)/PyQt$(use qt4 && echo 4)
142 + --destdir=$(python_get_sitedir)/PyQt4
143 -n /usr/include
144 -o /usr/$(get_libdir)
145 - -p $(use qt4 && echo 4 || echo 3)
146 + -p 4
147 $(use debug && echo '--debug')"
148 echo ${myconf}
149 ${myconf}
Report Message
Find on MARC Find on Google Groups