From cce03e158e09c10bcf87e41b0f9105bb78eaa25d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 4 Jul 2014 20:42:33 +0000 Subject: Revbump for curl_ssl change. (Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0BBEEA1FEA4843A4) --- dev-python/pycurl/ChangeLog | 9 +++- 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 ----------------------------- 5 files changed, 149 insertions(+), 142 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 (limited to 'dev-python/pycurl') 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/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