cleanup

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

13 files changed, 11 insertions, 867 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index f45818c2a8b0..6fc7ace8a820 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.141 2009/03/04 20:00:22 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.142 2009/03/08 00:05:08 dragonheart Exp $
+
+  08 Mar 2009; Daniel Black <dragonheart@gentoo.org>
+  -files/curl-7.15.1-test62.patch, -files/curl-7.15-strip-ldflags.patch,
+  -files/curl-7.16.2-strip-ldflags.patch,
+  -files/curl-7.17.1-null-handler-segfault.patch,
+  -files/curl-7.18.2-nss-threadsafe.patch, -files/libcurl-gnutlscert.patch,
+  -curl-7.16.4.ebuild, -curl-7.17.1.ebuild, -curl-7.18.2.ebuild,
+  -curl-7.19.2.ebuild, -curl-7.19.3.ebuild:
+  cleanup
 
   04 Mar 2009; Tobias Scherbaum <dertobi123@gentoo.org> curl-7.19.4.ebuild:
   ppc stable, bug #260361
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 50a1ec6e2af7..0f82f13ff599 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,21 +1,5 @@
-AUX curl-7.15-strip-ldflags.patch 636 RMD160 da2a9e8137eb71f0d077d66b9e1580235027f537 SHA1 b8ab23f437d09be49a8f368be8b1822432ab2a93 SHA256 b86804e3a9e3ba9d841e85b2832dc1323dd52895e1b533d0a5782ab668a9609f
-AUX curl-7.15.1-test62.patch 673 RMD160 4f9bd6355cc2289755892ae4142f9853b870a50a SHA1 4c2a0312d9f07ef42493a7138954cab53e8a7d9d SHA256 907e23481083da32f2f85d586067d1f51e3eddc1dd11157c70a2573bea66eec1
-AUX curl-7.16.2-strip-ldflags.patch 844 RMD160 2a4efcf28a438fb8a397f40ff75a49e78f77b4e8 SHA1 abb778120ef4f928f6a0bf4616f7e489768f044c SHA256 f1ae7d976648287b6b083c76b1fa87eb43850396831f43ac33c3e60c3e729ed6
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
-AUX curl-7.17.1-null-handler-segfault.patch 2560 RMD160 3f1ce2cab67588b132fa6ad30e49f887e6d16f0a SHA1 e6b20baa6306b26c3dc8ffe78fc0d34c5b531b1b SHA256 6f696c4b1d6ae216225fb2cd9e95527d7513872aae06abef05c35758a3d30887
-AUX curl-7.18.2-nss-threadsafe.patch 1808 RMD160 339c8773a6693aed858d12577ff135a353d72be8 SHA1 99026e10ba2289a851005b2a694b3bc2df44c7ce SHA256 aa4691d020fa027a55dc035aafa054fa1a934ce8680f05371673702e2cc3fd90
-AUX libcurl-gnutlscert.patch 1498 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfffe SHA1 6ef8e0887431e62328cc020cad5fb10673336ad3 SHA256 4b0a9db99ddc698c39484a95cba1f52c0dc17ed34f2d7e1dd780f925bf21761b
-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.2.tar.bz2 1744472 RMD160 d82bcdcdbc18d44a833f8824555ded09b03cd859 SHA1 0a4d6878d6be22bb2d701a6cf9bf665f66fc8b87 SHA256 b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
-DIST curl-7.19.2.tar.bz2 2168458 RMD160 e1a609ee205818206008c4990399045f1e7c22e6 SHA1 ba6273faca36e8e81046578080174160212ad73a SHA256 60091fe65ad3aed9b5151cb4e8fcfaf56567c5ae705fdf4246854625eb91c272
-DIST curl-7.19.3.tar.bz2 2238923 RMD160 8f3074728776d6ad8e3c129eb63b41258a29552a SHA1 c2ee72537d422bac1b10d8bfaa0401c12a3b2407 SHA256 965608e49500fb548ab3308556462fdc950474ab7646daaed77051d791093222
 DIST curl-7.19.4.tar.bz2 2296879 RMD160 91f46c421e0f23f268640d39f45a74621e951245 SHA1 6b8cb206990cd68d8653cea16a47bd0febd5c50d SHA256 fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
