summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-02-20 14:22:58 +0000
committerUlrich Müller <ulm@gentoo.org>2011-02-20 14:22:58 +0000
commit2d319414eb41d914251cf3eccf0b59b62b8ff350 (patch)
treeb00ab8c8b364c88e33f792a279e371fc6761d1cf /net-misc
parentVersion bump. (diff)
downloadhistorical-2d319414eb41d914251cf3eccf0b59b62b8ff350.tar.gz
historical-2d319414eb41d914251cf3eccf0b59b62b8ff350.tar.bz2
historical-2d319414eb41d914251cf3eccf0b59b62b8ff350.zip
Rewrite REQUIRED_USE in more compact way, as discussed with scarabeus.
Package-Manager: portage-2.1.9.40/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/curl/ChangeLog5
-rw-r--r--net-misc/curl/Manifest14
-rw-r--r--net-misc/curl/curl-7.21.4.ebuild4
3 files changed, 18 insertions, 5 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index df4a35734587..be146c65c91c 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.172 2011/02/20 13:19:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.173 2011/02/20 14:22:58 ulm Exp $
+
+ 20 Feb 2011; Ulrich Mueller <ulm@gentoo.org> curl-7.21.4.ebuild:
+ Rewrite REQUIRED_USE in more compact way, as discussed with scarabeus.
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.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index fdc4252e1267..0fc91e4123d1 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
AUX curl-7.20.0-libcurlm4.patch 490 RMD160 d4b821bf728286011ce11d7ccc9704522afae98a SHA1 2c592feba55b77965a8cf7e5491f7d0d1db9305e SHA256 b302bcce3d5fccf017eb80dc56e5e129164614c8b24b4c2415aaf63149362f55
@@ -9,6 +12,13 @@ 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 3532 RMD160 60e6e08db74fa6aa4178ccde52f150c0870e04ba SHA1 46de2ac6f81662610805eceae9fd5dc3ac1619b3 SHA256 2a8a879fc501abbb41087e83af307d4f9956569becee4ff40f1502ae62f13fe5
-MISC ChangeLog 29418 RMD160 f0a79df40ce309ac728afebb6cd2973889db0e91 SHA1 7c7f1f263695c623f56237e3a39bbe821fea6d8b SHA256 26ad5bd688e94ec8fc59e85874e6f0a3541d6f1ac3eeaac94bc60664e88a5a77
+EBUILD curl-7.21.4.ebuild 3506 RMD160 6846bf3466c0fc5d34fbc38e72b986627e073421 SHA1 41accd4f07cfb0709c21318ab1fa3ccb685f34da SHA256 12843b2e5de23ede25d332f9d900573527d7754280996d5e226ce6f645f37436
+MISC ChangeLog 29553 RMD160 196974dc6967659083372f93bd49913518134c60 SHA1 6a8f22cb741f3c82ace9a077ce29f78d436b26ee SHA256 41faace378bb6882e95f5ca44ba0ff03bd9d94104e83713b9d8142affdf2f5e9
MISC metadata.xml 632 RMD160 880f74804f58930ece5181aec729c39d3a5827e2 SHA1 f576b1b42403cde8c506d0deec8ba52634459389 SHA256 9d71150a8a4f182f5d6a9f9a33161ef0944437bec38fd05857dea2972f294d7c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1hJT4ACgkQOeoy/oIi7uyORgCeIwWYIXCn1VtHj0PnAzUgLvWV
+75sAoMvJ+MXbZEKqxzEweUEXXV4X0nei
+=raXo
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.4.ebuild b/net-misc/curl/curl-7.21.4.ebuild
index 7d52d458358a..97ee62bf459d 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.2 2011/02/20 13:19:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.3 2011/02/20 14:22:58 ulm Exp $
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
@@ -41,7 +41,7 @@ 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="^^ ( ares threads ( !ares !threads ) )
+REQUIRED_USE="threads? ( !ares )
gnutls? ( ssl )
nss? ( ssl )"