Version bump. Bump to EAPI 2, don't apply no longer needed libcurl.m4 patch.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 118 insertions, 1 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 1395b671747c..0b60b2539433 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.155 2010/03/21 15:12:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.156 2010/04/15 20:55:42 spatz Exp $
+
+*curl-7.20.1 (15 Apr 2010)
+
+  15 Apr 2010; Dror Levin <spatz@gentoo.org> +curl-7.20.1.ebuild:
+  Version bump. Bump to EAPI 2, don't apply no longer needed libcurl.m4
+  patch.
 
 *curl-7.20.0-r2 (21 Mar 2010)
 
diff --git a/net-misc/curl/curl-7.20.1.ebuild b/net-misc/curl/curl-7.20.1.ebuild
new file mode 100644
index 000000000000..6516ddb36b64
--- /dev/null
+++ b/net-misc/curl/curl-7.20.1.ebuild
@@ -0,0 +1,111 @@
+# 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.1.ebuild,v 1.1 2010/04/15 20:55:42 spatz Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+EAPI=2
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
+		"${FILESDIR}"/${PN}-7.19.7-test241.patch
+}
+
+src_configure() {
+	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'
+}
+
+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 || die
+
+	dodoc CHANGES README || die
+	dodoc docs/FEATURES docs/INTERNALS || die
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE || die
+}