diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-10-18 17:20:39 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-10-18 17:20:39 +0000 |
| commit | 6eb9968a1889b9806404f22fbe54c3ce37a3db89 (patch) | |
| tree | 2833977e39d1fd9bafee4e5e4e8698ddec17b9b6 /net-misc | |
| parent | Make documentation optional, wrt bug #274362. (diff) | |
| download | historical-6eb9968a1889b9806404f22fbe54c3ce37a3db89.tar.gz historical-6eb9968a1889b9806404f22fbe54c3ce37a3db89.tar.bz2 historical-6eb9968a1889b9806404f22fbe54c3ce37a3db89.zip | |
Make nss and metalink mutually exclusive, bug #433822
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/curl/Manifest | 12 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.27.0-r3.ebuild | 4 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.28.0.ebuild | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 22062b58e47e..55c8b7573475 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,10 @@ # 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.251 2012/10/14 18:57:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.252 2012/10/18 17:20:39 blueness Exp $ + + 18 Oct 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.27.0-r3.ebuild, + curl-7.28.0.ebuild: + Make nss and metalink mutually exclusive, bug #433822 14 Oct 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml: Fixed typoes in metadata.xml, thanks radhermit diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index f29bac8f9821..c1f4316f133b 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -20,14 +20,14 @@ DIST curl-7.28.0.tar.bz2 2507197 SHA256 b7f510db60f520ba0bc8a39cccee7e913362205b EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee191fc8d18ac45916d99a328 SHA512 c5b55fdd2ec42e113eb190e3eb5895bc14c6abc97768d3d616360628a7be9a84703b690a860f5037c76dd1bbe858ec04035d69213284756840ef597a1d4f9882 WHIRLPOOL 07bbe20b8deecca17161311b8ccda88c6593b9aa73a29257bdde53ef720733ef9f2c10ae748e3e7c81bced17f372068e5b57e8fd07e027d528f5905825fc2434 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b EBUILD curl-7.26.0.ebuild 6086 SHA256 785de5565ed98c5e46bb1d526936047c6b44fe087a3269c3932037b32b6597f9 SHA512 b6007e66f7ecf15f7ac152c4d4f747376476e710ab47fec1c9c58bc05cc4a4d0e4e8095f0e35348896267b3ef792e9299ce48ba36da5aac112ddc75c47f38b67 WHIRLPOOL 3cfc5497af90423b2bd20cf77ae9c94d8f4d8f82cc74e6d93eccb503c19fb930a9e121e748c0e19cb6ffd876bab7b50830405069a40e2ed24651fc51a624c246 -EBUILD curl-7.27.0-r3.ebuild 6607 SHA256 0d61b7ebc03b7f277c3daab597a89636f834062f85bd953b0eb676edd3a23c0f SHA512 8663c8b8f1661f6756914bacb7e386cced56b46c95af12790a7692811a84e154d7a1283a25cd16aa5de28b73e5539ffe140eecb547b06c70ba55df343db191a8 WHIRLPOOL d982dbed88c8602f89ba4a4f74c75ae7e6d8f7ce3f1fdb0b81dbab60507105cce93889aed8ed27ee282bfcc62abec68f62cb62fec87bef1d8fe1c13790d98d8e -EBUILD curl-7.28.0.ebuild 6460 SHA256 ff0fbecd2ca41f1f5a13fdecbfd5a193f7d5ffa8a9d2e205564dffd86c9b20c2 SHA512 ab2823282e2fca68356411eec33cdf5e0dd98e2241ed2585180d1ab3b6842d97421522d4c59a966f6ab1c9cc23c3607dd275f72b8faa0e3c6b358ae44555b3f2 WHIRLPOOL b29fa251bd91ee1f65d173cb0487f016ea8507f4ed00f6f3c2202d0c28a508ddc39dad5c71f4de52d34f88cb9fb807639d0cbad1937fcc2aa2df7d6696a90a4d -MISC ChangeLog 40624 SHA256 ae7438fce5d093e712f93154016c6f4b1e6e48f9b357156a786c64982ab7d4da SHA512 c286d3919aa7d2d52fe6947b5a0b0726299b93901777210b9715f12be92096bcab35bf8022ef2287eec716014736c295076cc12d697d3b758c0b59152faf408b WHIRLPOOL 34a89c6df2e6fce07fe6de9629f77372a10be56e892da7c939260066cef8e3cd54aa463ed913faf37aedaad39e230be8ef203889330d196074629c78b4999641 +EBUILD curl-7.27.0-r3.ebuild 6686 SHA256 23e48300e8685b31046b945391f1178898236b8ba1aeb3ce0da14fa31671d767 SHA512 1afe830b04e07c5103a91cb177645436eba84600e26d5ba37d6185936e31eec108b465db4ea3011effbeb65c4ad4792ec49dda40bc9400f9cc5b908aafe1225e WHIRLPOOL f785f56cf239ed456c21fe29d30d7a01f8d3c987fd0cf482f00d773679a446025c265c3caaca78e16e9e44519ab29ee1787af3439513a31066a7d2a1fa4b1598 +EBUILD curl-7.28.0.ebuild 6539 SHA256 a8c853136677b19abc6645d30a747848c60ea5caa243777ac44c66f74267a4c1 SHA512 d8b9e39a822dbf1bd24f11e8f82c90c9ae4a946ea7b71edd7d02b11c6005dd0a67669a01884646dab34aa5696348c4b9760e168d4786bb841fdfe183a00bb57a WHIRLPOOL c73a6e87d140f20fe4511c90bfa48e1a4813a04c061f563331d90f18278dff926cdfc6d6d244b08cee470f9ce89379a40e99b0e3cda03c2cd920452ca46b37eb +MISC ChangeLog 40781 SHA256 0efc37b922f660fe59fdbfad0b5a656cf3345a159757f5672dcd6f8f5961f0e5 SHA512 4955c6fb3b8aecce74b8421b5ba12dd1eb83b288dc6146be728d3d9802a8f552f02f7091882642edc4cb392e18570862ba2ffe609dfd479989c35163bf463418 WHIRLPOOL 7e790d1ea3d5fc676472bbfb18f026d390857f5fc23a91ab3c8def620bfab7605d79350c6620d0391e82a39a3eee0fe065c7e05abb9dfb6649ea01cd980cb194 MISC metadata.xml 914 SHA256 5ef1a7aa505389d5251c676a19babf3da6cd327391a731c51142d98c6a592f5f SHA512 1a8dbd0b7ae28fb8a91c566ff1766d166c188c382f050a2738551ca691305154cf387464df4090aeb2b3b7c38cf54895754407e6865adf88ebd030429a9a55f3 WHIRLPOOL 376247a5eeaa313864f6abe1860976a3bdac08f438c9eac8a92ebb58811f1bf3893023314cf931023a96db093c49edf9a972ca367b118c9d7d5f006bf7c5912d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlB7CsUACgkQl5yvQNBFVTWIRgCgnOp+bgBugOs+53ugYgNMlbGA -ySUAnjZ1AU0MdGgiBDbJIQQnuNQVXPKl -=MLGc +iEYEAREIAAYFAlCAOi8ACgkQl5yvQNBFVTWBrgCaAw8tvxo5p6HwzRejPfemEPDJ +arAAniYKe/AuQ9KZyGjasH305BVDtCqM +=Dg80 -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.27.0-r3.ebuild b/net-misc/curl/curl-7.27.0-r3.ebuild index 52750258b364..696c887c5aa9 100644 --- a/net-misc/curl/curl-7.27.0-r3.ebuild +++ b/net-misc/curl/curl-7.27.0-r3.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.27.0-r3.ebuild,v 1.1 2012/09/01 16:57:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r3.ebuild,v 1.2 2012/10/18 17:20:39 blueness Exp $ EAPI="4" @@ -65,9 +65,11 @@ DEPEND="${RDEPEND} )" # c-ares must be disabled for threads +# metalink cannot use nss for its backend #433822 # only one ssl provider can be enabled REQUIRED_USE=" threads? ( !adns ) + metalink? ( !curl_ssl_nss ) ssl? ( ^^ ( curl_ssl_axtls diff --git a/net-misc/curl/curl-7.28.0.ebuild b/net-misc/curl/curl-7.28.0.ebuild index d9b1552c0a39..83a29af0afe0 100644 --- a/net-misc/curl/curl-7.28.0.ebuild +++ b/net-misc/curl/curl-7.28.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.28.0.ebuild,v 1.1 2012/10/13 21:37:43 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.28.0.ebuild,v 1.2 2012/10/18 17:20:39 blueness Exp $ EAPI="4" @@ -65,9 +65,11 @@ DEPEND="${RDEPEND} )" # c-ares must be disabled for threads +# metalink cannot use nss for its backend #433822 # only one ssl provider can be enabled REQUIRED_USE=" threads? ( !adns ) + metalink? ( !curl_ssl_nss ) ssl? ( ^^ ( curl_ssl_axtls |