-EBUILD curl-7.16.4.ebuild 3131 RMD160 0f59c206dbb61de7b778a76ab48205715545f042 SHA1 adda0afc7fe48fbae677f0c52ae24afc6019a1db SHA256 be3ff7d0776977ae7a2e4ac905b4d2f231a6395d92181e2215bb9678d0baf0c2
-EBUILD curl-7.17.1.ebuild 3862 RMD160 7ab7dab638a3789798941419fdf1b23935e73797 SHA1 83fd7d4f8b37215fe00cb0784ba676a0821c09ea SHA256 5659abb5f9a21e3f7014043bb7811f16a34e0d0394602c61e219f15313f1e0fc
-EBUILD curl-7.18.2.ebuild 3577 RMD160 94039dc537acf2cf5a2899801afd992425bc7ffb SHA1 00b61547ac9ce665aa9f5015e0b09048db88061f SHA256 3ad1c2f649345b90c13764280d3401cb410c6309f2aa404e7349dd7357e97713
-EBUILD curl-7.19.2.ebuild 3586 RMD160 b1af78d33d4ada640ee8dc9e8a46e8ab0cd6a2f2 SHA1 aded38b3c82ce56a3e4a0d9ae52a02edd53475ce SHA256 677ab472556f031d7bd559caf8f1dc03c8ded91b239cc961ee68b07dbb94b6c4
-EBUILD curl-7.19.3.ebuild 3574 RMD160 c158b862970416c6e88c54c240bdbf255f96c716 SHA1 410d0e18c56dd5e32f1f6ba9c2b06d9c8693a789 SHA256 dde9c16cc4f432615e9be2bedf3838c3e5cd2f3cebfbace1935194c024dcc555
 EBUILD curl-7.19.4.ebuild 3315 RMD160 f2753cdecfc1494ec2c83a994921b32cfdf90538 SHA1 b5920f7e09a7b797ce6fdaac17063aec6a9aad78 SHA256 24fcbde1edacb233bff9b3feabef780b91109a963df35f3cdb0d53fc8e7e82ec
-MISC ChangeLog 24211 RMD160 3ddb36e5331ffe859519c111895373b867332ce0 SHA1 e763f029d8ab2539b539d7be9cb542ce3447832e SHA256 47cd7c4d502f1600c5e2358cfd44aa5cf21d6afed56dcf9627647272667b9f55
+MISC ChangeLog 24626 RMD160 386450f13221480acb7b6b4e3677659b8d66c1d6 SHA1 abe852409291722a3fb998a09bd50b71037f0d4b SHA256 ba2a8979b7e176f6bf361876f5f5445091c518a8e8f23502ac0407d4d471f446
 MISC metadata.xml 436 RMD160 38b4e6412c390a8f0eeb8ec44ec28debb77845dc SHA1 5a633019278deea417f46857c3d81ae7c830acbf SHA256 319a564ca12822409b29c2e52d39d3f7e7a918d3d73cb6deb5139c6aea2cc33a
