From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F295F139085 for ; Tue, 31 Jan 2017 10:19:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 323C321C028; Tue, 31 Jan 2017 10:19:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F395321C028 for ; Tue, 31 Jan 2017 10:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEACB3412CB for ; Tue, 31 Jan 2017 10:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B040B3BF4 for ; Tue, 31 Jan 2017 10:19:52 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1485857975.afeac9b0fb8bded5449791dd33952cd97ab836b8.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pycurl/Manifest dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild dev-python/pycurl/pycurl-7.19.5.1.ebuild dev-python/pycurl/pycurl-7.19.5.3.ebuild dev-python/pycurl/pycurl-7.21.5.ebuild X-VCS-Directories: dev-python/pycurl/files/ dev-python/pycurl/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: afeac9b0fb8bded5449791dd33952cd97ab836b8 X-VCS-Branch: master Date: Tue, 31 Jan 2017 10:19:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 944121eb-13fa-41ca-aa08-6001ad3403a8 X-Archives-Hash: 6bf0917f25ccee0a2a89fbbb3a9adafe commit: afeac9b0fb8bded5449791dd33952cd97ab836b8 Author: Patrice Clement gentoo org> AuthorDate: Tue Jan 31 10:19:35 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue Jan 31 10:19:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeac9b0 dev-python/pycurl: remove vulnerable versions. Gentoo-Bug: https://bugs.gentoo.org/564768 Package-Manager: portage-2.3.3 dev-python/pycurl/Manifest | 4 -- .../pycurl/files/pycurl-7.19.3.1-ssl-test.patch | 64 ------------------- .../files/pycurl-7.19.5.1-py3.5-backport.patch | 15 ----- dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild | 64 ------------------- dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild | 73 ---------------------- dev-python/pycurl/pycurl-7.19.5.1.ebuild | 64 ------------------- dev-python/pycurl/pycurl-7.19.5.3.ebuild | 71 --------------------- dev-python/pycurl/pycurl-7.21.5.ebuild | 71 --------------------- 8 files changed, 426 deletions(-) diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest index 2b337fa..0e24462 100644 --- a/dev-python/pycurl/Manifest +++ b/dev-python/pycurl/Manifest @@ -1,5 +1 @@ -DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296 -DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc -DIST pycurl-7.19.5.3.tar.gz 154800 SHA256 24f6c4016b1dd2a5e29d1b025ac2ad61f80c17adfdcf8a7f47aefab63ace78d7 SHA512 f7e65e0c6f7d1666ed3bebc4fabb41205f6dadd96d80fb5d1985c13ab28d35effef2966e961383e01881648fca4a4d500e9692d712888313dbe164b2c651530c WHIRLPOOL c5fe1cc232bae07dfc63e1a8a3b0929b3c1bbf7adf29c2b6085e5bc1e97656d6f5afc236974bfc3febdd2ab4fe1b7cce08c96d4a8eba5ba870505c7c423badeb -DIST pycurl-7.21.5.tar.gz 170962 SHA256 8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0 SHA512 0f07b9e2256e4e019bf0ac85d9ca2fff56cffd49986495f2235f91e341ed937c9895da1636548be90523404027d063d83910055899e178e653842bc5de4151c4 WHIRLPOOL 2e46b5e16181d3cc66be56b38d40f4b7fd2ff7b9574fc4214247140a43ce70c0eac71d793ceddd24ff05bf784a1e8105c315fa4a7b0460bd908901b159e6655d DIST pycurl-7.43.0.tar.gz 182522 SHA256 aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5 WHIRLPOOL 640ef7669273bccdf72f0d98bd5f5c9d882f35ac507d2152f8ab1e2e680298ebe2691b4960713bb39b0a405ba8d0e9a03d69617c5150bb65581efaab99304185 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 deleted file mode 100644 index c7e1580..00000000 --- a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://github.com/p-push/pycurl/commit/8644393bec56cd05c19d5dbe420ff741ba899d10 -diff --git a/tests/runwsgi.py b/tests/runwsgi.py -index f419d7c..242ef1d 100644 ---- a/tests/runwsgi.py -+++ b/tests/runwsgi.py -@@ -11,6 +11,10 @@ - - class Server(bottle.WSGIRefServer): - def run(self, handler): # pragma: no cover -+ self.srv = self.make_server(handler) -+ self.serve() -+ -+ def make_server(self, handler): - from wsgiref.simple_server import make_server, WSGIRequestHandler - if self.quiet: - base = self.options.get('handler_class', WSGIRequestHandler) -@@ -18,7 +22,10 @@ class QuietHandler(base): - def log_request(*args, **kw): - pass - self.options['handler_class'] = QuietHandler -- self.srv = make_server(self.host, self.port, handler, **self.options) -+ srv = make_server(self.host, self.port, handler, **self.options) -+ return srv -+ -+ def serve(self): - if sys.version_info[0] == 2 and sys.version_info[1] < 6: - # python 2.5 has no poll_interval - # and thus no way to stop the server -@@ -27,20 +34,21 @@ def log_request(*args, **kw): - else: - self.srv.serve_forever(poll_interval=0.1) - --class SslServer(bottle.CherryPyServer): -- def run(self, handler): -- import cherrypy.wsgiserver, cherrypy.wsgiserver.ssl_builtin -- server = cherrypy.wsgiserver.CherryPyWSGIServer((self.host, self.port), handler) -+# http://www.socouldanyone.com/2014/01/bottle-with-ssl.html -+# https://github.com/mfm24/miscpython/blob/master/bottle_ssl.py -+class SslServer(Server): -+ def run(self, handler): # pragma: no cover -+ self.srv = self.make_server(handler) -+ -+ import ssl - cert_dir = os.path.join(os.path.dirname(__file__), 'certs') -- ssl_adapter = cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter( -- os.path.join(cert_dir, 'server.crt'), -- os.path.join(cert_dir, 'server.key'), -- ) -- server.ssl_adapter = ssl_adapter -- try: -- server.start() -- finally: -- server.stop() -+ self.srv.socket = ssl.wrap_socket( -+ self.srv.socket, -+ keyfile=os.path.join(cert_dir, 'server.key'), -+ certfile=os.path.join(cert_dir, 'server.crt'), -+ server_side=True) -+ -+ self.serve() - - def start_bottle_server(app, port, server, **kwargs): - server_thread = ServerThread(app, port, server, kwargs) - 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 deleted file mode 100644 index 0bc6f6c..00000000 --- a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch +++ /dev/null @@ -1,15 +0,0 @@ - tests/memory_mgmt_test.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/memory_mgmt_test.py b/tests/memory_mgmt_test.py -index 08636ae..a7b8a21 100644 ---- a/tests/memory_mgmt_test.py -+++ b/tests/memory_mgmt_test.py -@@ -258,4 +258,6 @@ class MemoryMgmtTest(unittest.TestCase): - - gc.collect() - new_object_count = len(gc.get_objects()) -- self.assertEqual(new_object_count, object_count) -+ # it seems that GC sometimes collects something that existed -+ # before this test ran, GH issues #273/#274 -+ self.assertTrue(new_object_count in (object_count, object_count-1)) diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild deleted file mode 100644 index da04b60..00000000 --- a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test" - -# Depend on a curl with curl_ssl_* USE flags. -# libcurl must not be using an ssl backend we do not support. -# If the libcurl ssl backend changes pycurl should be recompiled. -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl -# does not need to initialize gcrypt threading and we do not need to -# explicitly link to libgcrypt. -RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=] - ssl? ( - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" - -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] )" -# Needed for individual runs of testsuite by python impls. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( "${FILESDIR}"/${P}-ssl-test.patch ) - -python_prepare_all() { - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - # Override faulty detection in setup.py, bug 510974. - export PYCURL_SSL_LIBRARY=${CURL_SSL} -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - emake test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild deleted file mode 100644 index 1ae172c..00000000 --- a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test" - -# Depend on a curl with curl_ssl_* USE flags. -# libcurl must not be using an ssl backend we do not support. -# If the libcurl ssl backend changes pycurl should be recompiled. -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl -# does not need to initialize gcrypt threading and we do not need to -# explicitly link to libgcrypt. -RDEPEND=" - >=net-misc/curl-7.25.0-r1[ssl=] - ssl? ( - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) - )" - -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] - )" -# Needed for individual runs of testsuite by python impls. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-py3.5-backport.patch -) - -python_prepare_all() { - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die - distutils-r1_python_prepare_all -} - -python_configure_all() { - # Override faulty detection in setup.py, bug 510974. - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl} -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - # Python3.5 test problems - # https://github.com/pycurl/pycurl/issues/273 - # https://github.com/pycurl/pycurl/issues/274 - emake -j1 do-test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pycurl/pycurl-7.19.5.1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1.ebuild deleted file mode 100644 index e1c2ed0..00000000 --- a/dev-python/pycurl/pycurl-7.19.5.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" -SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test" - -# Depend on a curl with curl_ssl_* USE flags. -# libcurl must not be using an ssl backend we do not support. -# If the libcurl ssl backend changes pycurl should be recompiled. -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl -# does not need to initialize gcrypt threading and we do not need to -# explicitly link to libgcrypt. -RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=] - ssl? ( - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" - -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] - )" -# Needed for individual runs of testsuite by python impls. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die - distutils-r1_python_prepare_all -} - -python_configure_all() { - # Override faulty detection in setup.py, bug 510974. - export PYCURL_SSL_LIBRARY=${CURL_SSL} -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - emake -j1 do-test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pycurl/pycurl-7.19.5.3.ebuild b/dev-python/pycurl/pycurl-7.19.5.3.ebuild deleted file mode 100644 index 8889d08..00000000 --- a/dev-python/pycurl/pycurl-7.19.5.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test" - -# Depend on a curl with curl_ssl_* USE flags. -# libcurl must not be using an ssl backend we do not support. -# If the libcurl ssl backend changes pycurl should be recompiled. -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl -# does not need to initialize gcrypt threading and we do not need to -# explicitly link to libgcrypt. -RDEPEND=" - >=net-misc/curl-7.25.0-r1[ssl=] - ssl? ( - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) - )" - -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 -DEPEND="${RDEPEND} - test? ( - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - 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] - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] - )" -# Needed for individual runs of testsuite by python impls. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die - sed -e '/pyflakes/d' -i Makefile || die - distutils-r1_python_prepare_all -} - -python_configure_all() { - # Override faulty detection in setup.py, bug 510974. - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl} -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - emake -j1 do-test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pycurl/pycurl-7.21.5.ebuild b/dev-python/pycurl/pycurl-7.21.5.ebuild deleted file mode 100644 index 8889d08..00000000 --- a/dev-python/pycurl/pycurl-7.21.5.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -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" -IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test" - -# Depend on a curl with curl_ssl_* USE flags. -# libcurl must not be using an ssl backend we do not support. -# If the libcurl ssl backend changes pycurl should be recompiled. -# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl -# does not need to initialize gcrypt threading and we do not need to -# explicitly link to libgcrypt. -RDEPEND=" - >=net-misc/curl-7.25.0-r1[ssl=] - ssl? ( - net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) - )" - -# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 -# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 -DEPEND="${RDEPEND} - test? ( - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - 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] - >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] - )" -# Needed for individual runs of testsuite by python impls. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die - sed -e '/pyflakes/d' -i Makefile || die - distutils-r1_python_prepare_all -} - -python_configure_all() { - # Override faulty detection in setup.py, bug 510974. - export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl} -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - emake -j1 do-test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -}