Add defaults on CURL_SSL flags to support net-misc/curl with cyassl removed.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

6 files changed, 36 insertions, 20 deletions

diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index 6b89b1df8ed1..dd13f6d02df6 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.94 2014/05/28 15:20:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.95 2014/06/15 15:22:12 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org> pycurl-7.19.0-r1.ebuild,
+  pycurl-7.19.0-r2.ebuild, pycurl-7.19.0-r3.ebuild, pycurl-7.19.3.1.ebuild:
+  Add defaults on CURL_SSL flags to support net-misc/curl with cyassl removed.
 
   28 May 2014; Mike Gilbert <floppym@gentoo.org> pycurl-7.19.0-r3.ebuild,
   pycurl-7.19.3.1.ebuild:
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 33ef4f3e2c41..10e8b68d5629 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -6,17 +6,29 @@ AUX pycurl-7.19.0-linking.patch 871 SHA256 7f6dfe49f7147d85e3ac53b3192b7514197fa
 AUX pycurl-7.19.0-python3.patch 40859 SHA256 9050a00ea37846f803c7e6420670c54056b375fe9a14c2f0f345e5c23b8a2655 SHA512 4b9c348891a9aff4e96a66411d8433b1eeee847ba851ef78647f1365cacf1b356ea107ee5807fb39bcba3f5c14a274fd1d8814d18553fd01bc45147ba7c45d86 WHIRLPOOL fc10dd401f26bfcb61f83382e94fb59ba269e05a9ca081a89008f09b90ccbd521fad1a95d659e455058aea0c2f5eac639edd494b61935880d1111dfe1c538943
 DIST pycurl-7.19.0.tar.gz 71346 SHA256 eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642 SHA512 18db8d923d1193f72b964817ceef5acaf3b1acab36a7d14aed9301dcace301d72e19cda5c79c8cb7335f1327f5900d1c03b34311ba086dd2bf2fd3d5710336e0 WHIRLPOOL f21d502a4244ee0022cc2ab1ddf48647c2e0dee042b5075e37a5b30e746ca450202e4305a9d7007b75e3fa85cde6e547896b17774fe4d2f2b807980a9a5d0d3c
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
-EBUILD pycurl-7.19.0-r1.ebuild 1921 SHA256 4f2c354d7c8239438b14695744f4d9757232aefc07ad69c9ab94848527d2fbb6 SHA512 f83d41674b60c720be6283568c7dc83c5e87aaf018bead5dfcfe4ece4ac5bc2529acf6e88e8d0ef8d91adf2f34770ab6b2ea05b817f6446d3cf363f2f19575ad WHIRLPOOL 0f0fa88c99616239141e70f8c28a2b168affc41dece3c394fb51fd075da1c64c7d0fd58c842a554c96e2870479cb80a58c997ee352c219ea8dfe58c09cde5eec
-EBUILD pycurl-7.19.0-r2.ebuild 1832 SHA256 0da115f7447c70bbe846152cfc8f986c5569e62684b993aa0fcecde37f941fbb SHA512 75fa9a99963193ff177afe7e25cde89f9bd67b81b3bb2ee01ee8b8675d2936f42008082fc886528a675d7fbe5932f8e8b7dfd169515296d45b2d6fc6a09807b2 WHIRLPOOL f22d14602451c27a0b9c53898b372e1456b93e098f2d27d3cd8615f11fef21507777bc7d850b8c55a682982e45628859d46059c44850800ce768adce40a9a77c
-EBUILD pycurl-7.19.0-r3.ebuild 2104 SHA256 c97748aa9a648d79190f7a2cc1daf5a79415248f11ea514440899bbc8ba6d287 SHA512 424007aef367ccaa22ebafc1a3c3b3013564b31702092b1aed8d30d91cde04dd057def785c08fd87e4beaa14bf47fd012f9a5b7c29ff6d2252f1237525559e81 WHIRLPOOL 259f9abbd8898c720f0b3a9ec9b27170dc719cefcb81532248ed374e391479fe28e5a8925c2ad8d3b2c81399f033fabc697be18d5056c2a4f56737269b2b8771
+EBUILD pycurl-7.19.0-r1.ebuild 1939 SHA256 7c4147a478a76e69d1297b76f2cfe66cd698b6b1446a4d5425759c29e49e239f SHA512 985cb7878408b1bae77392276f02af2305c9b9016ff894df36003e2b1b843a99fc150e227d9b780da80c4ff40f41f15353131236d7d4aa0bd2361a5a09686da6 WHIRLPOOL b3030b69ff60fe6997b6cd32a435f05aa99630012e04064daa0b714ad087e0f37919ad22608cfdf09c2106e3f74761305790931f5d95bafec279a0d015051b42
+EBUILD pycurl-7.19.0-r2.ebuild 1850 SHA256 f356ea2232ce14207daf19f6133411cb699e08aeac1b94122ef71d26ad5b6548 SHA512 a2a99f1a42f5ed1cf2da7cd4fe210c2a4277b144d87b72ff2e5cf41a796cd5669d23ca91eb2d3d6ea856af7c7fa1b0edff4bf09e595a8183752529ba014d9a58 WHIRLPOOL d7407a54d7cc034973348d3623d70fcb0e71c404112a90d39a1a450e2b6c2d6c80f67bd5993b0d6b620240babb37e1dead2b57d9f42881caff9b9289218474c1
+EBUILD pycurl-7.19.0-r3.ebuild 2121 SHA256 83e3de57464680326a0efcf2cc906badae8e653f54b6c6c992eb2e93f9f5007b SHA512 b6e851a88ff7cefb410d61bf08c57581b61487c667f2029649e16c447ab0d6a1b9c533106888bab419c8192ac04e51f124f89344249f335c6606fd046050aaad WHIRLPOOL 934b96cfe35b78eb32b2623b0ce58758022574e385447c7602fa019f28ffeb595b33ea9e083676809b549987e529f36aa3010060152f7089b583d2fbcf7e92db
 EBUILD pycurl-7.19.0.ebuild 1294 SHA256 56309f8ad5c8bcfda86ff052970247c3140cffff6a906c59b7d9bcccc0e3c67f SHA512 a8e491accef2beb38faf8a8a16cb6f3a9be235b1d4e151e2ef51c38916e46018275752ce412ad269721f46c3bb629e19faf1a954dcbc79b8590587ca72d9a429 WHIRLPOOL 14337dd68f25be650bd77a8828af747268ab0e5b08719607b26692afc7ea866333b52a2a88804d438310f06a9025b43e51da8b87aa5642fa307c562ab7260288
