Fixing missing quotes in libcurl.m4

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 136 insertions, 12 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 00bcdb77f342..1395b671747c 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.154 2010/03/16 21:43:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.155 2010/03/21 15:12:16 tupone Exp $
+
+*curl-7.20.0-r2 (21 Mar 2010)
+
+  21 Mar 2010; Tupone Alfredo <tupone@gentoo.org> +curl-7.20.0-r2.ebuild,
+  +files/curl-7.20.0-libcurlm4.patch:
+  Fixing missing quotes in libcurl.m4
 
 *curl-7.20.0-r1 (16 Mar 2010)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 40caf09accd0..fe61f7ed5731 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
 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
 AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
 DIST curl-7.19.6.tar.bz2 2347791 RMD160 7627d78ec681a513972be0cb5473b26805f44d83 SHA1 b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e SHA256 ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
 DIST curl-7.19.7.tar.bz2 2355121 RMD160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4 SHA1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c SHA256 1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70
@@ -10,13 +8,7 @@ DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817
 EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46
 EBUILD curl-7.19.7.ebuild 2995 RMD160 474a66a21278b34e13d4bce9cc7ce85f1d8f7cb8 SHA1 dcc2a70aa356104e4ca99973a9fa786bf18295b6 SHA256 cb76ac97a2aeffb505fe7620dbdee05fd5a582c7c1a520e373c6069cfb97c77d
 EBUILD curl-7.20.0-r1.ebuild 3237 RMD160 1a87d8c61a3edd482cafb7decdb90428999d0f47 SHA1 1319858edc989f468f17fea830731a508696d76a SHA256 d679664ccaa80ae3df369eff68802aff25025330b7e34883c5617dc49532aa27
+EBUILD curl-7.20.0-r2.ebuild 3276 RMD160 3751e17371a9a3da9523a9e1954c69de9ae4319a SHA1 ebc37358d1d1e18f6a22e56a031639f50639c409 SHA256 3956960da604fd836509d54201206f10d8ce95477eaf5600e811ae79091f2d23
 EBUILD curl-7.20.0.ebuild 3055 RMD160 bb01a4e0bf60501e283e903cdb736912a48fc86f SHA1 99900c330d6fcd9b99355f34bdf52bc9813e1b1e SHA256 751cbd667c11352b34938ab9069e75cdfc2f843f76b22023aca8ab31fe634b18
-MISC ChangeLog 26313 RMD160 fe7d540c8c200240756f9f4c30fb462f11615af0 SHA1 30e5c371c7aa0457789972b65458105039efd727 SHA256 894d9534ee8c26296b702cb7296b16403492effca430185b542467de5164ad9e
+MISC ChangeLog 26495 RMD160 bf938cfe77e38ed0ceb8affa00a71dd3166021ae SHA1 40dd6156161cea9c0ac4522f0271ab6c2fc3fd63 SHA256 4fccbc88d440081d110916913257c6fa95191b45b336225079022ef5dbfb797a
 MISC metadata.xml 697 RMD160 75f1a38985395bbb89971476c5fc004e8f247959 SHA1 d3f52a273d008cfaee85396ff1e01694a2ba3f19 SHA256 f78ea4a02ffb68ecdaa3947f1c0b3a8aaefa36cebb0aa12e9cee1413868463cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkuf+2sACgkQTwhj9JtAlp76agD/fcmEHJL1tpFFA+3UE+tWOJYe
-CnackcXtRixgsOKycBwA/R5vS5NWFBvi78wtDIZeOtEwUX2YoEpTorbIP7bN6DPF
-=bHmr
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.20.0-r2.ebuild b/net-misc/curl/curl-7.20.0-r2.ebuild
new file mode 100644
index 000000000000..06da5e0ab948
--- /dev/null
+++ b/net-misc/curl/curl-7.20.0-r2.ebuild
@@ -0,0 +1,115 @@
+# 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.20.0-r2.ebuild,v 1.1 2010/03/21 15:12:16 tupone Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit multilib eutils
+
+#MY_P=${P/_pre/-}
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
+#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
+#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+		!gnutls? ( !nss? ( dev-libs/openssl ) )
+	)
+	idn? ( net-dns/libidn )
+	ares? ( >=net-dns/c-ares-1.4.0 )
+	kerberos? ( virtual/krb5 )
+	libssh2? ( >=net-libs/libssh2-0.16 )"
+
+# fbopenssl (not in gentoo) --with-spnego
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+
+pkg_setup() {
+	if ! use ssl && ( use gnutls || use nss ) ; then
+		ewarn "USE='gnutls nss' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-7.19.7-test241.patch \
+		"${FILESDIR}"/${P}-libcurlm4.patch
+}
+
+src_compile() {
+
+	myconf="$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		$(use_with idn libidn)
+		$(use_with kerberos gssapi /usr)
+		$(use_with libssh2)
+		$(use_enable ipv6)
+		$(use_enable ares)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-smtp
+		--enable-pop3
+		--enable-imap
+		--enable-rtsp
+		--enable-nonblocking
+		--enable-largefile
+		--enable-maintainer-mode
+		--disable-sspi
+		--without-krb4
+		--without-spnego"
+
+	if use ssl ; then
+		if use gnutls; then
+			myconf="${myconf} --without-ssl --with-gnutls --without-nss"
+			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+		elif use nss; then
+			myconf="${myconf} --without-ssl --without-gnutls --with-nss"
+			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+		else
+			myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+			myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+		fi
+	else
+		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
+	fi
+
+	econf ${myconf} || die 'configure failed'
+
+	emake || die "install failed for current version"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installed failed for current version"
+	rm -rf "${D}"/etc/
+
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+	insinto /usr/share/aclocal
+	doins docs/libcurl/libcurl.m4
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-misc/curl/files/curl-7.20.0-libcurlm4.patch b/net-misc/curl/files/curl-7.20.0-libcurlm4.patch
new file mode 100644
index 000000000000..16220b87d91e
--- /dev/null
+++ b/net-misc/curl/files/curl-7.20.0-libcurlm4.patch
@@ -0,0 +1,11 @@
+--- docs/libcurl/libcurl.m4.old	2010-03-21 15:50:23.000000000 +0100
++++ docs/libcurl/libcurl.m4	2010-03-21 15:51:41.000000000 +0100
+@@ -198,7 +198,7 @@
+ 
+ 	      # We don't have --protocols, so just assume that all
+ 	      # protocols are available
+-	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP
++	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
+ 
+ 	      if test x$libcurl_feature_SSL = xyes ; then
+ 	         _libcurl_protocols="$_libcurl_protocols HTTPS"