diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-03-31 16:59:20 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-03-31 16:59:20 +0000 |
| commit | ebbfab9f7a22e7e8e86299a15ed38d8c56e4f9c2 (patch) | |
| tree | 23f3a25a20423d75c1cb1b4e89cbde0839d52f11 /net-misc | |
| parent | Drop jsonmeta call from Makefile.PL to avoid dev-perl/YAML-Tiny dependency (#... (diff) | |
| download | historical-ebbfab9f7a22e7e8e86299a15ed38d8c56e4f9c2.tar.gz historical-ebbfab9f7a22e7e8e86299a15ed38d8c56e4f9c2.tar.bz2 historical-ebbfab9f7a22e7e8e86299a15ed38d8c56e4f9c2.zip | |
Backport of REQUIRED_USE zero or one of gnutls/ssl/nss, bug #410305
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/curl/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.24.0.ebuild | 14 |
3 files changed, 17 insertions, 12 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 94ecd80f5a07..634124f936c9 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/curl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.209 2012/03/31 14:11:13 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.210 2012/03/31 16:59:20 blueness Exp $ + + 31 Mar 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.24.0.ebuild: + Backport of REQUIRED_USE zero or one of gnutls/ssl/nss, bug #410305 31 Mar 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0.ebuild: Use REQUIRED_USE for gnutls/ssl/nss, bug #410305 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index e4786bfc991f..f966ce9b8a96 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -23,14 +23,14 @@ EBUILD curl-7.21.7-r2.ebuild 3731 RMD160 956ebed98bbb739aea22067a4427bcc8ca2fda9 EBUILD curl-7.21.7.ebuild 3552 RMD160 9c6603e702433d9a0d1b7175690c3e601545e694 SHA1 bfa2c7e0fde2e0ae9af02f2ec1640bcd04f4223f SHA256 bd27fe936c8bc62e86afa3c42dbb36a5f3651a14ad8f2e39dd4c21a036ef2cad EBUILD curl-7.22.0.ebuild 3623 RMD160 f8c1b529548f6ca91d02fb433ee09018a55905c3 SHA1 5a0976b5674f5eb06553dcd8be7d7e879eb959a5 SHA256 1a8ec1b6d7ac6de349cc8fcbc7314752a1fbbb5ba6eff5ca75ca53936683aaa2 EBUILD curl-7.23.1.ebuild 3704 RMD160 ba889eed9125b675446bc3bc4bd92813f14e5bae SHA1 01849e67262e0370d334ef665351d1ea3c00c564 SHA256 597b4979e67cef1e945fdf711e16270092805045ae13184072c02057f48bf0d6 -EBUILD curl-7.24.0.ebuild 3726 RMD160 5ff58b36d5a575f6a7d210102d58a14bab510d88 SHA1 2fbedfcf4999e9da471671d90a422aa769ebc04c SHA256 1cc1658dfe9bd0355751b9096b34f7dab3b0217ea7380bf650e3e5d8788f31cb +EBUILD curl-7.24.0.ebuild 3717 RMD160 d43fc3d98e331828cc1487892d672a6b123b32ba SHA1 20f7e08386accaa487b99bb8c8b75dace945b9ef SHA256 f1cc62bbfd7faa73cac55612861109d318da53d167b6a352c9845170e058ad82 EBUILD curl-7.25.0.ebuild 4369 RMD160 b22abe0623d16c9af55a4ca35f6455c9db292634 SHA1 2735b365894faf0b4c9761a11f052421fa93dbc9 SHA256 0431c352b5228fad8b59ef8999ff362a45bfac8865c1929c8acb7bc6e0c20929 -MISC ChangeLog 34583 RMD160 bab9acc624e1db2b4e93e8f2fca4deca4aa0cb78 SHA1 fbe5099f3bb5b8428f6de9fa99fc104a09359444 SHA256 140e981969d967fd0a1769c5a65fa20eb016b262ae353588a6056095b5808332 +MISC ChangeLog 34729 RMD160 4789805d311fd79009a63790eaf514ad1b56fa4a SHA1 372ce8ce8b3920dd1b73b9519bf7f8ea858ed10b SHA256 35a74eca400da01484a237147b3d85c35dac3fbb1296aad071897129f955e007 MISC metadata.xml 741 RMD160 6461e1dadf405f3d3bb619386bc2a3760ef777c2 SHA1 c3232f9c75c8a2999bb35ada343b8c69ba2d61ba SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk93EIsACgkQl5yvQNBFVTWJ+wCfXhrjNUnw7y3Vottzjayyl+zD -mjYAnR/W/IQKIdLDlP9vNAcr9q+e/AjS -=GhJF +iEYEAREIAAYFAk93N/IACgkQl5yvQNBFVTWQEQCfTURIcXXSM3Bv/mFQ/ISlrfZ1 +Tx8An1/kzPSWYmes3phpyOBLlzfUZ3nq +=N/tZ -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.24.0.ebuild b/net-misc/curl/curl-7.24.0.ebuild index 3e63936341f8..f4e53eeafe04 100644 --- a/net-misc/curl/curl-7.24.0.ebuild +++ b/net-misc/curl/curl-7.24.0.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/net-misc/curl/curl-7.24.0.ebuild,v 1.7 2012/03/03 15:30:40 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.8 2012/03/31 16:59:20 blueness Exp $ EAPI="4" @@ -17,8 +17,8 @@ IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) 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 ) ) ) + ssl? ( dev-libs/openssl ) + nss? ( dev-libs/nss app-misc/ca-certificates ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) @@ -37,10 +37,12 @@ DEPEND="${RDEPEND} )" # used - but can do without in self test: net-misc/stunnel -# ares must be disabled for threads and both can be disabled -# one can use wether gnutls or nss if ssl is enabled +# ares must be disabled for threads +# only zero or one of gnutls, ssl, nss, bug #410305 REQUIRED_USE="threads? ( !ares ) - nss? ( !gnutls )" + gnutls? ( !ssl !nss ) + ssl? ( !nss !gnutls ) + nss? ( !gnutls !ssl )" src_prepare() { epatch \ |