From: Daniel Black <dragonheart@gentoo.org>
Date: Wed, 18 Apr 2007 11:04:51 +0000 (+0000)
Subject: snapshot. still does not fix some self test fails will look later. TESTFAIL: These... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01c4d38dae175750b732ec685ca6b21a0ce7491a;p=gentoo.git

snapshot. still does not fix some self test fails will look later. TESTFAIL: These test cases failed: 300 301 304 305 306 400 401 403 404 405
Package-Manager: portage-2.1.2.2
---

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index c3465bfa555b..0963b4913c1f 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.81 2007/04/14 00:35:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.82 2007/04/18 11:04:51 dragonheart Exp $
+
+*curl-7.16.3_pre20070418 (18 Apr 2007)
+
+  18 Apr 2007; Daniel Black <dragonheart@gentoo.org>
+  +curl-7.16.3_pre20070418.ebuild:
+  snapshot. still does not fix some self test fails will look later. TESTFAIL:
+  These test cases failed: 300 301 304 305 306 400 401 403 404 405
 
 *curl-7.16.2 (14 Apr 2007)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 5f613260579b..4fe853530e69 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -25,6 +25,7 @@ SHA256 2da722f848cd4e3b7748598676e2c4d895273e9c21b129585509df155aa2f818 files/cu
 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
 DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 SHA1 b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7 SHA256 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
 DIST curl-7.16.2.tar.bz2 1664414 RMD160 28edfab5659d410bf00725a0ac7228583fc171b6 SHA1 b23d35b5af7b75e53c6632cd4c9d0cb0c08cafe5 SHA256 2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2
+DIST curl-7.16.3-20070418.tar.bz2 1710368 RMD160 323553de20da5abb66f146dde10fb7f5e0933607 SHA1 c4d7925d56525e23e7b15f8e9f2c1274f6241d56 SHA256 6e1a99e906c8560ffd9150ba8d23cee480a67f254c178846100f27a09fbcf85b
 EBUILD curl-7.15.1-r1.ebuild 2259 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c SHA1 a042998854a51d5d29396fa1e1352528d2c4558a SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7
 MD5 a8d25b53972d71f84e5e035c5b248a1c curl-7.15.1-r1.ebuild 2259
 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c curl-7.15.1-r1.ebuild 2259
@@ -37,10 +38,14 @@ EBUILD curl-7.16.2.ebuild 2479 RMD160 5472182dee948d957137f588600acdc219299e38 S
 MD5 63c9572241b7f0d8865bd87f0ff69d96 curl-7.16.2.ebuild 2479
 RMD160 5472182dee948d957137f588600acdc219299e38 curl-7.16.2.ebuild 2479
 SHA256 38d0a2761063c7229c2744187472ef2b47abed55e041b39095aa5cac61a9c6c5 curl-7.16.2.ebuild 2479
-MISC ChangeLog 15688 RMD160 42f5b2d84500175518105bac598ff2f467356a62 SHA1 34dc8591dabbde7b44ba0066705cce1f95904724 SHA256 0c2780280e8bc3dc2960b136bfb9f6a8af775ef4cf08189d00851db1f2ebc7d8
-MD5 4ddb708e11d8bf300f606307baae31b7 ChangeLog 15688
-RMD160 42f5b2d84500175518105bac598ff2f467356a62 ChangeLog 15688
-SHA256 0c2780280e8bc3dc2960b136bfb9f6a8af775ef4cf08189d00851db1f2ebc7d8 ChangeLog 15688
+EBUILD curl-7.16.3_pre20070418.ebuild 2644 RMD160 6ca526f98e9c152c332eaa390676521ceb809af3 SHA1 176572b670211b9fb01c0fd05bd36f0da82d6550 SHA256 48dccb3dc89062fa157daa8e5dc3fe46905a520022965297d53eaeaec404efe6
+MD5 97bdfb7b40ab4a782e5f8e16921a15bb curl-7.16.3_pre20070418.ebuild 2644
+RMD160 6ca526f98e9c152c332eaa390676521ceb809af3 curl-7.16.3_pre20070418.ebuild 2644
+SHA256 48dccb3dc89062fa157daa8e5dc3fe46905a520022965297d53eaeaec404efe6 curl-7.16.3_pre20070418.ebuild 2644
+MISC ChangeLog 15963 RMD160 5b5ea09278731f69a8025de1c6db75582b0a297f SHA1 8cb1d0af4473bbef3d5f3f2167e03c4416432580 SHA256 6c15cf24fe534120f74df365ca1ac64a1d15291cc3dc5c5a58f38565621a4c72
+MD5 1d90ccb2ffe3d804660b7ac0ba0bd363 ChangeLog 15963
+RMD160 5b5ea09278731f69a8025de1c6db75582b0a297f ChangeLog 15963
+SHA256 6c15cf24fe534120f74df365ca1ac64a1d15291cc3dc5c5a58f38565621a4c72 ChangeLog 15963
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -54,3 +59,6 @@ SHA256 7421859a42befe5d3c3777b0e96e5fb1f3d55fc0f9616b039237eb9ecac5e1e0 files/di
 MD5 57fc5c81fa904d2fe9095d04b87f68ea files/digest-curl-7.16.2 241
 RMD160 941f9bb82eca7ba8e07971c93113c4581eea1c0d files/digest-curl-7.16.2 241
 SHA256 94b4f93c722c48109a9f596b8d2f8db7d370985905e0ea9a6f576e5779256d49 files/digest-curl-7.16.2 241
+MD5 6d7a6c6d083e03853d5e63ef1019b1ec files/digest-curl-7.16.3_pre20070418 268
+RMD160 0d7530b41a33f6ee83f36956c7d4e03c5141c47c files/digest-curl-7.16.3_pre20070418 268
+SHA256 184da0c9ce905c1c12d25d269666c0d287c226e8d6fe741b9be92ecc2153b795 files/digest-curl-7.16.3_pre20070418 268
diff --git a/net-misc/curl/curl-7.16.3_pre20070418.ebuild b/net-misc/curl/curl-7.16.3_pre20070418.ebuild
new file mode 100644
index 000000000000..b45e6266c4ae
--- /dev/null
+++ b/net-misc/curl/curl-7.16.3_pre20070418.ebuild
@@ -0,0 +1,100 @@
+# 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.3_pre20070418.ebuild,v 1.1 2007/04/18 11:04:51 dragonheart Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit libtool 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"
+
+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 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 )"
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+#	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
+	epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.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 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/digest-curl-7.16.1 b/net-misc/curl/files/digest-curl-7.16.1
deleted file mode 100644
index 91f19474a4ac..000000000000
--- a/net-misc/curl/files/digest-curl-7.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-misc/curl/files/digest-curl-7.16.3_pre20070418 b/net-misc/curl/files/digest-curl-7.16.3_pre20070418
new file mode 100644
index 000000000000..ce47406bde47
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.16.3_pre20070418
@@ -0,0 +1,3 @@
+MD5 cc759ca0b631fb2f4b55cb20ab78dc56 curl-7.16.3-20070418.tar.bz2 1710368
+RMD160 323553de20da5abb66f146dde10fb7f5e0933607 curl-7.16.3-20070418.tar.bz2 1710368
+SHA256 6e1a99e906c8560ffd9150ba8d23cee480a67f254c178846100f27a09fbcf85b curl-7.16.3-20070418.tar.bz2 1710368