diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-07-02 13:33:38 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-07-02 13:33:38 +0000 |
| commit | cc8fb7eb7d9bf73d471984bb38e4a9dd1fd717f5 (patch) | |
| tree | 5c5440f0e95748171aa707052661e56307438ed8 /net-misc | |
| parent | Link /usr/bin/tintwizard to /usr/bin/tintwizard.py, bug 326357. (diff) | |
| download | historical-cc8fb7eb7d9bf73d471984bb38e4a9dd1fd717f5.tar.gz historical-cc8fb7eb7d9bf73d471984bb38e4a9dd1fd717f5.tar.bz2 historical-cc8fb7eb7d9bf73d471984bb38e4a9dd1fd717f5.zip | |
Don't die on USE="ares threads", silently disable ares instead, bug 326611.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/curl/Manifest | 18 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.21.0.ebuild | 10 |
3 files changed, 25 insertions, 9 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index b9aa555db255..3f8c185d3c47 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/curl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.162 2010/07/01 20:46:53 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.163 2010/07/02 13:33:38 spatz Exp $ + + 02 Jul 2010; Dror Levin <spatz@gentoo.org> curl-7.21.0.ebuild: + Don't die on USE="ares threads", silently disable ares instead, bug + 326611. 01 Jul 2010; Jeremy Olexa <darkside@gentoo.org> +files/curl-7.18.2-prefix.patch, curl-7.21.0.ebuild: diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 817e5be75d5f..0e2e26d13578 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73 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 @@ -10,6 +13,17 @@ DIST curl-7.21.0.tar.bz2 2130889 RMD160 121eb3645c1286d583462244c1d7e7356129c440 EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46 EBUILD curl-7.20.0-r2.ebuild 3273 RMD160 4ddc154d74aec6e2742a4095fb908b2943512f07 SHA1 311c2c49c9bb0395303803b4f8ab0845a882fb44 SHA256 df38cd61d36ca1e72ac9b4b81bebf003d49092d082e171938d6f143ce90993c2 EBUILD curl-7.20.1.ebuild 3199 RMD160 89e6290e6eaad376ce0e1676f99956186a82c8c8 SHA1 580a07d1c9f7b3a19ce8ce25bfa42031758a217f SHA256 48ed254257d49c3820aca25f9d07765fc882e97d650d28e6d3ae3ca21819b6c3 -EBUILD curl-7.21.0.ebuild 3811 RMD160 c740ad2d42d4cd60364cf36ff1b687340eb834aa SHA1 7535fe3693b1dcc10f1983baf10922571d042b2b SHA256 51802142ef323576fd0d510cb442daa727acec9d9845c8f5a3d159519842dec7 -MISC ChangeLog 27634 RMD160 f2c4d970ecc50002e981fb748267c2400acc87fb SHA1 61e4e5d56f9ebe1ee05077f16e33839210d57226 SHA256 59a268f1e5ee7d01c4ec73b1dd324634b070588a67c093081b79459b75c3166f +EBUILD curl-7.21.0.ebuild 3812 RMD160 d989c72f6bcbc11cb447bf2e4c3d984d459afd68 SHA1 0043a3a7b9e1af76ed034f9cde8b8a52f942279d SHA256 fa09bb7e148bcf5801f3dbbaa1fd5437f2b92d0b96573d364802207029362d30 +MISC ChangeLog 27777 RMD160 be4e2c739588613b90a85f0044e86a40a4da5bfe SHA1 75870b5d2a5859e245d74d37a345e2e23c530e3c SHA256 3450644a7d80bd59172b2cf533ba889c86473ce62c55c9ee683372e090849ec9 MISC metadata.xml 697 RMD160 75f1a38985395bbb89971476c5fc004e8f247959 SHA1 d3f52a273d008cfaee85396ff1e01694a2ba3f19 SHA256 f78ea4a02ffb68ecdaa3947f1c0b3a8aaefa36cebb0aa12e9cee1413868463cb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iQEcBAEBCgAGBQJMLerHAAoJEAWF714uGAc6wsEH/38QCXnU8w9GeP/xSnbBUpDP +yA+qzHe+KISnRqyqfwfSBACNpaNVG740ljA6KOrcBwKEFpiwcTLYRricZNDK+fAu +Vn1aj16u7IDhMG7ci60S9sf6FnOIhne+6h+aSmi/B4K7UInfTc9JUEI6fRA8wf6O +3gpJ+Wc4aJVMknTXkYbNaim/5TfVgS1qDBAyKrqPvFdQiVqImmwhbpCFRyaMsX/9 +PPUNf4cOKRCwZyYay79Um9+PU/mQvvyq87gXBVsY9rn9PMsOu513MZAg1FZaXu2w +qAemUt+2gtyfmQ34e6AgrOKlMiOfJoRPjoCHLT7uJpOHZqH6Iafmrw18zUdsgdg= +=0Ny4 +-----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.21.0.ebuild b/net-misc/curl/curl-7.21.0.ebuild index f7baa69ebe1c..bc9c240b3c9f 100644 --- a/net-misc/curl/curl-7.21.0.ebuild +++ b/net-misc/curl/curl-7.21.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.2 2010/07/01 20:46:53 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.3 2010/07/02 13:33:38 spatz Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -47,10 +47,8 @@ pkg_setup() { ewarn "Please review the local USE flags for this package." fi if use ares && use threads; then - eerror "USE flags 'ares' and 'threads' are mutually exclusive," - eerror "please disable one of them." - eerror - die "USE flags 'ares' and 'threads' both enabled" + ewarn "USE flags 'ares' and 'threads' are mutually exclusive," + ewarn "disabling 'ares', please review and re-emerge if needed." fi } @@ -71,8 +69,8 @@ src_configure() { $(use_with kerberos gssapi "${EPREFIX}"/usr) $(use_with libssh2) $(use_enable ipv6) - $(use_enable ares) $(use_enable threads threaded-resolver) + $(use threads && echo --disable-ares || use_enable ares) --enable-http --enable-ftp --enable-gopher |