fix test case 62 as per bug #166289. version bump to 7.16.1 (still masked due to ABI breakages)

(Portage version: 2.1.2-r9)

8 files changed, 154 insertions, 9 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index f5326b462bd6..0902965b9f29 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/curl
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.79 2006/12/09 03:30:39 dragonheart Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.80 2007/02/11 04:07:12 dragonheart Exp $
+
+*curl-7.16.1 (11 Feb 2007)
+
+  11 Feb 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/curl-7.15.1-test62.patch, +files/curl-7.16.1-strip-ldflags.patch,
+  curl-7.15.1-r1.ebuild, curl-7.15.5.ebuild, curl-7.16.0.ebuild,
+  +curl-7.16.1.ebuild:
+  fix test case 62 as per bug #166289 thanks Miroslav Sulc. version bump to
+  7.16.1
 
 *curl-7.16.0 (09 Dec 2006)
 
diff --git a/net-misc/curl/curl-7.15.1-r1.ebuild b/net-misc/curl/curl-7.15.1-r1.ebuild
index a95b541306bc..67f3c3cae63f 100644
--- a/net-misc/curl/curl-7.15.1-r1.ebuild
+++ b/net-misc/curl/curl-7.15.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.15.1-r1.ebuild,v 1.9 2006/12/09 03:30:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.10 2007/02/11 04:07:12 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch ${FILESDIR}/curl-7.15-libtftp.patch
 	epatch ${FILESDIR}/curl-7.15.1-test46.patch
+	epatch ${FILESDIR}/curl-7.15.1-test62.patch
 }
 
 src_compile() {
diff --git a/net-misc/curl/curl-7.15.5.ebuild b/net-misc/curl/curl-7.15.5.ebuild
index e090d8762643..81efa244a53e 100644
--- a/net-misc/curl/curl-7.15.5.ebuild
+++ b/net-misc/curl/curl-7.15.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.15.5.ebuild,v 1.2 2006/12/09 03:30:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.5.ebuild,v 1.3 2007/02/11 04:07:12 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -34,6 +34,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${PN}-7.15-strip-ldflags.patch
+	epatch ${FILESDIR}/curl-7.15.1-test62.patch
 	elibtoolize
 }
 
diff --git a/net-misc/curl/curl-7.16.0.ebuild b/net-misc/curl/curl-7.16.0.ebuild
index 5b5d9f0b6606..ba5d24153460 100644
--- a/net-misc/curl/curl-7.16.0.ebuild
+++ b/net-misc/curl/curl-7.16.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.16.0.ebuild,v 1.1 2006/12/09 03:30:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.0.ebuild,v 1.2 2007/02/11 04:07:12 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -34,6 +34,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${PN}-7.15-strip-ldflags.patch
+	epatch ${FILESDIR}/curl-7.15.1-test62.patch
 	elibtoolize
 }
 
