more cleanups. old ebuild/patches removed

(Portage version: 2.0.53_rc3)

9 files changed, 13 insertions, 204 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index e2a6bf397df1..9d71542b57f2 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.43 2005/10/15 12:10:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.44 2005/10/15 14:53:28 dragonheart Exp $
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/curl-7.10.8-transfer-segv.patch, -files/7.12.0-no-fputc.patch,
+  -files/curl-7.10.5-badssl.patch, -curl-7.14.0.ebuild, curl-7.15.0.ebuild:
+  more cleanups. old ebuild/patches removed
 
 *curl-7.15.0 (15 Oct 2005)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 893e2c76a8b2..513ed5dc043f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,23 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 90d4320b1d2e88d808e4f105f75561b0 ChangeLog 9745
+MD5 01faed9732e8e8387659006239a166b0 ChangeLog 10003
 MD5 79b7fd0dcd4776ca1851d30a45275e78 curl-7.13.1.ebuild 1140
 MD5 c6b9b093ceb98fd1efbc9ca3700888ec curl-7.13.2.ebuild 2392
-MD5 8b26366ceadb9a0bbdc5036caa8cdeed curl-7.14.0.ebuild 2723
-MD5 eca6fb493a456730691afbed87c8b167 curl-7.15.0.ebuild 3066
-MD5 dc352925b526421b92ff81fc9b8315da files/7.12.0-no-fputc.patch 312
-MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
-MD5 05e37478314d224f2ce5840f2e1f31c9 files/curl-7.10.8-transfer-segv.patch 744
+MD5 d7a927c76ddf384f4c4226090c9cdab2 curl-7.15.0.ebuild 2214
 MD5 159b437588320b2a3f726d3aa55890e5 files/digest-curl-7.13.1 65
 MD5 71c346cc704727e0bdaef7333521adeb files/digest-curl-7.13.2 130
-MD5 147739a83aa9a907c8968007c33f4157 files/digest-curl-7.14.0 130
-MD5 846f0a179fd2f00146d9568a172c7143 files/digest-curl-7.15.0 130
+MD5 7bcded56c13b85b72508c00b8d3d7e73 files/digest-curl-7.15.0 65
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDUPHqmdTrptrqvGERAmW1AJ4lwkLWjLdXwMP1moZJleItuQP5kgCgjbna
-8JKhV7lCjElehHEUTIK3zCs=
-=kihY
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.14.0.ebuild b/net-misc/curl/curl-7.14.0.ebuild
deleted file mode 100644
index e44e42e6d78f..000000000000
--- a/net-misc/curl/curl-7.14.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.14.0.ebuild,v 1.4 2005/08/27 16:02:00 sekretarz Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit eutils
-
-# NOTE: To prevent breakages when upgrading, we compile all the prev
-#       versions we know. We can't slot them because only the libraries
-#       have versioning, all the binaries, manpages don't have versions. 
-
-OLD_PV=7.11.2
-OLD_PV_LIB=libcurl.so.2
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${PN}-${OLD_PV}.tar.bz2
-http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl ipv6 ldap ares gnutls idn"
-
-DEPEND="ssl? ( gnutls? ( net-libs/gnutls ) )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6a ) )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/libidn )
-	x86? ( ares? ( net-dns/c-ares ) )"
-
-_curl_has_old_ver() {
-	if test -s ${ROOT}/usr/$(get_libdir)/${OLD_PV_LIB}; then
-		return 0 # /bin/true
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epunt_cxx
-}
-
-src_compile() {
-
-	myconf="$(use_enable ldap)
-		$(use_with idn libidn)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-nonblocking
-		--enable-largefile"
-
-	if use ipv6 && use ares; then
-		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		ewarn "To enable ares support, emerge with USE='-ipv6'."
-		myconf="${myconf} $(use_enable ipv6)"
-	else
-		if use x86; then
-			myconf="${myconf} $(use_enable ipv6) $(use_enable ares)"
-		fi
-	fi
-
-	if use ssl && 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 _curl_has_old_ver; then
-		einfo "Detected old version of curl - installing compat libs"
-		cd ${WORKDIR}/${PN}-${OLD_PV}
-		econf ${myconf}
-		emake || die "make for old version failed"
-	fi
-
-	cd ${S}
-	econf ${myconf}
-	emake || die "install failed for current version"
-}
-
-src_install() {
-	if _curl_has_old_ver; then
-		cd ${WORKDIR}/${PN}-${OLD_PV}/lib
-		make DESTDIR=${D} install-libLTLIBRARIES || die "install failed for old version"
-	fi
-
-	cd ${S}
-	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/INSTALL docs/INTERNALS docs/LIBCURL
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-misc/curl/curl-7.15.0.ebuild b/net-misc/curl/curl-7.15.0.ebuild
index cb791fb4fcae..f2ac3dfd7240 100644
--- a/net-misc/curl/curl-7.15.0.ebuild
+++ b/net-misc/curl/curl-7.15.0.ebuild
@@ -1,26 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.1 2005/10/15 12:10:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.2 2005/10/15 14:53:28 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
 inherit eutils
 
-# NOTE: To prevent breakages when upgrading, we compile all the prev
-#       versions we know. We can't slot them because only the libraries
-#       have versioning, all the binaries, manpages don't have versions. 
-
-OLD_PV=7.11.2
-OLD_PV_LIB=libcurl.so.2
-
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${PN}-${OLD_PV}.tar.bz2
-		http://curl.haxx.se/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 ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
@@ -38,14 +30,6 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 	)"
 
