From cd5c4cc9b8e26a2e8b49750818db40753a5b2fd6 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 4 Jul 2014 20:42:35 +0000 Subject: Revbump for curl_ssl change. Package-Manager: portage-2.2.10/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- dev-python/pycurl/ChangeLog | 9 +++- dev-python/pycurl/Manifest | 14 +++--- dev-python/pycurl/pycurl-7.19.0-r3.ebuild | 68 --------------------------- dev-python/pycurl/pycurl-7.19.0-r4.ebuild | 68 +++++++++++++++++++++++++++ dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild | 73 +++++++++++++++++++++++++++++ dev-python/pycurl/pycurl-7.19.3.1.ebuild | 73 ----------------------------- 6 files changed, 156 insertions(+), 149 deletions(-) delete mode 100644 dev-python/pycurl/pycurl-7.19.0-r3.ebuild create mode 100644 dev-python/pycurl/pycurl-7.19.0-r4.ebuild create mode 100644 dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild delete mode 100644 dev-python/pycurl/pycurl-7.19.3.1.ebuild diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog index bc05b7216a6c..b5f34b8d7f39 100644 --- a/dev-python/pycurl/ChangeLog +++ b/dev-python/pycurl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pycurl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.97 2014/06/28 18:04:59 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.98 2014/07/04 20:42:33 floppym Exp $ + +*pycurl-7.19.0-r4 (04 Jul 2014) +*pycurl-7.19.3.1-r1 (04 Jul 2014) + + 04 Jul 2014; Mike Gilbert +pycurl-7.19.0-r4.ebuild, + +pycurl-7.19.3.1-r1.ebuild, -pycurl-7.19.0-r3.ebuild, -pycurl-7.19.3.1.ebuild: + Revbump for curl_ssl change. 28 Jun 2014; Jeroen Roovers pycurl-7.19.3.1.ebuild: Marked ~hppa (bug #515610). diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest index 330c2eee3fc1..65ce39bece31 100644 --- a/dev-python/pycurl/Manifest +++ b/dev-python/pycurl/Manifest @@ -9,15 +9,15 @@ DIST pycurl-7.19.0.tar.gz 71346 SHA256 eb782dfcc5a7c023539a077462b83c167e178128e DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296 EBUILD pycurl-7.19.0-r1.ebuild 1939 SHA256 7c4147a478a76e69d1297b76f2cfe66cd698b6b1446a4d5425759c29e49e239f SHA512 985cb7878408b1bae77392276f02af2305c9b9016ff894df36003e2b1b843a99fc150e227d9b780da80c4ff40f41f15353131236d7d4aa0bd2361a5a09686da6 WHIRLPOOL b3030b69ff60fe6997b6cd32a435f05aa99630012e04064daa0b714ad087e0f37919ad22608cfdf09c2106e3f74761305790931f5d95bafec279a0d015051b42 EBUILD pycurl-7.19.0-r2.ebuild 1850 SHA256 f356ea2232ce14207daf19f6133411cb699e08aeac1b94122ef71d26ad5b6548 SHA512 a2a99f1a42f5ed1cf2da7cd4fe210c2a4277b144d87b72ff2e5cf41a796cd5669d23ca91eb2d3d6ea856af7c7fa1b0edff4bf09e595a8183752529ba014d9a58 WHIRLPOOL d7407a54d7cc034973348d3623d70fcb0e71c404112a90d39a1a450e2b6c2d6c80f67bd5993b0d6b620240babb37e1dead2b57d9f42881caff9b9289218474c1 -EBUILD pycurl-7.19.0-r3.ebuild 2121 SHA256 83e3de57464680326a0efcf2cc906badae8e653f54b6c6c992eb2e93f9f5007b SHA512 b6e851a88ff7cefb410d61bf08c57581b61487c667f2029649e16c447ab0d6a1b9c533106888bab419c8192ac04e51f124f89344249f335c6606fd046050aaad WHIRLPOOL 934b96cfe35b78eb32b2623b0ce58758022574e385447c7602fa019f28ffeb595b33ea9e083676809b549987e529f36aa3010060152f7089b583d2fbcf7e92db +EBUILD pycurl-7.19.0-r4.ebuild 2121 SHA256 dd1ad66d3931e769ec932b511a8d9ec2def5ecded5e97ab142f1dcee3d7b6cdb SHA512 aa319ddb75383cc81ee458e8c3761b12e452119eeaedc84b4b5119ea409f6bf5ae5f98a1ab6e56c686225595228de976a5a289bbed817cd60d5ad51ba3b17c82 WHIRLPOOL 5a1c9f8e55da570de5edf0d2dde60865b9d1c4e144b1937a272ed7f1263a9b90fa7805ff0cf34dbfbb35517583bd1a68e5b681e11f5a7f78c7bb738685992b39 EBUILD pycurl-7.19.0.ebuild 1294 SHA256 56309f8ad5c8bcfda86ff052970247c3140cffff6a906c59b7d9bcccc0e3c67f SHA512 a8e491accef2beb38faf8a8a16cb6f3a9be235b1d4e151e2ef51c38916e46018275752ce412ad269721f46c3bb629e19faf1a954dcbc79b8590587ca72d9a429 WHIRLPOOL 14337dd68f25be650bd77a8828af747268ab0e5b08719607b26692afc7ea866333b52a2a88804d438310f06a9025b43e51da8b87aa5642fa307c562ab7260288 -EBUILD pycurl-7.19.3.1.ebuild 2418 SHA256 69dc63c44dd9dbb39f7f384d79f3aca1d0008b0c1f9e437e497039f8211d06a7 SHA512 4a5c006ca142e4a7ff7322f91105948386257506fcb45a344e07df4a23f460a2be501af746a7166dbc0287e17e5ff6160d604e80b2f2d49c5fcfc6d549e59b8d WHIRLPOOL 558a455001844d44a6ffb20510d56e118c1d1fe91db3b26ea6b2f6af21a6b3de46e936edf59dd1026b446bc4cf3db82d657d53d030d8da0cdee3b0c61a20a64d -MISC ChangeLog 13451 SHA256 1fcbe4c8ebcb214a044dea1c98f7e1577508025cdaac55f620c6b35b43c8dd0c SHA512 ad11b5d44d0487855c2fab1dfa0266a5ebd63e3b965c995966a1faf42182e4bd3a16fda28b763722adf4603bf0a2e355cba62bf44910cb2f73b1de3cf1ebc994 WHIRLPOOL 541fe19a70a64b06f9c8cbb5d1f8e9ba4556fd47755394c3b7a24dfcf9fce8e4affaee216ff831697db7c9ebd18f226a523bfd915165b54d8460c52be0772ae6 +EBUILD pycurl-7.19.3.1-r1.ebuild 2425 SHA256 0b3552efc8c8fd2c49b462f9b3bc72627671615339d0ea6bb9d0ea4494976699 SHA512 0f960e32a63ebd375f5521e6c884d4e94a1b5c6c1f1b3788e7f2146c70234c51884f5daaa838fe218db33c2ad27ae2fc97683793c34497d36ef4fa5731495ed4 WHIRLPOOL cc729ec7ca61f9f424bea9d51209a8730875b2250ac6e3283dbcc95991a800dc4bc4bdcc1ff29dce7f6ea182566e8a7727e9e07d29d47074d84df690f7bd3966 +MISC ChangeLog 13710 SHA256 888b2dca7021f14335dfd0bad2c13f6cd8362d58d63d9938c227e2e15693728f SHA512 f09c506f9ffba7cbcc84789ef9a3d0c221b5bfcc84ea147a75e268d80f289e4844b3216b0dc4586a050b134ff8b5490976cfb3ee0c7e62e12917c4bff23aa883 WHIRLPOOL 40a45d5e9ae60299208a45ae781492f73e2fb55e1dfb77cefd680af86569193ef75fc09270334c3dbbda577bd8ff25982fc0bb3ff25238d66843a442e49ed465 MISC metadata.xml 826 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad SHA512 cd860d6a4151ac15bb7d9c355d0222f91b429993d56083670f3325ecde4f4fda8f4bf374aba3b1c65270a786e12c30c0344917fd04b608ebdc0c94b392279e61 WHIRLPOOL 397cf201be522437cc691b94d0aee887c8678b73e4533938edbbd1774c0a26907585b18584b39ce83e2868c6d896445c3dc940c2a2abf061ecb703ddbd35ca72 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlOvA8wACgkQVWmRsqeSphOFhQCfe7OmzBCq82VX3hZPmKhFccxN -Sb0An2/ZxjqF6lRSpq67HamvJSMbuJfD -=auuZ +iF4EAREIAAYFAlO3EboACgkQC77qH+pIQ6TZUQEAs2AVU0KKb5Lsn9mNPLbfAyub +fu5l7Ygn1zx8hbhtTMABAI8KRiJMS/PVJ9MVFC0OoKT6Pqp7LSECjRpP91aS6oc5 +=H5gI -----END PGP SIGNATURE----- diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild deleted file mode 100644 index 5d33374fe71b..000000000000 --- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.14 2014/06/15 15:22:12 mgorny Exp $ - -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="http://pycurl.sourceforge.net/ http://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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" - -# 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. -DEPEND=">=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 ) - )" -RDEPEND="${DEPEND}" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${P}-linking-v2.patch" - "${FILESDIR}/${P}-python3.patch" - ) - - sed -e "/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() { - "${PYTHON}" tests/test_internals.py -q || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/pycurl/pycurl-7.19.0-r4.ebuild b/dev-python/pycurl/pycurl-7.19.0-r4.ebuild new file mode 100644 index 000000000000..f97b80a73036 --- /dev/null +++ b/dev-python/pycurl/pycurl-7.19.0-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r4.ebuild,v 1.1 2014/07/04 20:42:33 floppym Exp $ + +EAPI=5 + +# The selftests fail with pypy, and urlgrabber segfaults for me. +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) + +inherit distutils-r1 + +DESCRIPTION="python binding for curl/libcurl" +HOMEPAGE="http://pycurl.sourceforge.net/ http://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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" + +# 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. +DEPEND=">=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 ) + )" +RDEPEND="${DEPEND}" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/${P}-linking-v2.patch" + "${FILESDIR}/${P}-python3.patch" + ) + + sed -e "/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() { + "${PYTHON}" tests/test_internals.py -q || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local HTML_DOCS=( doc/. ) + + distutils-r1_python_install_all + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild new file mode 100644 index 000000000000..0807304fc30d --- /dev/null +++ b/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild,v 1.1 2014/07/04 20:42:33 floppym Exp $ +EAPI=5 + +# The selftests fail with pypy, and urlgrabber segfaults for me. +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="python binding for curl/libcurl" +HOMEPAGE="https://github.com/pycurl/pycurl http://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-interix ~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 ) )" +DEPEND="${RDEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/bottle[${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 "/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 +} + +src_test() { + # suite shatters without this + local DISTUTILS_NO_PARALLEL_BUILD=1 + distutils-r1_src_test +} + +python_test() { + # https://github.com/pycurl/pycurl/issues/180 + if [[ "${EPYTHON}" == python3.4 ]]; then + sed -e 's:test_post_buffer:_&:' \ + -e 's:test_post_file:_&:' \ + -i tests/post_test.py || die + fi + 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.3.1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1.ebuild deleted file mode 100644 index 387f3a602bae..000000000000 --- a/dev-python/pycurl/pycurl-7.19.3.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.6 2014/06/28 18:04:59 jer Exp $ -EAPI=5 - -# The selftests fail with pypy, and urlgrabber segfaults for me. -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="python binding for curl/libcurl" -HOMEPAGE="https://github.com/pycurl/pycurl http://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-interix ~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 ) )" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] - dev-python/bottle[${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 "/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 -} - -src_test() { - # suite shatters without this - local DISTUTILS_NO_PARALLEL_BUILD=1 - distutils-r1_src_test -} - -python_test() { - # https://github.com/pycurl/pycurl/issues/180 - if [[ "${EPYTHON}" == python3.4 ]]; then - sed -e 's:test_post_buffer:_&:' \ - -e 's:test_post_file:_&:' \ - -i tests/post_test.py || die - fi - emake test -} - -python_install_all() { - local HTML_DOCS=( doc/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} -- cgit v1.2.3-65-gdbad