Remove older unstable versions

(Portage version: 2.1.10.65/cvs/Linux x86_64)

8 files changed, 7 insertions, 884 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 3764e4f9c29e..332321a87773 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.226 2012/06/25 19:20:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.227 2012/06/26 22:27:46 blueness Exp $
+
+  26 Jun 2012; Anthony G. Basile <blueness@gentoo.org> -curl-7.21.6.ebuild,
+  -curl-7.21.7.ebuild, -curl-7.21.7-r2.ebuild, -curl-7.22.0.ebuild,
+  -curl-7.23.1.ebuild, -curl-7.25.0.ebuild,
+  -files/curl-7.21.7-examples-fix-headers.patch:
+  Remove older unstable versions
 
   25 Jun 2012; Markus Meier <maekke@gentoo.org> curl-7.25.0-r1.ebuild:
   arm stable, bug #421479
diff --git a/net-misc/curl/curl-7.21.6.ebuild b/net-misc/curl/curl-7.21.6.ebuild
deleted file mode 100644
index 9503fb2fa8f5..000000000000
--- a/net-misc/curl/curl-7.21.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.4 2012/05/05 03:20:41 jdhore Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-EAPI=4
-
-inherit autotools multilib eutils libtool prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.4.0 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl )
-	nss? ( ssl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags.patch
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with ssh libssh2)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-		$(use_enable threads threaded-resolver)
-		$(use_enable ares)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-smtp
-		--enable-pop3
-		--enable-imap
-		--enable-rtsp
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode
-		--disable-sspi
-		--without-krb4
-		--without-librtmp
-		--without-spnego"
-
-	if use ssl ; then
-		if use gnutls; then
-			myconf+=" --without-ssl --with-gnutls --without-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		elif use nss; then
-			myconf+=" --without-ssl --without-gnutls --with-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		else
-			myconf+=" --without-gnutls --without-nss --with-ssl"
-			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-		fi
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/curl-7.21.7-r2.ebuild b/net-misc/curl/curl-7.21.7-r2.ebuild
deleted file mode 100644
index e3f2db1e3509..000000000000
--- a/net-misc/curl/curl-7.21.7-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.6 2012/05/05 03:20:41 jdhore Exp $
-
-EAPI=4
-
-inherit autotools multilib eutils libtool prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.6 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl )
-	nss? ( ssl )
-	nss? ( !gnutls )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${P}-examples-fix-headers.patch
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with ssh libssh2)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-		$(use_enable threads threaded-resolver)
-		$(use_enable ares)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-smtp
-		--enable-pop3
-		--enable-imap
-		--enable-rtsp
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode
-		--disable-sspi
-		--without-krb4
-		--without-librtmp
-		--without-spnego"
-
-	if use ssl ; then
-		if use gnutls; then
-			myconf+=" --without-ssl --with-gnutls --without-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		elif use nss; then
-			myconf+=" --without-ssl --without-gnutls --with-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		else
-			myconf+=" --without-gnutls --without-nss --with-ssl"
-			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-		fi
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	default
-	ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/curl-7.21.7.ebuild b/net-misc/curl/curl-7.21.7.ebuild
deleted file mode 100644
index 333f24f4bce2..000000000000
--- a/net-misc/curl/curl-7.21.7.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.7 2012/05/05 03:20:41 jdhore Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-EAPI=4
-
-inherit autotools multilib eutils libtool prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.6 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl )
-	nss? ( ssl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-2.patch \
-		"${FILESDIR}"/${P}-examples-fix-headers.patch
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with ssh libssh2)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-		$(use_enable threads threaded-resolver)
-		$(use_enable ares)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-smtp
-		--enable-pop3
-		--enable-imap
-		--enable-rtsp
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode
-		--disable-sspi
-		--without-krb4
-		--without-librtmp
-		--without-spnego"
-
-	if use ssl ; then
-		if use gnutls; then
-			myconf+=" --without-ssl --with-gnutls --without-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		elif use nss; then
-			myconf+=" --without-ssl --without-gnutls --with-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		else
-			myconf+=" --without-gnutls --without-nss --with-ssl"
-			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-		fi
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/curl-7.22.0.ebuild b/net-misc/curl/curl-7.22.0.ebuild
deleted file mode 100644
index f0ff5efa8e39..000000000000
--- a/net-misc/curl/curl-7.22.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.5 2012/05/05 03:20:41 jdhore Exp $
-
-EAPI=4
-
-inherit autotools multilib eutils libtool prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )
-	nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.6 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	nss? ( !gnutls )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with ssh libssh2)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-		$(use_enable threads threaded-resolver)
-		$(use_enable ares)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-smtp
-		--enable-pop3
-		--enable-imap
-		--enable-rtsp
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode
-		--disable-sspi
-		--without-krb4
-		--without-librtmp
-		--without-spnego"
-
-	if use gnutls; then
-		myconf+=" --without-ssl --with-gnutls --without-nss"
-		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-	elif use ssl; then
-		myconf+=" --without-gnutls --without-nss --with-ssl"
-		myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-	elif use nss; then
-		myconf+=" --without-ssl --without-gnutls --with-nss"
-		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	default
-	ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/curl-7.23.1.ebuild b/net-misc/curl/curl-7.23.1.ebuild
deleted file mode 100644
index cff30812b63c..000000000000
--- a/net-misc/curl/curl-7.23.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.5 2012/05/05 03:20:41 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )
-	nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.6 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	nss? ( !gnutls )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gnutls; then
-		myconf+=" --without-ssl --with-gnutls --without-nss"
-		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-	elif use ssl; then
-		myconf+=" --without-gnutls --without-nss --with-ssl"
-		myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-	elif use nss; then
-		myconf+=" --without-ssl --without-gnutls --with-nss"
-		myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with ssh libssh2) \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable ares) \
-		--enable-http \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-file \
-		--enable-dict \
-		--enable-manual \
-		--enable-telnet \
-		--enable-smtp \
-		--enable-pop3 \
-		--enable-imap \
-		--enable-rtsp \
-		--enable-nonblocking \
-		--enable-largefile \
-		--enable-maintainer-mode \
-		--disable-sspi \
-		--without-krb4 \
-		--without-librtmp \
-		--without-spnego \
-		${myconf}
-}
-
-src_compile() {
-	default
-	ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/curl-7.25.0.ebuild b/net-misc/curl/curl-7.25.0.ebuild
deleted file mode 100644
index 32f3ccc8639d..000000000000
--- a/net-misc/curl/curl-7.25.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.6 2012/05/05 03:20:41 jdhore Exp $
-
-EAPI="4"
-
-inherit autotools eutils prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-# The logic for Secure Socket Layer support:
-# 1) If USE="ssl" is selected, we definitely get one of gnutls/nss/openssl
-# 2) If USE="-ssl" is selected, we definitely do not get any gnutls/nss/openssl
-# 3) If USE="ssl -gnutls -nss" we get openssl by default
-# 4) Only one of gnutls/nss may be chosen and must be accomanpied by USE="ssl"
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( dev-libs/nss app-misc/ca-certificates )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
-	idn? ( net-dns/libidn )
-	ares? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-	sys-libs/zlib"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --with-spnego
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads
-REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl !nss )
-	nss? ( ssl !gnutls )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use ssl ; then
-		if use gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --without-ssl --with-gnutls   --without-nss )
-			myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
-		elif use nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --without-ssl --without-gnutls --with-nss )
-			myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
-		else #use openssl
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --without-gnutls --without-nss )
-			myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-	else
-		einfo "SSL disabled"
-		myconf+=( --without-ssl --without-gnutls --without-nss )
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	econf \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--enable-pop3 \
-		--without-librtmp \
-		--enable-rtsp \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-nonblocking \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		--without-spnego \
-		--with-zlib \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	default
-	ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die
-	ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-	rm -rf "${ED}"/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
-}
diff --git a/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch b/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch
deleted file mode 100644
index d761a370a247..000000000000
--- a/net-misc/curl/files/curl-7.21.7-examples-fix-headers.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/docs/examples/certinfo.c b/docs/examples/certinfo.c
-index 02558d9..e1463ec 100644
---- a/docs/examples/certinfo.c
-+++ b/docs/examples/certinfo.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static size_t wrfu(void *ptr,  size_t  size,  size_t  nmemb,  void *stream)
-diff --git a/docs/examples/chkspeed.c b/docs/examples/chkspeed.c
-index fbcb1f7..efcf472 100644
---- a/docs/examples/chkspeed.c
-+++ b/docs/examples/chkspeed.c
-@@ -35,7 +35,6 @@
- #include <time.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #define URL_BASE "http://speedtest.your.domain/"
-diff --git a/docs/examples/curlgtk.c b/docs/examples/curlgtk.c
-index 2c44280..59dcd3f 100644
---- a/docs/examples/curlgtk.c
-+++ b/docs/examples/curlgtk.c
-@@ -13,7 +13,6 @@
- #include <gtk/gtk.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h> /* new for v7 */
- #include <curl/easy.h> /* new for v7 */
- 
- GtkWidget *Bar;
-diff --git a/docs/examples/ftpget.c b/docs/examples/ftpget.c
-index 7b5e0d7..3ec17b9 100644
---- a/docs/examples/ftpget.c
-+++ b/docs/examples/ftpget.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- /*
-diff --git a/docs/examples/ftpgetinfo.c b/docs/examples/ftpgetinfo.c
-index 52f87d6..9bf39c3 100644
---- a/docs/examples/ftpgetinfo.c
-+++ b/docs/examples/ftpgetinfo.c
-@@ -23,7 +23,6 @@
- #include <string.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- /*
-diff --git a/docs/examples/ftpgetresp.c b/docs/examples/ftpgetresp.c
-index ea882a0..49b2137 100644
---- a/docs/examples/ftpgetresp.c
-+++ b/docs/examples/ftpgetresp.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- /*
-diff --git a/docs/examples/postit2.c b/docs/examples/postit2.c
-index bb7fd48..470fd8b 100644
---- a/docs/examples/postit2.c
-+++ b/docs/examples/postit2.c
-@@ -37,7 +37,6 @@
- #include <string.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- int main(int argc, char *argv[])
-diff --git a/docs/examples/sepheaders.c b/docs/examples/sepheaders.c
-index dac2878..973e465 100644
---- a/docs/examples/sepheaders.c
-+++ b/docs/examples/sepheaders.c
-@@ -24,7 +24,6 @@
- #include <unistd.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
-diff --git a/docs/examples/simplessl.c b/docs/examples/simplessl.c
-index aeaadce..217622a 100644
---- a/docs/examples/simplessl.c
-+++ b/docs/examples/simplessl.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- 
-diff --git a/docs/examples/smooth-gtk-thread.c b/docs/examples/smooth-gtk-thread.c
-index 8cf106c..b679a27 100644
---- a/docs/examples/smooth-gtk-thread.c
-+++ b/docs/examples/smooth-gtk-thread.c
-@@ -37,7 +37,6 @@
- #include <pthread.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h> /* new for v7 */
- #include <curl/easy.h> /* new for v7 */
- 
- #define NUMT 4