-_curl_has_old_ver() {
-	if test -s ${ROOT}/usr/$(get_libdir)/${OLD_PV_LIB}; then
-		return 0 # /bin/true
-	else
-		return 1
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	epunt_cxx
@@ -55,7 +39,6 @@ src_compile() {
 
 	myconf="$(use_enable ldap)
 		$(use_with idn libidn)
-		$(use_with krb4)
 		$(use_enable kerberos gssapi)
 		$(use_enable ipv6)
 		--enable-http
@@ -70,7 +53,6 @@ src_compile() {
 
 	if use ipv6 && use ares; then
 		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		ewarn "To enable ares support, emerge with USE='-ipv6'."
 		myconf="${myconf} --disable-ares"
 	else
 		myconf="${myconf} $(use_enable ares)"
@@ -91,25 +73,11 @@ src_compile() {
 		myconf="${myconf} --without-gnutls --without-ssl"
 	fi
 
-	if _curl_has_old_ver; then
-		einfo "Detected old version of curl - installing compat libs"
-		cd ${WORKDIR}/${PN}-${OLD_PV}
-		econf ${myconf}
-		emake || die "make for old version failed"
-	fi
-
-	cd ${S}
-	econf ${myconf}
+	econf ${myconf} || die 'configure failed'
 	emake || die "install failed for current version"
 }
 
 src_install() {
-	if _curl_has_old_ver; then
-		cd ${WORKDIR}/${PN}-${OLD_PV}/lib
-		make DESTDIR=${D} install-libLTLIBRARIES || die "install failed for old version"
-	fi
-
-	cd ${S}
 	make DESTDIR="${D}" install || die "installed failed for current version"
 
 	insinto /usr/share/aclocal
diff --git a/net-misc/curl/files/7.12.0-no-fputc.patch b/net-misc/curl/files/7.12.0-no-fputc.patch
deleted file mode 100644
index ae82320ee800..000000000000
--- a/net-misc/curl/files/7.12.0-no-fputc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- curl-7.12.0/lib/mprintf.c.orig	2004-09-01 00:15:02.408645696 -0400
-+++ curl-7.12.0/lib/mprintf.c	2004-09-01 00:15:13.242998624 -0400
-@@ -1140,9 +1140,6 @@
-   return retcode;
- }
- 
--#ifndef WIN32 /* not needed on win32 */
--extern int fputc(int, FILE *);
--#endif
- 
- int curl_mprintf(const char *format, ...)
- {
diff --git a/net-misc/curl/files/curl-7.10.5-badssl.patch b/net-misc/curl/files/curl-7.10.5-badssl.patch
deleted file mode 100644
index eeb4ad90571f..000000000000
--- a/net-misc/curl/files/curl-7.10.5-badssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- curl-7.10.5/lib/ssluse.c	2003-05-01 14:37:36.000000000 +0100
-+++ curl-7.10.5/lib/ssluse.c.new	2003-06-13 22:43:31.000000000 +0100
-@@ -786,6 +786,8 @@
-     return CURLE_OUT_OF_MEMORY;
-   }
-     
-+  SSL_CTX_set_options(conn->ssl.ctx, SSL_OP_ALL);
-+    
-   if(data->set.cert) {
-     if (!cert_stuff(conn,
-                     data->set.cert,
diff --git a/net-misc/curl/files/curl-7.10.8-transfer-segv.patch b/net-misc/curl/files/curl-7.10.8-transfer-segv.patch
deleted file mode 100644
index 6fa07062e869..000000000000
--- a/net-misc/curl/files/curl-7.10.8-transfer-segv.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-===================================================================
-RCS file: /repository/curl/lib/transfer.c,v
-retrieving revision 1.182
-retrieving revision 1.183
-diff -p --unified=3 -r1.182 -r1.183
---- transfer.c	2003/10/24 21:54:34	1.182
-+++ transfer.c	2003/11/06 07:55:45	1.183
-@@ -1854,10 +1854,9 @@ CURLcode Curl_perform(struct SessionHand
-          to the new URL */
-       urlchanged = data->change.url_changed;
-       if ((CURLE_OK == res) && urlchanged) {
--        char *gotourl;
-         res = Curl_done(conn);
-         if(CURLE_OK == res) {
--          newurl = strdup(data->change.url);
-+          char *gotourl = strdup(data->change.url);
-           res = Curl_follow(data, gotourl);
-           if(res)
-             free(gotourl);
diff --git a/net-misc/curl/files/digest-curl-7.14.0 b/net-misc/curl/files/digest-curl-7.14.0
deleted file mode 100644
index 8df5bedae828..000000000000
--- a/net-misc/curl/files/digest-curl-7.14.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
-MD5 46ce665e47d37fce1a0bad935cce58a9 curl-7.14.0.tar.bz2 1920305
diff --git a/net-misc/curl/files/digest-curl-7.15.0 b/net-misc/curl/files/digest-curl-7.15.0
index 1b244772c1e4..711cdc3ee81c 100644
--- a/net-misc/curl/files/digest-curl-7.15.0
+++ b/net-misc/curl/files/digest-curl-7.15.0
@@ -1,2 +1 @@
-MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
 MD5 e3b130320d3704af375c097606f49c01 curl-7.15.0.tar.bz2 1426714