-EBUILD pycurl-7.19.3.1.ebuild 2452 SHA256 1391fba34ba4cdccfab9071caf4e0216eaa4a711abb0f5159eb33f09f217a343 SHA512 5f48c436a80bfceef2ee9eb02ec4519acf743898739197ac571de6de145554efde3bf22f521c23cf6fcfecfb1b9c2fe31a5124a77bfc88447380ba99af1c2f9c WHIRLPOOL 984af321c818adb801a0ad97c66149fdb0ee91ce60b7c9ed809bbe1dfaf8e08d77e6fb4b3da9a661f5a40821c6ad7c4f2d4226e46b5d5d27248cb48d26fe524d
-MISC ChangeLog 12860 SHA256 e26b7af8267522e2344f58df0ce9a2f55965054f66fd2d460b6c07fcaa0aa7ad SHA512 dc7fba5157e2ad08c27b01d356a5a9fdd1534ba50ae5628b3aa66b0d313e001e4cf9ef011593495bf3145f1e8a1b8db8c699fcfa4044b93fb158373ea2bd1dcf WHIRLPOOL 96fe69a29c45f5237ee2ea591e03d47356b44e981088490e43b2b15cd128b6ee2c4cbb8bfdd1b5040ccbc88015c7f834078fa662a45211ff5b0f33db578fb92c
+EBUILD pycurl-7.19.3.1.ebuild 2469 SHA256 17f3b3698e98d879f4dc89dd4beba6880d83b97520899e21a21bda22a952da53 SHA512 f50b50535d90763027fd699660c92e8c23c12dde7f6f32285d99fef72b8be241eacc744331844528ab62320426dbe636bd086f8042624acc85cf8e1ad32d79de WHIRLPOOL 9353df0cffabb9104265832b26adf317a4638b3990fc8f698596ee50371c3fcccd0775a1a7ffc539f706a922b7205656fd7afaacc4af1699b6a51118e23800e0
+MISC ChangeLog 13090 SHA256 c9e2373916b75f65c164ee6d13be6b584269b13e10d789206b17b3248db1f80a SHA512 63df465dc6e5d4eab7e294a12a205ab67c0619cc315e58d1d784550d8121131decac0c018b400816e5c275e4ed777f05b29d0a6e8bc09d8a87ad238dbf87fbc7 WHIRLPOOL 63d4f7710ee0d42df82a0b0c28e10c09f07e74cfcb5b6bd2cd30b702a9bb1c21aea5f484478051fb06a15d91559bab5905318930ca265aed763f3de0ada0f775
 MISC metadata.xml 826 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad SHA512 cd860d6a4151ac15bb7d9c355d0222f91b429993d56083670f3325ecde4f4fda8f4bf374aba3b1c65270a786e12c30c0344917fd04b608ebdc0c94b392279e61 WHIRLPOOL 397cf201be522437cc691b94d0aee887c8678b73e4533938edbbd1774c0a26907585b18584b39ce83e2868c6d896445c3dc940c2a2abf061ecb703ddbd35ca72
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOF/s0ACgkQC77qH+pIQ6SHggD9ESKAGUKVDoVdoP8IlYWbpSSF
-5aR9UC09CxsKWhl5+1ABAMXMAYqsRqafXduFEDiSeppYlsR+GchAKSB7DYbytBNr
-=EbLw
+iQJ8BAEBCABmBQJTnbonXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdSkQAJySqUYszFP97gxP1kW/kJZt
+zvKBDBGKMft8I/833v+Ej9z09d/fqR+j4H6qAi7qgzLckflOain//QTRmFXUAktr
+DYmaMYgyinzDPn+N+ae6LJw2+YYd89IEsCgj+uVK+TCCgh+jiuuUqztx1ePqwe5A
+Rx8xpuKMUvWPvAFUM06FVcVRLU7FtUNcJnvihbS2G58drZMVgZ/waMe5OQ4wn4w+
+kHf1hEkXhz4zWY6dg/LkpzQsDfyrIuTQzm9HGBZTE+Ra9Pcn82fbAfxbHctoXpCG
+lldq4PszAXuk2hq1YvKS2UZVYQVgBo2Wdxkyeqj0KM/hpkGts4PxA50wMJQe5dWM
+ZzmQXLyx4UFbj/Pz1Y+Z7oT5rXAh5Q4nPI5qlCrpaujgZt5Ec5uNfd+YYXbJCDgP
+eUltD/tRtEkfPj5lkWBrv+kq83KVUsx3uJ4Nt1aQBVQPIe+NdiwSYdTGf/bEcbPB
+uSaMEnz3SmGmyOKRYEJm+tH+hWcNNtqQiphDM2zrhlq5VAK+wudJ2RzTG9QJd+PP
++EQ0gUgOzeV2sjXodNSVGkc8KbDFdYAjJIIm7yWOh9NO++Mzd+3Kdj5BB95BuVyF
+5jPq3EaPiCDmWJ9aH8IqJn8uQQnRadT8UbzoHcjiVBNS5b9i7RQGEpa6L43glli3
+p0YIp6ptNqGEMRfLErwT
+=xN7p
 -----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 888400d70961..84d5559ff62f 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
+# 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-r1.ebuild,v 1.9 2012/09/29 18:44:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r1.ebuild,v 1.10 2014/06/15 15:22:12 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -27,7 +27,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 # 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]
+		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}"
diff --git a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
index eb62b1790ab7..c227b5d238b2 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r2.ebuild,v 1.2 2013/09/05 18:46:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.3 2014/06/15 15:22:12 mgorny Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 # 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]
+		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}"
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
index 3fa44060b78c..5d33374fe71b 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.13 2014/05/28 15:20:44 floppym Exp $
+# $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
 
@@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 # 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]
+		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}"
diff --git a/dev-python/pycurl/pycurl-7.19.3.1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1.ebuild
index 4dc0ceed7355..7e7f3f87fc1f 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2014/05/28 15:20:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.4 2014/06/15 15:22:12 mgorny Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 # 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]
+		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}"