Clean up IUSE and tighten curl USE dependencies further, thanks to comments from Arfrever.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 17 insertions, 12 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/Manifest b/dev-python/pycurl/Manifest
index f0dc8b9f3952..eb45dd9a49f4 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX pycurl-7.19.0-linking-v2.patch 2009 RMD160 f771a88ca50d9315766e7963b7ecc63d0ca22a2d SHA1 f6aa14ae39b470aa7bbfa38a995d7290467bfdf4 SHA256 bd4b98144b9bc6ef8a5b8a328ef71b2aa236af3115a2cb3f252036e84a5c4081
 AUX pycurl-7.19.0-linking.patch 871 RMD160 8664b7beb96354153b1a5a048845f9d02c5c3489 SHA1 95faf82b73d87ca168e7cdfc5472cafcedda32dd SHA256 7f6dfe49f7147d85e3ac53b3192b7514197fa0ac8e1c763c803ff94d5fc921be
 DIST pycurl-7.19.0.tar.gz 71346 RMD160 dab547b3db67ed30cafb556a1a383f567064de49 SHA1 3fb59eca1461331bb9e9e8d6fe3b23eda961a416 SHA256 eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642
-EBUILD pycurl-7.19.0-r1.ebuild 1989 RMD160 0a04b2f6641fb8cb70362136b6f68e96abf6768d SHA1 ad16488c61992d69434e66f8220a5a20c42e0a42 SHA256 e8b86ef254f0943fc1643de754425c56b6b7feb274bbb24de8f723814d5db872
+EBUILD pycurl-7.19.0-r1.ebuild 1918 RMD160 77f5ac3dc964e7c546494d787bf374310fe314ef SHA1 e671ef1ba67057d7800871f0adeef19aec985d1e SHA256 b73eeb1da226e4c447b9e733d1eed085200a467b5a131ff0d7ac5a87fbb2b7c8
 EBUILD pycurl-7.19.0.ebuild 1294 RMD160 28e3acddf6890e4a0a8c503f756bce59d676577d SHA1 c69f117528790a85c747534cbcf512bf5d8c3184 SHA256 56309f8ad5c8bcfda86ff052970247c3140cffff6a906c59b7d9bcccc0e3c67f
-MISC ChangeLog 9758 RMD160 6e637e75850bf228629727238337a0f3aeb92f48 SHA1 2c12c247f9a45df6dcd92a66eea0e76fa4058360 SHA256 f04ab4a877f08255ca70c03e7b55ade08c6e8d0fb51d3dd6c24b0a6aee2c48c8
+MISC ChangeLog 9928 RMD160 793941150793b307026f4953ae1d4b18f660a433 SHA1 0ae717503a9bf2b9a3e411e8a552031a4166da5f SHA256 d0634ad3e752fd4b1db8b1b2903c40558b62b3de51b45faad4e625462c7f56e5
 MISC metadata.xml 826 RMD160 41f5a5d9c8ca00c1ec94fabccdc1a64df9a0adcb SHA1 88b4ce003ac375f0f56ee4386cc6a4d7d3cd5d89 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/Yd4YACgkQpnr2roL0g0nJ0QEAo4TfM1G8BMWUhS7XSU5i4lu/
-ab8y+x2kHLi3omCBhKkA/Av7qhX9uqgygbK7a93nYCo0XwK5gOt1pa20PAvQE+C3
-=cwzA
+iF4EAREIAAYFAk/aIHUACgkQpnr2roL0g0kTiQD6ArjePt6Lqh27CNtLTw/Kk66x
+iHKIQUmzufnW5Ca+zDcA/is0CAN8Ji1OFsGN477eejXShyXYa8enbW6tMeM6AT2I
+=D2X/
 -----END PGP SIGNATURE-----
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"