diff --git a/net-misc/curl/curl-7.16.1.ebuild b/net-misc/curl/curl-7.16.1.ebuild
new file mode 100644
index 000000000000..78654626ab06
--- /dev/null
+++ b/net-misc/curl/curl-7.16.1.ebuild
@@ -0,0 +1,105 @@
+# 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.16.1.ebuild,v 1.1 2007/02/11 04:07:12 dragonheart Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit libtool eutils
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
+SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+
+LICENSE="MIT X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	ssl? ( !gnutls? ( dev-libs/openssl ) )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/libidn )
+	ares? ( net-dns/c-ares )
+	kerberos? ( virtual/krb5 )
+	krb4? ( app-crypt/kth-krb )"
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-strip-ldflags.patch
+	epatch ${FILESDIR}/curl-7.15.1-test62.patch
+	elibtoolize
+}
+
+src_compile() {
+
+	myconf="$(use_enable ldap)
+		$(use_with idn libidn)
+		$(use_enable kerberos gssapi)
+		$(use_enable ipv6)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-nonblocking
+		--enable-largefile
+		--enable-maintainer-mode"
+
+	if use ipv6 && use ares; then
+		ewarn "c-ares support disabled because it is incompatible with ipv6."
+		myconf="${myconf} --disable-ares"
+	else
+		myconf="${myconf} $(use_enable ares)"
+	fi
+
+	if use ipv6 && use krb4; then
+		ewarn "kerberos-4 support disabled because it is incompatible with ipv6."
+		myconf="${myconf} --disable-krb4"
+	else
+		myconf="${myconf} $(use_enable krb4)"
+	fi
+
+	if use gnutls; then
+		myconf="${myconf} --without-ssl --with-gnutls=/usr"
+	elif use ssl; then
+		myconf="${myconf} --without-gnutls --with-ssl=/usr"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl"
+	fi
+
+	if use kerberos; then
+	   myconf="${myconf} --with-gssapi=/usr"
+	fi
+
+	econf ${myconf} || die 'configure failed'
+	emake || die "install failed for current version"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "installed failed for current version"
+
+	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
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then
+		ewarn "You must re-compile all packages that are linked against"
+		ewarn "curl-7.15.* by using revdep-rebuild from gentoolkit:"
+		ewarn "# revdep-rebuild --library libcurl.so.3"
+	fi
+}
diff --git a/net-misc/curl/files/curl-7.15.1-test62.patch b/net-misc/curl/files/curl-7.15.1-test62.patch
new file mode 100644
index 000000000000..15ec36372d72
--- /dev/null
+++ b/net-misc/curl/files/curl-7.15.1-test62.patch
@@ -0,0 +1,15 @@
+--- curl-7.15.5/tests/data/test62.orig	2007-02-11 13:56:10.000000000 +1100
++++ curl-7.15.5/tests/data/test62	2007-02-11 14:01:18.000000000 +1100
+@@ -32,9 +32,9 @@
+ # http://www.netscape.com/newsref/std/cookie_spec.html
+ # This file was generated by libcurl! Edit at your own risk.
+ 
+-.foo.com	TRUE	/we/want/	FALSE	1170327387	test	yes
+-.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test2	yes
+-.fake.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test4	yes
++.foo.com	TRUE	/we/want/	FALSE	1577802600	test	yes
++.host.foo.com	TRUE	/we/want/	FALSE	1577802600	test2	yes
++.fake.host.foo.com	TRUE	/we/want/	FALSE	1577802600	test4	yes
+ 
+ .foo.com	TRUE	/moo	TRUE	0	test3	maybe
+ </file>
diff --git a/net-misc/curl/files/curl-7.16.1-strip-ldflags.patch b/net-misc/curl/files/curl-7.16.1-strip-ldflags.patch
new file mode 100644
index 000000000000..78e44efc4367
--- /dev/null
+++ b/net-misc/curl/files/curl-7.16.1-strip-ldflags.patch
@@ -0,0 +1,10 @@
+--- curl-7.16.1/libcurl.pc.in.orig	2007-02-11 14:26:33.000000000 +1100
++++ curl-7.16.1/libcurl.pc.in	2007-02-11 14:26:46.000000000 +1100
+@@ -33,6 +33,6 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@
++Libs: -L${libdir} -lcurl
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/net-misc/curl/files/digest-curl-7.16.1 b/net-misc/curl/files/digest-curl-7.16.1
new file mode 100644
index 000000000000..91f19474a4ac
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.16.1
@@ -0,0 +1,3 @@
+MD5 acdab0b0467c55e10ed02d2afed80575 curl-7.16.1.tar.bz2 1592074
+RMD160 8251efba8f4bde512b7cf68ad0acb5efb4302d9b curl-7.16.1.tar.bz2 1592074
+SHA256 257b204acf1d80314694b4cf63cccbc7c70bccee75cb3d9924bbb061ec6bccef curl-7.16.1.tar.bz2 1592074