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

Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild ChangeLog
Date: Fri, 02 Oct 2009 04:46:20
Message-Id: E1Mta25-0004Wq-MK@stork.gentoo.org
1 arfrever 09/10/02 04:46:17
2
3 Modified: python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild
4 ChangeLog
5 Log:
6 Remove a workaround for missing keywords.
7 (Portage version: 14471-svn/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.10 dev-lang/python/python-2.6.2-r2.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?r1=1.9&r2=1.10
15
16 Index: python-2.6.2-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- python-2.6.2-r2.ebuild 1 Oct 2009 20:03:52 -0000 1.9
23 +++ python-2.6.2-r2.ebuild 2 Oct 2009 04:46:17 -0000 1.10
24 @@ -1,10 +1,10 @@
25 # Copyright 1999-2009 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.9 2009/10/01 20:03:52 arfrever Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.10 2009/10/02 04:46:17 arfrever Exp $
29
30 EAPI="2"
31
32 -inherit autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs versionator
33 +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs versionator
34
35 # We need this so that we don't depend on python.eclass.
36 PYVER_MAJOR=$(get_major_version)
37 @@ -23,7 +23,7 @@
38
39 LICENSE="PSF-2.2"
40 SLOT="2.6"
41 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
42 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
43 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk ucs2 wininst +xml"
44
45 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes}
46 @@ -31,6 +31,7 @@
47
48 RDEPEND=">=app-admin/eselect-python-20090606
49 >=sys-libs/zlib-1.1.3
50 + virtual/libffi
51 !build? (
52 berkdb? ( || (
53 sys-libs/db:4.7
54 @@ -50,10 +51,9 @@
55 ssl? ( dev-libs/openssl )
56 tk? ( >=dev-lang/tk-8.0 )
57 xml? ( >=dev-libs/expat-2 )
58 - )
59 - !m68k? ( !sparc-fbsd? ( virtual/libffi ) )"
60 + )"
61 DEPEND="${RDEPEND}
62 - !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )"
63 + dev-util/pkgconfig"
64 RDEPEND+=" !build? ( app-misc/mime-types )"
65 PDEPEND="app-admin/python-updater"
66
67 @@ -70,9 +70,7 @@
68
69 src_prepare() {
70 # Ensure that internal copy of libffi isn't used.
71 - if ! use m68k && ! use sparc-fbsd; then
72 - rm -fr Modules/_ctypes/libffi*
73 - fi
74 + rm -fr Modules/_ctypes/libffi*
75
76 if tc-is-cross-compiler; then
77 epatch "${FILESDIR}/python-2.5-cross-printf.patch"
78 @@ -145,15 +143,6 @@
79
80 export OPT="${CFLAGS}"
81
82 - local myconf
83 -
84 - # Super-secret switch. Don't use this unless you know what you're
85 - # doing. Enabling UCS2 support will break your existing python
86 - # modules
87 - use ucs2 \
88 - && myconf+=" --enable-unicode=ucs2" \
89 - || myconf+=" --enable-unicode=ucs4"
90 -
91 filter-flags -malign-double
92
93 [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
94 @@ -185,19 +174,16 @@
95 # Please query BSD team before removing this!
96 append-ldflags "-L."
97
98 - if ! use m68k && ! use sparc-fbsd; then
99 - myconf+=" --with-system-ffi"
100 - fi
101 -
102 econf \
103 --with-fpectl \
104 --enable-shared \
105 $(use_enable ipv6) \
106 $(use_with threads) \
107 + $(use ucs2 && echo "--enable-unicode=ucs2" || echo "--enable-unicode=ucs4") \
108 --infodir='${prefix}'/share/info \
109 --mandir='${prefix}'/share/man \
110 --with-libc='' \
111 - ${myconf}
112 + --with-system-ffi
113 }
114
115 src_test() {
116
117
118
119 1.9 dev-lang/python/python-3.1.1-r1.ebuild
120
121 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.9&view=markup
122 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.9&content-type=text/plain
123 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?r1=1.8&r2=1.9
124
125 Index: python-3.1.1-r1.ebuild
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v
128 retrieving revision 1.8
129 retrieving revision 1.9
130 diff -u -r1.8 -r1.9
131 --- python-3.1.1-r1.ebuild 1 Oct 2009 20:03:52 -0000 1.8
132 +++ python-3.1.1-r1.ebuild 2 Oct 2009 04:46:17 -0000 1.9
133 @@ -1,6 +1,6 @@
134 # Copyright 1999-2009 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.8 2009/10/01 20:03:52 arfrever Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.9 2009/10/02 04:46:17 arfrever Exp $
138
139 EAPI="2"
140
141 @@ -23,11 +23,12 @@
142
143 LICENSE="PSF-2.2"
144 SLOT="3.1"
145 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
146 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
147 IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk ucs2 wininst +xml"
148
149 RDEPEND=">=app-admin/eselect-python-20090606
150 >=sys-libs/zlib-1.1.3
151 + virtual/libffi
152 !build? (
153 doc? ( dev-python/python-docs:${SLOT} )
154 gdbm? ( sys-libs/gdbm )
155 @@ -39,10 +40,9 @@
156 ssl? ( dev-libs/openssl )
157 tk? ( >=dev-lang/tk-8.0 )
158 xml? ( >=dev-libs/expat-2 )
159 - )
160 - !m68k? ( !sparc-fbsd? ( virtual/libffi ) )"
161 + )"
162 DEPEND="${RDEPEND}
163 - !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )"
164 + dev-util/pkgconfig"
165 RDEPEND+=" !build? ( app-misc/mime-types )"
166 PDEPEND="app-admin/python-updater
167 =dev-lang/python-2*"
168 @@ -51,9 +51,7 @@
169
170 src_prepare() {
171 # Ensure that internal copy of libffi isn't used.
172 - if ! use m68k && ! use sparc-fbsd; then
173 - rm -fr Modules/_ctypes/libffi*
174 - fi
175 + rm -fr Modules/_ctypes/libffi*
176
177 if ! tc-is-cross-compiler; then
178 rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
179 @@ -118,8 +116,6 @@
180
181 export OPT="${CFLAGS}"
182
183 - local myconf
184 -
185 filter-flags -malign-double
186
187 [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
188 @@ -157,10 +153,6 @@
189 fi
190 dbmliborder="${dbmliborder#:}"
191
192 - if ! use m68k && ! use sparc-fbsd; then
193 - myconf+=" --with-system-ffi"
194 - fi
195 -
196 econf \
197 --with-fpectl \
198 --enable-shared \
199 @@ -171,7 +163,7 @@
200 --mandir='${prefix}'/share/man \
201 --with-libc='' \
202 --with-dbmliborder=${dbmliborder} \
203 - ${myconf}
204 + --with-system-ffi
205 }
206
207 src_test() {
208
209
210
211 1.422 dev-lang/python/ChangeLog
212
213 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.422&view=markup
214 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.422&content-type=text/plain
215 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?r1=1.421&r2=1.422
216
217 Index: ChangeLog
218 ===================================================================
219 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
220 retrieving revision 1.421
221 retrieving revision 1.422
222 diff -u -r1.421 -r1.422
223 --- ChangeLog 27 Sep 2009 17:56:00 -0000 1.421
224 +++ ChangeLog 2 Oct 2009 04:46:17 -0000 1.422
225 @@ -1,6 +1,10 @@
226 # ChangeLog for dev-lang/python
227 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
228 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.421 2009/09/27 17:56:00 arfrever Exp $
229 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.422 2009/10/02 04:46:17 arfrever Exp $
230 +
231 + 02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
232 + python-2.6.2-r2.ebuild, python-3.1.1-r1.ebuild:
233 + Remove a workaround for missing keywords.
234
235 27 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
236 python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild,
Report Message
Find on MARC Find on Google Groups