diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2012-06-14 17:33:31 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2012-06-14 17:33:31 +0000 |
| commit | f72cde04ffe64dacc955c8bb4ff4db24a43fdcdd (patch) | |
| tree | 2906b95bfaded6744f932106f847ce8391868d5d /dev-python/pycurl | |
| parent | initial commit (diff) | |
| download | gentoo-2-f72cde04ffe64dacc955c8bb4ff4db24a43fdcdd.tar.gz gentoo-2-f72cde04ffe64dacc955c8bb4ff4db24a43fdcdd.tar.bz2 gentoo-2-f72cde04ffe64dacc955c8bb4ff4db24a43fdcdd.zip | |
Clean up IUSE and tighten curl USE dependencies further, thanks to comments from Arfrever.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pycurl')
| -rw-r--r-- | dev-python/pycurl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pycurl/pycurl-7.19.0-r1.ebuild | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog index 5f4f9d109ea6..b61ac2a81f21 100644 --- a/dev-python/pycurl/ChangeLog +++ b/dev-python/pycurl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycurl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.70 2012/06/13 11:20:28 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.71 2012/06/14 17:33:31 marienz Exp $ + + 14 Jun 2012; Marien Zwart <marienz@gentoo.org> pycurl-7.19.0-r1.ebuild: + Clean up IUSE and tighten curl USE dependencies further, thanks to comments + from Arfrever. *pycurl-7.19.0-r1 (13 Jun 2012) diff --git a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild b/dev-python/pycurl/pycurl-7.19.0-r1.ebuild index 42c481545005..0583ae338e9c 100644 --- a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild +++ b/dev-python/pycurl/pycurl-7.19.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/06/13 11:20:28 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r1.ebuild,v 1.2 2012/06/14 17:33:31 marienz Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -17,9 +17,7 @@ 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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="examples" -# Copied from the curl ebuild. Keep in sync. -IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl" +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. @@ -27,8 +25,11 @@ IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ # 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[curl_ssl_gnutls=,curl_ssl_openssl=,curl_ssl_nss=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] - curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )" +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_MODNAME="curl" |