Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/
Date: Tue, 31 Jan 2017 10:19:56
Message-Id: 1485857975.afeac9b0fb8bded5449791dd33952cd97ab836b8.monsieurp@gentoo
1 commit: afeac9b0fb8bded5449791dd33952cd97ab836b8
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 10:19:35 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 10:19:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeac9b0
7
8 dev-python/pycurl: remove vulnerable versions.
9
10 Gentoo-Bug: https://bugs.gentoo.org/564768
11
12 Package-Manager: portage-2.3.3
13
14 dev-python/pycurl/Manifest | 4 --
15 .../pycurl/files/pycurl-7.19.3.1-ssl-test.patch | 64 -------------------
16 .../files/pycurl-7.19.5.1-py3.5-backport.patch | 15 -----
17 dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild | 64 -------------------
18 dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild | 73 ----------------------
19 dev-python/pycurl/pycurl-7.19.5.1.ebuild | 64 -------------------
20 dev-python/pycurl/pycurl-7.19.5.3.ebuild | 71 ---------------------
21 dev-python/pycurl/pycurl-7.21.5.ebuild | 71 ---------------------
22 8 files changed, 426 deletions(-)
23
24 diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
25 index 2b337fa..0e24462 100644
26 --- a/dev-python/pycurl/Manifest
27 +++ b/dev-python/pycurl/Manifest
28 @@ -1,5 +1 @@
29 -DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
30 -DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc
31 -DIST pycurl-7.19.5.3.tar.gz 154800 SHA256 24f6c4016b1dd2a5e29d1b025ac2ad61f80c17adfdcf8a7f47aefab63ace78d7 SHA512 f7e65e0c6f7d1666ed3bebc4fabb41205f6dadd96d80fb5d1985c13ab28d35effef2966e961383e01881648fca4a4d500e9692d712888313dbe164b2c651530c WHIRLPOOL c5fe1cc232bae07dfc63e1a8a3b0929b3c1bbf7adf29c2b6085e5bc1e97656d6f5afc236974bfc3febdd2ab4fe1b7cce08c96d4a8eba5ba870505c7c423badeb
32 -DIST pycurl-7.21.5.tar.gz 170962 SHA256 8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0 SHA512 0f07b9e2256e4e019bf0ac85d9ca2fff56cffd49986495f2235f91e341ed937c9895da1636548be90523404027d063d83910055899e178e653842bc5de4151c4 WHIRLPOOL 2e46b5e16181d3cc66be56b38d40f4b7fd2ff7b9574fc4214247140a43ce70c0eac71d793ceddd24ff05bf784a1e8105c315fa4a7b0460bd908901b159e6655d
33 DIST pycurl-7.43.0.tar.gz 182522 SHA256 aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5 WHIRLPOOL 640ef7669273bccdf72f0d98bd5f5c9d882f35ac507d2152f8ab1e2e680298ebe2691b4960713bb39b0a405ba8d0e9a03d69617c5150bb65581efaab99304185
34
35 diff --git a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch b/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch
36 deleted file mode 100644
37 index c7e1580..00000000
38 --- a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch
39 +++ /dev/null
40 @@ -1,64 +0,0 @@
41 -https://github.com/p-push/pycurl/commit/8644393bec56cd05c19d5dbe420ff741ba899d10
42 -diff --git a/tests/runwsgi.py b/tests/runwsgi.py
43 -index f419d7c..242ef1d 100644
44 ---- a/tests/runwsgi.py
45 -+++ b/tests/runwsgi.py
46 -@@ -11,6 +11,10 @@
47 -
48 - class Server(bottle.WSGIRefServer):
49 - def run(self, handler): # pragma: no cover
50 -+ self.srv = self.make_server(handler)
51 -+ self.serve()
52 -+
53 -+ def make_server(self, handler):
54 - from wsgiref.simple_server import make_server, WSGIRequestHandler
55 - if self.quiet:
56 - base = self.options.get('handler_class', WSGIRequestHandler)
57 -@@ -18,7 +22,10 @@ class QuietHandler(base):
58 - def log_request(*args, **kw):
59 - pass
60 - self.options['handler_class'] = QuietHandler
61 -- self.srv = make_server(self.host, self.port, handler, **self.options)
62 -+ srv = make_server(self.host, self.port, handler, **self.options)
63 -+ return srv
64 -+
65 -+ def serve(self):
66 - if sys.version_info[0] == 2 and sys.version_info[1] < 6:
67 - # python 2.5 has no poll_interval
68 - # and thus no way to stop the server
69 -@@ -27,20 +34,21 @@ def log_request(*args, **kw):
70 - else:
71 - self.srv.serve_forever(poll_interval=0.1)
72 -
73 --class SslServer(bottle.CherryPyServer):
74 -- def run(self, handler):
75 -- import cherrypy.wsgiserver, cherrypy.wsgiserver.ssl_builtin
76 -- server = cherrypy.wsgiserver.CherryPyWSGIServer((self.host, self.port), handler)
77 -+# http://www.socouldanyone.com/2014/01/bottle-with-ssl.html
78 -+# https://github.com/mfm24/miscpython/blob/master/bottle_ssl.py
79 -+class SslServer(Server):
80 -+ def run(self, handler): # pragma: no cover
81 -+ self.srv = self.make_server(handler)
82 -+
83 -+ import ssl
84 - cert_dir = os.path.join(os.path.dirname(__file__), 'certs')
85 -- ssl_adapter = cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter(
86 -- os.path.join(cert_dir, 'server.crt'),
87 -- os.path.join(cert_dir, 'server.key'),
88 -- )
89 -- server.ssl_adapter = ssl_adapter
90 -- try:
91 -- server.start()
92 -- finally:
93 -- server.stop()
94 -+ self.srv.socket = ssl.wrap_socket(
95 -+ self.srv.socket,
96 -+ keyfile=os.path.join(cert_dir, 'server.key'),
97 -+ certfile=os.path.join(cert_dir, 'server.crt'),
98 -+ server_side=True)
99 -+
100 -+ self.serve()
101 -
102 - def start_bottle_server(app, port, server, **kwargs):
103 - server_thread = ServerThread(app, port, server, kwargs)
104 -
105
106 diff --git a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch b/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
107 deleted file mode 100644
108 index 0bc6f6c..00000000
109 --- a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
110 +++ /dev/null
111 @@ -1,15 +0,0 @@
112 - tests/memory_mgmt_test.py | 4 +++-
113 - 1 file changed, 3 insertions(+), 1 deletion(-)
114 -
115 -diff --git a/tests/memory_mgmt_test.py b/tests/memory_mgmt_test.py
116 -index 08636ae..a7b8a21 100644
117 ---- a/tests/memory_mgmt_test.py
118 -+++ b/tests/memory_mgmt_test.py
119 -@@ -258,4 +258,6 @@ class MemoryMgmtTest(unittest.TestCase):
120 -
121 - gc.collect()
122 - new_object_count = len(gc.get_objects())
123 -- self.assertEqual(new_object_count, object_count)
124 -+ # it seems that GC sometimes collects something that existed
125 -+ # before this test ran, GH issues #273/#274
126 -+ self.assertTrue(new_object_count in (object_count, object_count-1))
127
128 diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
129 deleted file mode 100644
130 index da04b60..00000000
131 --- a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
132 +++ /dev/null
133 @@ -1,64 +0,0 @@
134 -# Copyright 1999-2017 Gentoo Foundation
135 -# Distributed under the terms of the GNU General Public License v2
136 -# $Id$
137 -EAPI=5
138 -
139 -# The selftests fail with pypy, and urlgrabber segfaults for me.
140 -PYTHON_COMPAT=( python{2_7,3_4} )
141 -
142 -inherit distutils-r1
143 -
144 -DESCRIPTION="python binding for curl/libcurl"
145 -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
146 -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
147 -
148 -LICENSE="LGPL-2.1"
149 -SLOT="0"
150 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
151 -IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
152 -
153 -# Depend on a curl with curl_ssl_* USE flags.
154 -# libcurl must not be using an ssl backend we do not support.
155 -# If the libcurl ssl backend changes pycurl should be recompiled.
156 -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
157 -# does not need to initialize gcrypt threading and we do not need to
158 -# explicitly link to libgcrypt.
159 -RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
160 - ssl? (
161 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
162 - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
163 -
164 -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
165 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
166 -DEPEND="${RDEPEND}
167 - test? ( dev-python/nose[${PYTHON_USEDEP}]
168 - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] )"
169 -# Needed for individual runs of testsuite by python impls.
170 -DISTUTILS_IN_SOURCE_BUILD=1
171 -
172 -PATCHES=( "${FILESDIR}"/${P}-ssl-test.patch )
173 -
174 -python_prepare_all() {
175 - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
176 - distutils-r1_python_prepare_all
177 -}
178 -
179 -src_configure() {
180 - # Override faulty detection in setup.py, bug 510974.
181 - export PYCURL_SSL_LIBRARY=${CURL_SSL}
182 -}
183 -
184 -python_compile() {
185 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
186 - distutils-r1_python_compile
187 -}
188 -
189 -python_test() {
190 - emake test
191 -}
192 -
193 -python_install_all() {
194 - local HTML_DOCS=( doc/. )
195 - use examples && local EXAMPLES=( examples/. )
196 - distutils-r1_python_install_all
197 -}
198
199 diff --git a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
200 deleted file mode 100644
201 index 1ae172c..00000000
202 --- a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
203 +++ /dev/null
204 @@ -1,73 +0,0 @@
205 -# Copyright 1999-2017 Gentoo Foundation
206 -# Distributed under the terms of the GNU General Public License v2
207 -# $Id$
208 -EAPI=5
209 -
210 -# The selftests fail with pypy, and urlgrabber segfaults for me.
211 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
212 -
213 -inherit distutils-r1
214 -
215 -DESCRIPTION="python binding for curl/libcurl"
216 -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
217 -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
218 -
219 -LICENSE="LGPL-2.1"
220 -SLOT="0"
221 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
222 -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
223 -
224 -# Depend on a curl with curl_ssl_* USE flags.
225 -# libcurl must not be using an ssl backend we do not support.
226 -# If the libcurl ssl backend changes pycurl should be recompiled.
227 -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
228 -# does not need to initialize gcrypt threading and we do not need to
229 -# explicitly link to libgcrypt.
230 -RDEPEND="
231 - >=net-misc/curl-7.25.0-r1[ssl=]
232 - ssl? (
233 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
234 - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
235 - )"
236 -
237 -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
238 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
239 -DEPEND="${RDEPEND}
240 - test? (
241 - dev-python/nose[${PYTHON_USEDEP}]
242 - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
243 - )"
244 -# Needed for individual runs of testsuite by python impls.
245 -DISTUTILS_IN_SOURCE_BUILD=1
246 -
247 -PATCHES=(
248 - "${FILESDIR}"/${P}-py3.5-backport.patch
249 -)
250 -
251 -python_prepare_all() {
252 - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
253 - distutils-r1_python_prepare_all
254 -}
255 -
256 -python_configure_all() {
257 - # Override faulty detection in setup.py, bug 510974.
258 - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
259 -}
260 -
261 -python_compile() {
262 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
263 - distutils-r1_python_compile
264 -}
265 -
266 -python_test() {
267 - # Python3.5 test problems
268 - # https://github.com/pycurl/pycurl/issues/273
269 - # https://github.com/pycurl/pycurl/issues/274
270 - emake -j1 do-test
271 -}
272 -
273 -python_install_all() {
274 - local HTML_DOCS=( doc/. )
275 - use examples && local EXAMPLES=( examples/. )
276 - distutils-r1_python_install_all
277 -}
278
279 diff --git a/dev-python/pycurl/pycurl-7.19.5.1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1.ebuild
280 deleted file mode 100644
281 index e1c2ed0..00000000
282 --- a/dev-python/pycurl/pycurl-7.19.5.1.ebuild
283 +++ /dev/null
284 @@ -1,64 +0,0 @@
285 -# Copyright 1999-2017 Gentoo Foundation
286 -# Distributed under the terms of the GNU General Public License v2
287 -# $Id$
288 -EAPI=5
289 -
290 -# The selftests fail with pypy, and urlgrabber segfaults for me.
291 -PYTHON_COMPAT=( python2_7 python3_4 )
292 -
293 -inherit distutils-r1
294 -
295 -DESCRIPTION="python binding for curl/libcurl"
296 -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
297 -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
298 -
299 -LICENSE="LGPL-2.1"
300 -SLOT="0"
301 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
302 -IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
303 -
304 -# Depend on a curl with curl_ssl_* USE flags.
305 -# libcurl must not be using an ssl backend we do not support.
306 -# If the libcurl ssl backend changes pycurl should be recompiled.
307 -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
308 -# does not need to initialize gcrypt threading and we do not need to
309 -# explicitly link to libgcrypt.
310 -RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
311 - ssl? (
312 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
313 - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
314 -
315 -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
316 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
317 -DEPEND="${RDEPEND}
318 - test? (
319 - dev-python/nose[${PYTHON_USEDEP}]
320 - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
321 - )"
322 -# Needed for individual runs of testsuite by python impls.
323 -DISTUTILS_IN_SOURCE_BUILD=1
324 -
325 -python_prepare_all() {
326 - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
327 - distutils-r1_python_prepare_all
328 -}
329 -
330 -python_configure_all() {
331 - # Override faulty detection in setup.py, bug 510974.
332 - export PYCURL_SSL_LIBRARY=${CURL_SSL}
333 -}
334 -
335 -python_compile() {
336 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
337 - distutils-r1_python_compile
338 -}
339 -
340 -python_test() {
341 - emake -j1 do-test
342 -}
343 -
344 -python_install_all() {
345 - local HTML_DOCS=( doc/. )
346 - use examples && local EXAMPLES=( examples/. )
347 - distutils-r1_python_install_all
348 -}
349
350 diff --git a/dev-python/pycurl/pycurl-7.19.5.3.ebuild b/dev-python/pycurl/pycurl-7.19.5.3.ebuild
351 deleted file mode 100644
352 index 8889d08..00000000
353 --- a/dev-python/pycurl/pycurl-7.19.5.3.ebuild
354 +++ /dev/null
355 @@ -1,71 +0,0 @@
356 -# Copyright 1999-2017 Gentoo Foundation
357 -# Distributed under the terms of the GNU General Public License v2
358 -# $Id$
359 -
360 -EAPI=5
361 -
362 -# The selftests fail with pypy, and urlgrabber segfaults for me.
363 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
364 -
365 -inherit distutils-r1
366 -
367 -DESCRIPTION="python binding for curl/libcurl"
368 -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
369 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
370 -
371 -LICENSE="LGPL-2.1"
372 -SLOT="0"
373 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
374 -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
375 -
376 -# Depend on a curl with curl_ssl_* USE flags.
377 -# libcurl must not be using an ssl backend we do not support.
378 -# If the libcurl ssl backend changes pycurl should be recompiled.
379 -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
380 -# does not need to initialize gcrypt threading and we do not need to
381 -# explicitly link to libgcrypt.
382 -RDEPEND="
383 - >=net-misc/curl-7.25.0-r1[ssl=]
384 - ssl? (
385 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
386 - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
387 - )"
388 -
389 -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
390 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
391 -DEPEND="${RDEPEND}
392 - test? (
393 - dev-python/bottle[${PYTHON_USEDEP}]
394 - dev-python/flaky[${PYTHON_USEDEP}]
395 - dev-python/nose[${PYTHON_USEDEP}]
396 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos]
397 - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
398 - )"
399 -# Needed for individual runs of testsuite by python impls.
400 -DISTUTILS_IN_SOURCE_BUILD=1
401 -
402 -python_prepare_all() {
403 - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
404 - sed -e '/pyflakes/d' -i Makefile || die
405 - distutils-r1_python_prepare_all
406 -}
407 -
408 -python_configure_all() {
409 - # Override faulty detection in setup.py, bug 510974.
410 - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
411 -}
412 -
413 -python_compile() {
414 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
415 - distutils-r1_python_compile
416 -}
417 -
418 -python_test() {
419 - emake -j1 do-test
420 -}
421 -
422 -python_install_all() {
423 - local HTML_DOCS=( doc/. )
424 - use examples && local EXAMPLES=( examples/. )
425 - distutils-r1_python_install_all
426 -}
427
428 diff --git a/dev-python/pycurl/pycurl-7.21.5.ebuild b/dev-python/pycurl/pycurl-7.21.5.ebuild
429 deleted file mode 100644
430 index 8889d08..00000000
431 --- a/dev-python/pycurl/pycurl-7.21.5.ebuild
432 +++ /dev/null
433 @@ -1,71 +0,0 @@
434 -# Copyright 1999-2017 Gentoo Foundation
435 -# Distributed under the terms of the GNU General Public License v2
436 -# $Id$
437 -
438 -EAPI=5
439 -
440 -# The selftests fail with pypy, and urlgrabber segfaults for me.
441 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
442 -
443 -inherit distutils-r1
444 -
445 -DESCRIPTION="python binding for curl/libcurl"
446 -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
447 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
448 -
449 -LICENSE="LGPL-2.1"
450 -SLOT="0"
451 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
452 -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
453 -
454 -# Depend on a curl with curl_ssl_* USE flags.
455 -# libcurl must not be using an ssl backend we do not support.
456 -# If the libcurl ssl backend changes pycurl should be recompiled.
457 -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
458 -# does not need to initialize gcrypt threading and we do not need to
459 -# explicitly link to libgcrypt.
460 -RDEPEND="
461 - >=net-misc/curl-7.25.0-r1[ssl=]
462 - ssl? (
463 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
464 - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
465 - )"
466 -
467 -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
468 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
469 -DEPEND="${RDEPEND}
470 - test? (
471 - dev-python/bottle[${PYTHON_USEDEP}]
472 - dev-python/flaky[${PYTHON_USEDEP}]
473 - dev-python/nose[${PYTHON_USEDEP}]
474 - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos]
475 - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
476 - )"
477 -# Needed for individual runs of testsuite by python impls.
478 -DISTUTILS_IN_SOURCE_BUILD=1
479 -
480 -python_prepare_all() {
481 - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
482 - sed -e '/pyflakes/d' -i Makefile || die
483 - distutils-r1_python_prepare_all
484 -}
485 -
486 -python_configure_all() {
487 - # Override faulty detection in setup.py, bug 510974.
488 - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
489 -}
490 -
491 -python_compile() {
492 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
493 - distutils-r1_python_compile
494 -}
495 -
496 -python_test() {
497 - emake -j1 do-test
498 -}
499 -
500 -python_install_all() {
501 - local HTML_DOCS=( doc/. )
502 - use examples && local EXAMPLES=( examples/. )
503 - distutils-r1_python_install_all
504 -}