Prefer openssl over nss

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

3 files changed, 22 insertions, 27 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 22ecf163c3bb..28dcf3d71590 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.192 2011/09/17 08:55:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.193 2011/11/14 17:10:55 angelos Exp $
+
+  14 Nov 2011; Christoph Mende <angelos@gentoo.org> curl-7.22.0.ebuild:
+  Prefer openssl over nss
 
 *curl-7.22.0 (17 Sep 2011)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 44caa07732b3..c3a6a81d7baf 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -18,15 +18,13 @@ EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 S
 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
 EBUILD curl-7.21.7-r2.ebuild 3716 RMD160 a3ef5e30a134b232bca6c9b273283fefef076f95 SHA1 196de6831df4b1065f0bda045a46cdddafa8c00b SHA256 27d0c8d72c7c13fcf1f9d0a40b5962e9e48cd9296140520c92b6326ac41109c0
 EBUILD curl-7.21.7.ebuild 3537 RMD160 d18c4326bd7b53625019add90b6e68cb03871442 SHA1 9d95054e41000a5d042e3df2dd7018367e696d09 SHA256 2fce4d8718548f70f1c7328cf922d31e038bfa7e68a3cec3cbc7046d6db10603
-EBUILD curl-7.22.0.ebuild 3663 RMD160 b24a22d183d99107ab732a6188b9d012cef7c8fa SHA1 125a26a785715d2c20ce7d70577956a22b079b51 SHA256 242bb8aa8c224d23969ddb2098c51083cdab6707314e41480aab20baeb428034
-MISC ChangeLog 32182 RMD160 1857a6b79306415d956f4433fa01778868544e7c SHA1 3b593b7ec99225a966a3d762de0bf80543d9f9a7 SHA256 381cc2735665ad8d43c144bfdd0905c6ffaddfcc437a2e8d695aefc15d305da2
+EBUILD curl-7.22.0.ebuild 3608 RMD160 5e7890f20ef35b492a6f1ddd6d96734a21d78830 SHA1 4507f96241275e6fa87121b0323d7b25a5e0d296 SHA256 95933208c4c0d1814310ae5521ffe827a58f012191c49cef512faa034eb80c59
+MISC ChangeLog 32281 RMD160 bcc73ef711373fc51948266c3fbe8fe0c0af9be6 SHA1 c83a0bd8a8c212c974a3da3b0219c8c5bcfc8603 SHA256 182fc99697ef3e7a0519118f6d8676fe9639ef1fe7cfe64d22f6d8fe7ef1979f
 MISC metadata.xml 638 RMD160 6e685dbc2c33ff964b46795a7083b45d03c6ba4d SHA1 eec3433434ad3574c097b24b51eb58f4ecb2bbad SHA256 3d7a27dacbea52f5aa76206ccdc7926bddcd3c0eb1751a881cb8aec332b5f7d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRIACgkQfXuS5UK5QB30DwP+PC9BpadY4m6VQZ1R7z9TLopj
-oHFsUuXMDAWERTzHEQMSc7nTGLEtUyENICUmCBy9jtr1y/nrUw4+7HJsWBPBk9qA
-dMoNUeCUSDuLsCOfZAGppnDe7+HOuO4g1KJYX8Zg6FaM127faBb92rN0EdyLD/tP
-a6mwE9EX4kQ05aqDY0Y=
-=U4Do
+iF4EAREIAAYFAk7BS6MACgkQmWq1bYTyC0OSbQEAxhqO66I8rtSZaOHcu6xUYa7Y
+VH/jIuIoWUa7cqwuJsAA/jJiSG3BILr4VJkzx+vTufsneQ0C9WSgdJia3YKqU7HD
+=we0H
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.22.0.ebuild b/net-misc/curl/curl-7.22.0.ebuild
index 618293dc07fb..4a3666b53c9a 100644
--- a/net-misc/curl/curl-7.22.0.ebuild
+++ b/net-misc/curl/curl-7.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.1 2011/09/17 08:55:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.2 2011/11/14 17:10:55 angelos Exp $
 
 EAPI=4
 
@@ -16,11 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
 
 RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
+	ssl? ( !gnutls? ( dev-libs/openssl ) )
+	nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
 	idn? ( net-dns/libidn )
 	ares? ( >=net-dns/c-ares-1.6 )
 	kerberos? ( virtual/krb5 )
@@ -41,8 +39,6 @@ DEPEND="${RDEPEND}
 # ares must be disabled for threads and both can be disabled
 # one can use wether gnutls or nss if ssl is enabled
 REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl )
-	nss? ( ssl )
 	nss? ( !gnutls )"
 
 src_prepare() {
@@ -86,17 +82,15 @@ src_configure() {
 		--without-librtmp
 		--without-spnego"
 
-	if use ssl ; then
-		if use gnutls; then
-			myconf+=" --without-ssl --with-gnutls --without-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		elif use nss; then
-			myconf+=" --without-ssl --without-gnutls --with-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		else
-			myconf+=" --without-gnutls --without-nss --with-ssl"
-			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-		fi
+	if use gnutls; then
+		myconf+=" --without-ssl --with-gnutls --without-nss"
+		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+	elif use ssl; then
+		myconf+=" --without-gnutls --without-nss --with-ssl"
+		myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+	elif use nss; then
+		myconf+=" --without-ssl --without-gnutls --with-nss"
+		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
 	else
 		myconf+=" --without-gnutls --without-nss --without-ssl"
 	fi