summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-02-20 13:19:17 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-02-20 13:19:17 +0000
commit37b84bf15e5059e0ca6d517a475d8f63f427eb1b (patch)
treed8d15124a123dfe331a02eca13de1cb64382ef0b /net-misc
parentFix tests in the presence of Rails 3. (diff)
downloadhistorical-37b84bf15e5059e0ca6d517a475d8f63f427eb1b.tar.gz
historical-37b84bf15e5059e0ca6d517a475d8f63f427eb1b.tar.bz2
historical-37b84bf15e5059e0ca6d517a475d8f63f427eb1b.zip
Update REQUIRED_USE to allow disabling of both ares and threads useflag. Thanks to Brian for hint.
Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/curl/ChangeLog6
-rw-r--r--net-misc/curl/Manifest4
-rw-r--r--net-misc/curl/curl-7.21.4.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 0d6ce553113b..df4a35734587 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
# 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.171 2011/02/19 17:23:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.172 2011/02/20 13:19:17 scarabeus Exp $
+
+ 20 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> curl-7.21.4.ebuild:
+ Update REQUIRED_USE to allow disabling of both ares and threads useflag.
+ Thanks to Brian for hint.
*curl-7.21.4 (19 Feb 2011)
*curl-7.21.3-r1 (19 Feb 2011)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 35ee0029cd0e..fdc4252e1267 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -9,6 +9,6 @@ DIST curl-7.21.3.tar.bz2 2194975 RMD160 775911baee866dd6697ba91996dcc37eba69ba40
DIST curl-7.21.4.tar.bz2 2256354 RMD160 c18710206d30a0f1078b2156df25ded30443f7cf SHA1 9cc59be07932b63e1f7d714c56ffaaa92af55373 SHA256 d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
EBUILD curl-7.20.0-r2.ebuild 3179 RMD160 14c6f1199f9e9761b16a49305e7662b54480cc5f SHA1 1045c7db6f92ab99d6eb6b753d2fd60aafafc9e3 SHA256 7d5508d6598a883ff9712eee2641b8326266bf83ba13fc8b3bea5ffe06950e8c
EBUILD curl-7.21.3-r1.ebuild 3869 RMD160 16a9e0ff40225bf20d2ce89975b3d38347c37b3d SHA1 ecc6d390c14e8afa61bd64d6bf5813f0b88d921d SHA256 c460d93f8ae983818edd50383bf5dd0fd59d7fcec1c5e254badbe1a8ee025e34
-EBUILD curl-7.21.4.ebuild 3488 RMD160 27c17b707af7161bad2be7dbd2b65635b136ec14 SHA1 bd3eba5615cda5273628b7523b54d824dd8a58ac SHA256 965ebb4e11516dd5c7a17449584db648ba1d66011bd5c81d4c0cc2e828b9d06c
-MISC ChangeLog 29239 RMD160 162ca0e87101c7f76da00fc05ed1792e27888a19 SHA1 60b90b7c2fa32a40c54dc4acbdcdb6784f8c478b SHA256 1496b257ccb3bb5d43c7d661f19b435c90ee71e2d73a5252da759b503142dc24
+EBUILD curl-7.21.4.ebuild 3532 RMD160 60e6e08db74fa6aa4178ccde52f150c0870e04ba SHA1 46de2ac6f81662610805eceae9fd5dc3ac1619b3 SHA256 2a8a879fc501abbb41087e83af307d4f9956569becee4ff40f1502ae62f13fe5
+MISC ChangeLog 29418 RMD160 f0a79df40ce309ac728afebb6cd2973889db0e91 SHA1 7c7f1f263695c623f56237e3a39bbe821fea6d8b SHA256 26ad5bd688e94ec8fc59e85874e6f0a3541d6f1ac3eeaac94bc60664e88a5a77
MISC metadata.xml 632 RMD160 880f74804f58930ece5181aec729c39d3a5827e2 SHA1 f576b1b42403cde8c506d0deec8ba52634459389 SHA256 9d71150a8a4f182f5d6a9f9a33161ef0944437bec38fd05857dea2972f294d7c
diff --git a/net-misc/curl/curl-7.21.4.ebuild b/net-misc/curl/curl-7.21.4.ebuild
index 317d2614aad7..7d52d458358a 100644
--- a/net-misc/curl/curl-7.21.4.ebuild
+++ b/net-misc/curl/curl-7.21.4.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.4.ebuild,v 1.1 2011/02/19 17:23:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.2 2011/02/20 13:19:17 scarabeus Exp $
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
@@ -39,9 +39,9 @@ DEPEND="${RDEPEND}
)"
# used - but can do without in self test: net-misc/stunnel
-# ares must be disabled for threads
+# ares must be disabled for threads and both can be disabled
# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="^^ ( ares threads )
+REQUIRED_USE="^^ ( ares threads ( !ares !threads ) )
gnutls? ( ssl )
nss? ( ssl )"