summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/curl/ChangeLog7
-rw-r--r--net-misc/curl/Manifest24
-rw-r--r--net-misc/curl/curl-7.17.0.ebuild11
-rw-r--r--net-misc/curl/curl-7.17.1_pre20071013.ebuild11
4 files changed, 28 insertions, 25 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 508b82cb24ea..ee5f61c31c4c 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/curl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.107 2007/10/14 06:40:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.108 2007/10/17 20:32:13 dragonheart Exp $
+
+ 17 Oct 2007; Daniel Black <dragonheart@gentoo.org> curl-7.17.0.ebuild,
+ curl-7.17.1_pre20071013.ebuild:
+ remove app-misc/ca-certificates from RDEPEND unless using a crypto USE flag
+ thanks to beandog
*curl-7.17.1_pre20071013 (13 Oct 2007)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d9d4d941b93c..7abe788cb9d5 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -30,18 +30,18 @@ EBUILD curl-7.16.4.ebuild 3125 RMD160 416421c8ca021c69680d964757bd004e4edcb907 S
MD5 412f82d27a6043de8ac655383d27a106 curl-7.16.4.ebuild 3125
RMD160 416421c8ca021c69680d964757bd004e4edcb907 curl-7.16.4.ebuild 3125
SHA256 f7474a2750e0817ba5681fd1d3f1ad6f39d69ab3ee1afbe50fcfaba51cf92c1f curl-7.16.4.ebuild 3125
-EBUILD curl-7.17.0.ebuild 3280 RMD160 4e8c2860c9025efd1fa3b7d5908e096ad0f2597d SHA1 1c8185b4d337e6fbd42278300c29d03f7915aa27 SHA256 d1c6ab9873af7c2cc7da822b18cccd3df142c88cf33a5a8c3346dc06a465ac66
-MD5 99c81df832ef80c233f13e9aa86e7862 curl-7.17.0.ebuild 3280
-RMD160 4e8c2860c9025efd1fa3b7d5908e096ad0f2597d curl-7.17.0.ebuild 3280
-SHA256 d1c6ab9873af7c2cc7da822b18cccd3df142c88cf33a5a8c3346dc06a465ac66 curl-7.17.0.ebuild 3280
-EBUILD curl-7.17.1_pre20071013.ebuild 3297 RMD160 afffc448e6ab11119541cdbabd41b65f89561988 SHA1 f63004a3fc22dd12e1321dd322149ec177e4705c SHA256 70d0ac70afdabd7a6e28d846c213da7f8f1c55d2e493d9126730aa9c3446c162
-MD5 7a87f560c2e528cab3148f5f0929ed93 curl-7.17.1_pre20071013.ebuild 3297
-RMD160 afffc448e6ab11119541cdbabd41b65f89561988 curl-7.17.1_pre20071013.ebuild 3297
-SHA256 70d0ac70afdabd7a6e28d846c213da7f8f1c55d2e493d9126730aa9c3446c162 curl-7.17.1_pre20071013.ebuild 3297
-MISC ChangeLog 19489 RMD160 f9ec63aaa6d275ae92a2e40bcb33d41df547e2ba SHA1 6a33b2d8ed03994fab7da9c4fa2fafd98642653a SHA256 4b119e5db54ce0f42dcf9f33e28e53b81c2d9d97ced0bb2e53fca31c3c921fb6
-MD5 39c94b2666bb664ae4f080513d66876c ChangeLog 19489
-RMD160 f9ec63aaa6d275ae92a2e40bcb33d41df547e2ba ChangeLog 19489
-SHA256 4b119e5db54ce0f42dcf9f33e28e53b81c2d9d97ced0bb2e53fca31c3c921fb6 ChangeLog 19489
+EBUILD curl-7.17.0.ebuild 3332 RMD160 cc28091be032c3223ea7b16c75166bb9a8192865 SHA1 a6b8631bd2865113d44a829b93482ec31ff68d09 SHA256 5b1cbb50236ceeac5f614bc1e4750f5f386e2120cb92e95538d1d68763324f89
+MD5 75fd550e9eb102a0700889cbbb837bcb curl-7.17.0.ebuild 3332
+RMD160 cc28091be032c3223ea7b16c75166bb9a8192865 curl-7.17.0.ebuild 3332
+SHA256 5b1cbb50236ceeac5f614bc1e4750f5f386e2120cb92e95538d1d68763324f89 curl-7.17.0.ebuild 3332
+EBUILD curl-7.17.1_pre20071013.ebuild 3346 RMD160 b40029445b74b29e5e041d279abfb58a162dd60b SHA1 44e2f98f747e2244b7cd54c2aca039b7c78548cd SHA256 056e8060c9aa346c0c00441fd95f7cc6d35ed9d451c5eed98a2d9d9ca8f0c249
+MD5 3147935f5879f564d29cae2327162897 curl-7.17.1_pre20071013.ebuild 3346
+RMD160 b40029445b74b29e5e041d279abfb58a162dd60b curl-7.17.1_pre20071013.ebuild 3346
+SHA256 056e8060c9aa346c0c00441fd95f7cc6d35ed9d451c5eed98a2d9d9ca8f0c249 curl-7.17.1_pre20071013.ebuild 3346
+MISC ChangeLog 19695 RMD160 3a5d77341cd971161ba3c9577fc3a2bc7cf64055 SHA1 817e2abdc161b8be35b48610933f50b2229ea5f8 SHA256 979cfad5793d7437554f723a8ea6e1f73c4fcfa276d9bb9e5c4382afd1690d5b
+MD5 222ea454e8a0ea2fae0b6adba84f4134 ChangeLog 19695
+RMD160 3a5d77341cd971161ba3c9577fc3a2bc7cf64055 ChangeLog 19695
+SHA256 979cfad5793d7437554f723a8ea6e1f73c4fcfa276d9bb9e5c4382afd1690d5b ChangeLog 19695
MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
MD5 2fca58a7644b7fd5e240d2054ab94fbe metadata.xml 223
RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 metadata.xml 223
diff --git a/net-misc/curl/curl-7.17.0.ebuild b/net-misc/curl/curl-7.17.0.ebuild
index 2d7e242d2109..db3118c57169 100644
--- a/net-misc/curl/curl-7.17.0.ebuild
+++ b/net-misc/curl/curl-7.17.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.0.ebuild,v 1.3 2007/10/01 15:09:51 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.0.ebuild,v 1.4 2007/10/17 20:32:13 dragonheart Exp $
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
@@ -18,14 +18,13 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
-RDEPEND="gnutls? ( net-libs/gnutls )
- nss? ( !gnutls? ( dev-libs/nss ) )
- ssl? ( !gnutls? ( !nss? ( dev-libs/openssl ) ) )
+RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+ nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+ ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
ldap? ( net-nds/openldap )
idn? ( net-dns/libidn )
ares? ( >=net-dns/c-ares-1.4.0 )
- kerberos? ( virtual/krb5 )
- app-misc/ca-certificates"
+ kerberos? ( virtual/krb5 )"
# libssh2? ( >=net-libs/libssh2-0.16 )"
# net-libs/libssh2 (masked) --with-libssh2
diff --git a/net-misc/curl/curl-7.17.1_pre20071013.ebuild b/net-misc/curl/curl-7.17.1_pre20071013.ebuild
index 6d29980fb9f6..dbdd41e2ddaa 100644
--- a/net-misc/curl/curl-7.17.1_pre20071013.ebuild
+++ b/net-misc/curl/curl-7.17.1_pre20071013.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1_pre20071013.ebuild,v 1.2 2007/10/14 08:09:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1_pre20071013.ebuild,v 1.3 2007/10/17 20:32:13 dragonheart Exp $
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
@@ -18,14 +18,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
#IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
-RDEPEND="gnutls? ( net-libs/gnutls )
- nss? ( !gnutls? ( dev-libs/nss ) )
- ssl? ( !gnutls? ( !nss? ( dev-libs/openssl ) ) )
+RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+ nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+ ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
ldap? ( net-nds/openldap )
idn? ( net-dns/libidn )
ares? ( >=net-dns/c-ares-1.4.0 )
- kerberos? ( virtual/krb5 )
- app-misc/ca-certificates"
+ kerberos? ( virtual/krb5 )"
# libssh2? ( >=net-libs/libssh2-0.16 )"
# net-libs/libssh2 (masked) --with-libssh2