version bump

Package-Manager: portage-2.1.4.4

3 files changed, 128 insertions, 2 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index bcaed4d575ee..2cb6c9f21b4b 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.118 2008/04/05 12:42:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.119 2008/06/07 04:38:07 dragonheart Exp $
+
+*curl-7.18.2 (07 Jun 2008)
+
+  07 Jun 2008; Daniel Black <dragonheart@gentoo.org> +curl-7.18.2.ebuild:
+  version bump
 
   05 Apr 2008; Daniel Black <dragonheart@gentoo.org> curl-7.17.1.ebuild:
   fix for USE=kerberos/-ldap as per bug #216273 thanks to Graham Russell.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f062502fa1dc..49b589b459e5 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,9 +8,11 @@ DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0
 DIST curl-7.16.4.tar.bz2 1668101 RMD160 ee59976f7ce9161be3d5ebdb44903dee597fbd68 SHA1 a26a8796f5fc851b23423bc419c80e27d3e09483 SHA256 45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b
 DIST curl-7.17.1.tar.bz2 1721551 RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510 SHA1 ad34b9386e7fd1c8f2a8025e2716a8047b194970 SHA256 7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b
 DIST curl-7.18.1.tar.bz2 1700966 RMD160 f7dac868b2a449aa92a3466b24fe2bb3309ff1e0 SHA1 685b9388ee9e646158a83cd435f7be664816ad78 SHA256 ccf0ecc8be56b30eebcc39e4787dc86f8f0b1d95313f6d85118f36bd48beae6c
+DIST curl-7.18.2.tar.bz2 1744472 RMD160 d82bcdcdbc18d44a833f8824555ded09b03cd859 SHA1 0a4d6878d6be22bb2d701a6cf9bf665f66fc8b87 SHA256 b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
 EBUILD curl-7.15.5-r1.ebuild 2236 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b SHA1 610f71dff18426d9efac0cd7075acc5bc42b3730 SHA256 3f257480df0b9fe040d374740a9654688b484065c0cdd284787a0a6d314da04d
 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.1.ebuild 3643 RMD160 5d21d9d2995df7b1d513cae442e9504e1a6c068d SHA1 b6c79fe17353168ec091e187118a99c80dc0eae8 SHA256 759f207f314b5f50b1ee60f23da64deb797417e901f1d33bfc776cd344cff590
-MISC ChangeLog 21301 RMD160 89f0584584b4b5492a5af15f15947863bb63fb73 SHA1 0ac4e27b919a2384366ade13aa5e66cc0aa2ef8a SHA256 84a26ca28e7dc0851a4526dc6e944306852c2e463536affb78a43b457299b051
+EBUILD curl-7.18.2.ebuild 3643 RMD160 6b821eea04e0a2989cdd97d28d4787325cb267b5 SHA1 af862abb8ba2ec97b6b51495456f3597d5aa43e5 SHA256 465dd1d61f127a8cb3bb0664772931aab1e1c17da05b74e9372649cced83277b
+MISC ChangeLog 21419 RMD160 39617e0b14628b3e186d3c244ac7f3a5da367a4f SHA1 4d4eeb39ca760b8004042c5214781326630c7aa4 SHA256 923afabcca934fda898a713947349bc4ec81bf07b31cb2b90dd5c4fdab11a63b
 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
diff --git a/net-misc/curl/curl-7.18.2.ebuild b/net-misc/curl/curl-7.18.2.ebuild
new file mode 100644
index 000000000000..98d05a77b82f
--- /dev/null
+++ b/net-misc/curl/curl-7.18.2.ebuild
@@ -0,0 +1,119 @@
+# 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.18.2.ebuild,v 1.1 2008/06/07 04:38:07 dragonheart Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit libtool autotools
+
+#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 ~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
+	# below: bug #216096
+	sed -i -e 's:gssapi/gssapi.h:gssapi/gssapi_generic.h:g' configure.ac
+	eautoreconf
+}
+
+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
+}