version bump as per bug #246018 thanks to loki_val

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 126 insertions, 2 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 5747ddecf326..e51cb548b9b7 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.128 2008/11/04 04:49:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.129 2008/11/08 00:19:03 dragonheart Exp $
+
+*curl-7.19.1 (08 Nov 2008)
+
+  08 Nov 2008; Daniel Black <dragonheart@gentoo.org> +curl-7.19.1.ebuild:
+  version bump as per bug #246018 thanks to loki_val
 
   04 Nov 2008; Daniel Black <dragonheart@gentoo.org> curl-7.19.0.ebuild:
   eutils needed for epatch
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 405b099698ab..490e818d71f3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -9,9 +9,11 @@ DIST curl-7.16.4.tar.bz2 1668101 RMD160 ee59976f7ce9161be3d5ebdb44903dee597fbd68
 DIST curl-7.17.1.tar.bz2 1721551 RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510 SHA1 ad34b9386e7fd1c8f2a8025e2716a8047b194970 SHA256 7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b
 DIST curl-7.18.2.tar.bz2 1744472 RMD160 d82bcdcdbc18d44a833f8824555ded09b03cd859 SHA1 0a4d6878d6be22bb2d701a6cf9bf665f66fc8b87 SHA256 b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
 DIST curl-7.19.0.tar.bz2 2125703 RMD160 2849e82496eb19bd75792d64f42eaa196e1ebac3 SHA1 fffb34be2e3c66e58a5d3daaf8aa38cae33b284f SHA256 a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7
+DIST curl-7.19.1.tar.bz2 2168565 RMD160 58e7248ebd06f559378be7871a6a689d31ad62f9 SHA1 06f420de694820b4ef331e4e36f85c44053c018a SHA256 740da532ca9760ef0b84324dce4a7be9573e6e8d13734487502b4661c16ca2c2
 EBUILD curl-7.16.4.ebuild 3131 RMD160 0f59c206dbb61de7b778a76ab48205715545f042 SHA1 adda0afc7fe48fbae677f0c52ae24afc6019a1db SHA256 be3ff7d0776977ae7a2e4ac905b4d2f231a6395d92181e2215bb9678d0baf0c2
 EBUILD curl-7.17.1.ebuild 3870 RMD160 479f629576e9f238c6f67e765d0ffae0d70a631c SHA1 4c73cf17dbb2509e75f937b77d43140c26df4c9f SHA256 3cf7021e010c81c3410bcf3a5ead32d241b98c481670410bcb6c65ee1dce29aa
 EBUILD curl-7.18.2.ebuild 3578 RMD160 57c16ff6e964cd659308a60ece4842a60d3679eb SHA1 e62a3e820a0d53948aad55c78d71b3c3c4d72f66 SHA256 fee23717c104be827c372d467ec7354e2461425c3a1e285d534b14ee9a85043e
 EBUILD curl-7.19.0.ebuild 3589 RMD160 67be1542d83731f7ffefc7d56a0a5cb246e82fee SHA1 4638112bae03d5d2371a7266dd8e56822f7ff69e SHA256 0e7d7bd6756c8af1a1894559d1697f83fa7f686f6ad8c1202f746fdfe8fbd9ba
-MISC ChangeLog 22631 RMD160 d9fdfb7b03abd862dc5126e7bf7a9c4beaf40528 SHA1 dc8221cf0ea0f95b8d87698e9f14f8a40d317fc7 SHA256 13331d4a79ae7fdbb0845d8f31f4950fa84c6761e75c5b9e85628a0d45137b80
+EBUILD curl-7.19.1.ebuild 3589 RMD160 94177e99e05bb82baedcbf4410dfe5889b9d74f8 SHA1 67ec5171f6ea887939277be59842049e6c000c2e SHA256 4e71354046678f50448469a73411a8b216f77c0da919ee33e7e4ac1675f814df
+MISC ChangeLog 22787 RMD160 e9d271257fc5a0d336c316774c11f7e4941161c1 SHA1 2ba5cc89e4b62f22132f3bccb28459552988bfb9 SHA256 9abc2b106c83bf36d9fb37183e7286874ff96a48678031fc1e2bde5e9e010d99
 MISC metadata.xml 436 RMD160 38b4e6412c390a8f0eeb8ec44ec28debb77845dc SHA1 5a633019278deea417f46857c3d81ae7c830acbf SHA256 319a564ca12822409b29c2e52d39d3f7e7a918d3d73cb6deb5139c6aea2cc33a
diff --git a/net-misc/curl/curl-7.19.1.ebuild b/net-misc/curl/curl-7.19.1.ebuild
new file mode 100644
index 000000000000..94115ac10bd9
--- /dev/null
+++ b/net-misc/curl/curl-7.19.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.1.ebuild,v 1.1 2008/11/08 00:19:03 dragonheart 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 X11"
+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"
+IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
+
+# TODO - change to openssl USE flag in the not too distant future
+# https://bugs.gentoo.org/show_bug.cgi?id=207653#c3 (April 2008)
+
+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 )
+	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
+#S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.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)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-nonblocking
+		--enable-largefile
+		--enable-maintainer-mode
+		--disable-sspi
+		--without-krb4
+		--without-spnego"
+
+	if use ipv6 && use ares; then
+		elog "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 --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"
+	elif use ssl; then
+		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+		myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+	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
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then
+		elog "You must re-compile all packages that are linked against"
+		elog "curl-7.15.* by using revdep-rebuild from gentoolkit:"
+		elog "# revdep-rebuild --library libcurl.so.3"
+	fi
+}