Block USE=gnutls with USE=nss (bug #379541) and fix CFLAGS patch (bug #379533)

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

4 files changed, 31 insertions, 10 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 8fe78fd7e769..1acda299f345 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.190 2011/07/23 11:43:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.191 2011/08/21 15:40:07 angelos Exp $
+
+  21 Aug 2011; Christoph Mende <angelos@gentoo.org>
+  +files/curl-respect-cflags-3.patch, curl-7.21.7-r2.ebuild:
+  Block USE=gnutls with USE=nss (bug #379541) and fix CFLAGS patch (bug
+  #379533)
 
   23 Jul 2011; Christoph Mende <angelos@gentoo.org> curl-7.21.7.ebuild,
   curl-7.21.7-r2.ebuild, +files/curl-7.21.7-examples-fix-headers.patch:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ad2a72b34749..b047d244a9f4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,6 +7,7 @@ AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c47
 AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
 AUX curl-7.21.7-examples-fix-headers.patch 3128 RMD160 a6e52e484b642eeb738fca0b4f35734b9d13962d SHA1 81fb6b957b5c454014f5b5515d5c9b3269ab44df SHA256 8d720b98dc318008f3365139f2925de289f04ee75d61157d6d014766e1f90b0a
 AUX curl-respect-cflags-2.patch 1174 RMD160 8d613e222baae7dee7207931025f5389c529eec1 SHA1 0bcdaf3c5081e7b3196fae9dbd123ed5e09b8439 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe
+AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d
 AUX curl-respect-cflags.patch 8180 RMD160 027b43d8fe11b5635af8473a4236cd483f6dadee SHA1 72d4829a2eac9b7f33343140ae0104fa3c796496 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665
 AUX curlbuild.h.ed 219 RMD160 745d3b5cb3613eab1b828fa5fcbee00b27856b86 SHA1 c8f9534498e265651494270d34fb349068d126c3 SHA256 eb97ca2aa14dfe905902a9a126f5fd2b01473087c642bc48a61fcdaa0f437833
 DIST curl-7.21.4.tar.bz2 2256354 RMD160 c18710206d30a0f1078b2156df25ded30443f7cf SHA1 9cc59be07932b63e1f7d714c56ffaaa92af55373 SHA256 d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
@@ -14,14 +15,14 @@ DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17
 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a
 EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6
 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
-EBUILD curl-7.21.7-r2.ebuild 3698 RMD160 d1166775f31221e7e78fb8e66623268c687c95d3 SHA1 b5a73df3c17f70259a6c211bea37b608af9d902c SHA256 6ae736ff6dd8ffe80bd9e7280cce79bcc3b05ecaa0f8852c8ec0b7588889fc24
+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
-MISC ChangeLog 31868 RMD160 de9497a6083f5b75953472e20d98b62f79ebc0d0 SHA1 cf012fc626e0bb2e6901906665fc3e2b1c8678a9 SHA256 8438bc1eec3cede50c819d8f7b7b47906f3e2e845db20ec9803e7f88561d220d
+MISC ChangeLog 32065 RMD160 619456a1e2fd9a02ee0a76dfaf0666d0734f0f74 SHA1 12f18548ff49543d24ac28a2a94e8a98ac2114d7 SHA256 66096d7010d62978c59278581bebae1f8bd986d9f7cf860a3e87d1154997f279
 MISC metadata.xml 661 RMD160 01583b468ecdaef206cc2ed15da0a481e2f3b9c8 SHA1 2a3b2ebdc360ba87a1926b18f1ff3be5257565db SHA256 17dc3be94df3140e158ce615047e02a8604286c74bf33f62fe1aabd33c4a1890
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4qs/AACgkQmWq1bYTyC0P7lAD/boHCvS3EoCL6UpgSX9pL/msC
-DEbR9w/IFtb1WsdmCz4A+QH6zwg3Ce0hlWLE2UHNYXxDdrvDXoA3kUrbESDeH4fb
-=iHWY
+iF4EAREIAAYFAk5RJtkACgkQmWq1bYTyC0N/RgD/aPmPvm80+IfUe3UnmC8kTJXO
++p8Ts6bvcsa7dTDI1u8A/RzUWSEq9x4Se3rB+QkwsNgn6ubGOqtINvWuhoF0hpXZ
+=SKBj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.7-r2.ebuild b/net-misc/curl/curl-7.21.7-r2.ebuild
index 801ab70fc06c..a5997d87ccbd 100644
--- a/net-misc/curl/curl-7.21.7-r2.ebuild
+++ b/net-misc/curl/curl-7.21.7-r2.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.21.7-r2.ebuild,v 1.2 2011/07/23 11:43:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.3 2011/08/21 15:40:07 angelos Exp $
 
 EAPI=4
 
@@ -42,13 +42,14 @@ DEPEND="${RDEPEND}
 # one can use wether gnutls or nss if ssl is enabled
 REQUIRED_USE="threads? ( !ares )
 	gnutls? ( ssl )
-	nss? ( ssl )"
+	nss? ( ssl )
+	nss? ( !gnutls )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
 		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
 		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-2.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
 		"${FILESDIR}"/${P}-examples-fix-headers.patch
 
 	eprefixify curl-config.in
diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch
new file mode 100644
index 000000000000..4a4a614ee49a
--- /dev/null
+++ b/net-misc/curl/files/curl-respect-cflags-3.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index e9b49c7..e374ab6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,9 +280,6 @@ dnl **********************************************************************
+ 
+ CURL_CHECK_COMPILER
+ CURL_SET_COMPILER_BASIC_OPTS
+-CURL_SET_COMPILER_DEBUG_OPTS
+-CURL_SET_COMPILER_OPTIMIZE_OPTS
+-CURL_SET_COMPILER_WARNING_OPTS
+ 
+ if test "$compiler_id" = "INTEL_UNIX_C"; then
+   #