diff --git a/net-misc/curl/curl-7.16.4.ebuild b/net-misc/curl/curl-7.16.4.ebuild
deleted file mode 100644
index c1198a466059..000000000000
--- a/net-misc/curl/curl-7.16.4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.16.4.ebuild,v 1.12 2008/04/01 13:46:49 dragonheart Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit autotools 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.haxx.se/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 nss idn kerberos test"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-	nss? ( !gnutls? ( dev-libs/nss ) )
-	ssl? ( !gnutls? ( !nss? ( dev-libs/openssl ) ) )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.4.0 )
-	kerberos? ( virtual/krb5 )
-	app-misc/ca-certificates"
-
-# net-libs/libssh2 (masked) --with-libssh2
-# 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}"/${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
-		--disable-sspi
-		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-		--without-krb4
-		--without-libssh2
-		--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"
-	elif use nss; then
-		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-	elif use ssl; then
-		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-	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
-}
diff --git a/net-misc/curl/curl-7.17.1.ebuild b/net-misc/curl/curl-7.17.1.ebuild
deleted file mode 100644
index 386b59d12b1a..000000000000
--- a/net-misc/curl/curl-7.17.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.17.1.ebuild,v 1.9 2008/12/07 11:05:47 vapier 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 ~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"
-
-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 )"
-
-# net-libs/libssh2 (masked) --with-libssh2
-# 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}"/${P}-strip-ldflags.patch
-	epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.patch
-	epatch	"${FILESDIR}"/${P}-null-handler-segfault.patch
-	elibtoolize
-}
-
-src_compile() {
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi /usr)
-		$(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
-		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-		--without-krb4
-		--without-libssh2
-		--without-spnego"
-#		$(use_with libssh2)
-
-	if use ldap && use kerberos; then
-		die 'ldap and kerberos (gssapi) not playing nicely try version >=7.18.1'
-	fi
-
-	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"
-	elif use nss; then
-		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-	elif use ssl; then
-		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-	else
-		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf} || die 'configure failed'
-	emake || die "install failed for current version"
-}
-
-src_test() {
-	if use gnutls; then
-		elog 'disabling test 405 ftps as gnutls does differing return codes'
-		elog 'that the test case does not allow for. '
-		elog 'https://bugs.gentoo.org/show_bug.cgi?id=204130 refers'
-		cd "${S}"/tests
-		./runtests.pl -a -s '!405' || die 'self test failed'
-	else
-		make check || die 'self test failed'
-	fi
-}
-
-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
-}
diff --git a/net-misc/curl/curl-7.18.2.ebuild b/net-misc/curl/curl-7.18.2.ebuild
deleted file mode 100644
index f58e9bb0fc9b..000000000000
--- a/net-misc/curl/curl-7.18.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.9 2008/12/07 11:05:47 vapier 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
-	epatch "${FILESDIR}"/curl-7.18.2-nss-threadsafe.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
-}
diff --git a/net-misc/curl/curl-7.19.2.ebuild b/net-misc/curl/curl-7.19.2.ebuild
deleted file mode 100644
index 17f7f1759930..000000000000
--- a/net-misc/curl/curl-7.19.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.2.ebuild,v 1.1 2008/11/22 05:33:50 loki_val 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
-}
diff --git a/net-misc/curl/curl-7.19.3.ebuild b/net-misc/curl/curl-7.19.3.ebuild
deleted file mode 100644
index 22b7bf87d9fb..000000000000
--- a/net-misc/curl/curl-7.19.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.3.ebuild,v 1.7 2009/02/17 17:12:51 armin76 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
-}
diff --git a/net-misc/curl/files/curl-7.15-strip-ldflags.patch b/net-misc/curl/files/curl-7.15-strip-ldflags.patch
deleted file mode 100644
index 5c5999aee657..000000000000
--- a/net-misc/curl/files/curl-7.15-strip-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- curl-7.15.4/curl-config.in	2006-05-02 23:48:22.000000000 +0100
-+++ curl-7.15.4/curl-config.in	2006-07-17 12:32:59.000000000 +0100
-@@ -181,7 +181,7 @@
-        	;;
- 
-     --libs)
--       	echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@
-+       	echo -L@libdir@ -lcurl @LIBS@
-        	;;
- 
-     *)
---- curl-7.15.4/libcurl.pc.in	2004-12-11 18:46:40.000000000 +0000
-+++ curl-7.15.4/libcurl.pc.in	2006-07-17 12:33:10.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: libcurl
- Description: Library to transfer files with ftp, http, etc.
- Version: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-+Libs: -L${libdir} -lcurl @LIBS@
- Cflags: -I${includedir}
diff --git a/net-misc/curl/files/curl-7.15.1-test62.patch b/net-misc/curl/files/curl-7.15.1-test62.patch
deleted file mode 100644
index 15ec36372d72..000000000000
--- a/net-misc/curl/files/curl-7.15.1-test62.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.2-strip-ldflags.patch b/net-misc/curl/files/curl-7.16.2-strip-ldflags.patch
deleted file mode 100644
index 1c33fc5f8e1d..000000000000
--- a/net-misc/curl/files/curl-7.16.2-strip-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- curl-7.16.2/libcurl.pc.in.orig	2007-04-14 10:11:14.000000000 +1000
-+++ curl-7.16.2/libcurl.pc.in	2007-04-14 10:11:26.000000000 +1000
-@@ -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@
-+Libs: -L${libdir} -lcurl @LIBS@
- Libs.private: @LIBCURL_LIBS@ @LIBS@
- Cflags: -I${includedir}
---- curl-7.16.3/curl-config.in.orig	2007-06-28 22:22:51.000000000 +1000
-+++ curl-7.16.3/curl-config.in	2007-06-28 22:23:10.000000000 +1000
-@@ -187,9 +187,9 @@
- 	   CURLLIBDIR=""
- 	fi
- 	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
- 	else
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBS@
- 	fi
- 	;;
- 
diff --git a/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch b/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch
deleted file mode 100644
index 0d3b766e9175..000000000000
--- a/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Segfault in CURL (used from PHP)
-Found by Robin H. Johnson <robbat2@gentoo.org>
-This was because of an invalid URL: /hash/597cfbe5740d2bf91eb4b037e6750bacd76d3729/added
-
-#0  0x00002b33e61ba166 in Curl_disconnect (conn=0xe46210) at url.c:2077
-2077	  if(conn->handler->disconnect)
-(gdb) print conn->handler
-$1 = (const struct Curl_handler *) 0x0
-(gdb) bt full
-#0  0x00002b33e61ba166 in Curl_disconnect (conn=0xe46210) at url.c:2077
-	data = (struct SessionHandle *) 0xe363d0
-#1  0x00002b33e61bc27e in Curl_connect (data=0xe363d0, in_connect=0x7fffc6067818, asyncp=0x7fffc6067827, protocol_done=0x7fffc6067826) at url.c:4255
-	connected = false
-	code = CURLE_OK
-	dns = (struct Curl_dns_entry *) 0x0
-#2  0x00002b33e61c67db in Curl_perform (data=0xe363d0) at transfer.c:2333
-	res = CURLE_OK
-	res2 = <value optimized out>
-	conn = (struct connectdata *) 0xe46210
-	newurl = 0x0
-	retry = 232
-#3  0x0000000000472005 in zif_curl_exec ()
-#4  0x000000000061bd42 in ?? ()
-#5  0x000000000061ae23 in execute ()
-#6  0x000000000061b815 in ?? ()
-#7  0x000000000061ae23 in execute ()
-#8  0x00000000005fcef3 in zend_execute_scripts ()
-#9  0x00000000005bd468 in php_execute_script ()
-#10 0x00000000006791ab in main ()
-
-diff -Nuar curl-7.17.1-20071013.orig/lib/url.c curl-7.17.1-20071013/lib/url.c
---- curl-7.17.1-20071013.orig/lib/url.c	2007-10-13 02:00:02.000000000 +0000
-+++ curl-7.17.1-20071013/lib/url.c	2007-11-12 13:13:37.401514781 +0000
-@@ -2594,7 +2594,7 @@
-                           curl_socket_t *socks,
-                           int numsocks)
- {
--  if(conn->handler->proto_getsock)
-+  if(conn && conn->handler && conn->handler->proto_getsock)
-     return conn->handler->proto_getsock(conn, socks, numsocks);
-   return GETSOCK_BLANK;
- }
-@@ -4325,7 +4325,7 @@
-   }
- 
-   /* this calls the protocol-specific function pointer previously set */
--  if(conn->handler->done)
-+  if(conn->handler && conn->handler->done)
-     result = conn->handler->done(conn, status, premature);
-   else
-     result = CURLE_OK;
-@@ -4378,7 +4378,7 @@
-   conn->bits.done = FALSE; /* Curl_done() is not called yet */
-   conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */
- 
--  if(conn->handler->do_it) {
-+  if(conn->handler && conn->handler->do_it) {
-     /* generic protocol-specific function pointer set in curl_connect() */
-     result = conn->handler->do_it(conn, done);
- 
-@@ -4441,7 +4441,7 @@
- {
-   CURLcode result=CURLE_OK;
- 
--  if(conn->handler->do_more)
-+  if(conn->handler && conn->handler->do_more)
-     result = conn->handler->do_more(conn);
- 
-   return result;
diff --git a/net-misc/curl/files/curl-7.18.2-nss-threadsafe.patch b/net-misc/curl/files/curl-7.18.2-nss-threadsafe.patch
deleted file mode 100644
index a45120283c13..000000000000
--- a/net-misc/curl/files/curl-7.18.2-nss-threadsafe.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-===================================================================
-RCS file: /cvsroot/curl/curl/lib/nss.c,v
-retrieving revision 1.33
-retrieving revision 1.34
-diff -u -r1.33 -r1.34
---- curl/lib/nss.c	2008/09/06 05:29:06	1.33
-+++ curl/lib/nss.c	2008/09/23 10:27:04	1.34
-@@ -78,7 +78,9 @@
- 
- PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
- 
--int initialized = 0;
-+PRLock * nss_initlock = NULL;
-+
-+volatile int initialized = 0;
- 
- #define HANDSHAKE_TIMEOUT 30
- 
-@@ -837,8 +839,11 @@
-  */
- int Curl_nss_init(void)
- {
--  if(!initialized)
-+  /* curl_global_init() is not thread-safe so this test is ok */
-+  if (nss_initlock == NULL) {
-     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
-+    nss_initlock = PR_NewLock();
-+  }
- 
-   /* We will actually initialize NSS later */
- 
-@@ -848,7 +853,17 @@
- /* Global cleanup */
- void Curl_nss_cleanup(void)
- {
--  NSS_Shutdown();
-+  /* This function isn't required to be threadsafe and this is only done
-+   * as a safety feature.
-+   */
-+  PR_Lock(nss_initlock);
-+  if (initialized)
-+    NSS_Shutdown();
-+  PR_Unlock(nss_initlock);
-+
-+  PR_DestroyLock(nss_initlock);
-+  nss_initlock = NULL;
-+
-   initialized = 0;
- }
- 
-@@ -926,7 +941,8 @@
-     return CURLE_OK;
- 
-   /* FIXME. NSS doesn't support multiple databases open at the same time. */
--  if(!initialized) {
-+  PR_Lock(nss_initlock);
-+  if(!initialized && !NSS_IsInitialized()) {
-     initialized = 1;
- 
-     certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -950,6 +966,8 @@
-     if(rv != SECSuccess) {
-       infof(conn->data, "Unable to initialize NSS database\n");
-       curlerr = CURLE_SSL_CACERT_BADFILE;
-+      initialized = 0;
-+      PR_Unlock(nss_initlock);
-       goto error;
-     }
- 
-@@ -972,6 +990,7 @@
-     }
- #endif
-   }
-+  PR_Unlock(nss_initlock);
- 
-   model = PR_NewTCPSocket();
-   if(!model)
diff --git a/net-misc/curl/files/libcurl-gnutlscert.patch b/net-misc/curl/files/libcurl-gnutlscert.patch
deleted file mode 100644
index f905701c0842..000000000000
--- a/net-misc/curl/files/libcurl-gnutlscert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: lib/gtls.c
-===================================================================
-RCS file: /cvsroot/curl/curl/lib/gtls.c,v
-retrieving revision 1.27
-diff -u -r1.27 gtls.c
---- lib/gtls.c	28 Apr 2007 21:01:30 -0000	1.27
-+++ lib/gtls.c	10 Jul 2007 20:27:43 -0000
-@@ -420,6 +420,43 @@
-   else
-     infof(data, "\t common name: %s (matched)\n", certbuf);
- 
-+  /* Check for time-based validity */
-+  clock = gnutls_x509_crt_get_expiration_time(x509_cert);
-+
-+  if(clock == (time_t)-1) {
-+    failf(data, "server cert expiration date verify failed");
-+    return CURLE_SSL_CONNECT_ERROR;
-+  }
-+
-+  if(clock < time(NULL)) {
-+    if (data->set.ssl.verifypeer) {
-+      failf(data, "server certificate expiration date has passed.");
-+      return CURLE_SSL_PEER_CERTIFICATE;
-+    }
-+    else
-+      infof(data, "\t server certificate expiration date FAILED\n");
-+  }
-+  else
-+    infof(data, "\t server certificate expiration date OK\n");
-+
-+  clock = gnutls_x509_crt_get_activation_time(x509_cert);
-+
-+  if(clock == (time_t)-1) {
-+    failf(data, "server cert activation date verify failed");
-+    return CURLE_SSL_CONNECT_ERROR;
-+  }
-+
-+  if(clock > time(NULL)) {
-+    if (data->set.ssl.verifypeer) {
-+      failf(data, "server certificate not activated yet.");
-+      return CURLE_SSL_PEER_CERTIFICATE;
-+    }
-+    else
-+      infof(data, "\t server certificate activation date FAILED\n");
-+  }
-+  else
-+    infof(data, "\t server certificate activation date OK\n");
-+
-   /* Show:
- 
-   - ciphers used