bumping to stable

7 files changed, 10 insertions, 78 deletions

diff --git a/net-ftp/curl/ChangeLog b/net-ftp/curl/ChangeLog
index db695bc7e40e..49763ff6b40b 100644
--- a/net-ftp/curl/ChangeLog
+++ b/net-ftp/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/curl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.16 2003/06/14 12:06:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.17 2003/06/19 21:13:49 liquidx Exp $
+
+  19 Jun 2003; Alastair Tse <liquidx@gentoo.org> curl-7.10.5-r1.ebuild:
+  marking as stable x86 because it includes a fairly important bugfix over all
+  7.10.x series
 
 *curl-7.10.5-r1 (13 Jun 2003)
 
diff --git a/net-ftp/curl/Manifest b/net-ftp/curl/Manifest
index 46688bf3aa10..1220127180e3 100644
--- a/net-ftp/curl/Manifest
+++ b/net-ftp/curl/Manifest
@@ -1,12 +1,8 @@
-MD5 24adc40d6d185f68f6190f37e6ec3145 ChangeLog 2665
+MD5 8cc5af5521fb1cf9ac6ded2768f16798 ChangeLog 2834
 MD5 dda239c9d26ac9535d9243afc3b6622b curl-7.10.2.ebuild 1026
+MD5 be1e85a52c26cc3073a59005248cb8cf curl-7.10.5-r1.ebuild 1074
 MD5 bf10fc40277f75c7ec208bfc8ccf7ade curl-7.10.3-r1.ebuild 1029
-MD5 a50d02c2cf4ee8dd988937e7ac37a29f curl-7.10.4.ebuild 1026
-MD5 0d046788f67d11d465ed27fc8e9ec60c curl-7.10.5-r1.ebuild 1074
-MD5 5ebdcbb18cc08564203bce72d720790d curl-7.10.5.ebuild 1026
 MD5 a1805bbf77fb71c4485b6038e2fd6cb5 files/digest-curl-7.10.2 64
-MD5 fb70d6e30f7002a54234beb491b00831 files/digest-curl-7.10.3-r1 63
-MD5 90d83e5e2c287361a2190cf01d171a00 files/digest-curl-7.10.4 64
-MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5 64
 MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
+MD5 fb70d6e30f7002a54234beb491b00831 files/digest-curl-7.10.3-r1 63
 MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
diff --git a/net-ftp/curl/curl-7.10.4.ebuild b/net-ftp/curl/curl-7.10.4.ebuild
deleted file mode 100644
index babebc2d86da..000000000000
--- a/net-ftp/curl/curl-7.10.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.4.ebuild,v 1.1 2003/04/09 09:51:46 liquidx Exp $
-
-DESCRIPTION="A Client that groks URLs"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-HOMEPAGE="http://curl.haxx.se/"
-
-SLOT="0"
-LICENSE="MIT X11"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="ssl ipv6 ldap"
-
-DEPEND=">=sys-libs/pam-0.75 
-	ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-	local myconf="--with-gnu-ld --enable-http --enable-ftp --enable-gopher --enable-file \
-			--enable-dict --enable-telnet --enable-nonblocking"
-	use ipv6	&& myconf="${myconf} --enable-ipv6"
-	use ldap	&& myconf="${myconf} --enable-ldap"
-	use ssl		&& myconf="${myconf} --with-ssl"
-
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc LEGAL CHANGES README 
-	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL 
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-ftp/curl/curl-7.10.5-r1.ebuild b/net-ftp/curl/curl-7.10.5-r1.ebuild
index 4b35736a10d2..552098447f3b 100644
--- a/net-ftp/curl/curl-7.10.5-r1.ebuild
+++ b/net-ftp/curl/curl-7.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.5-r1.ebuild,v 1.2 2003/06/14 12:06:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.5-r1.ebuild,v 1.3 2003/06/19 21:13:49 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE="http://curl.haxx.se/"
 
 SLOT="0"
 LICENSE="MIT X11"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
 IUSE="ssl ipv6 ldap"
 
 DEPEND=">=sys-libs/pam-0.75 
diff --git a/net-ftp/curl/curl-7.10.5.ebuild b/net-ftp/curl/curl-7.10.5.ebuild
deleted file mode 100644
index d720844d6b16..000000000000
--- a/net-ftp/curl/curl-7.10.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.5.ebuild,v 1.1 2003/06/12 23:15:31 liquidx Exp $
-
-DESCRIPTION="A Client that groks URLs"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-HOMEPAGE="http://curl.haxx.se/"
-
-SLOT="0"
-LICENSE="MIT X11"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="ssl ipv6 ldap"
-
-DEPEND=">=sys-libs/pam-0.75 
-	ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-	local myconf="--with-gnu-ld --enable-http --enable-ftp --enable-gopher --enable-file \
-			--enable-dict --enable-telnet --enable-nonblocking"
-	use ipv6	&& myconf="${myconf} --enable-ipv6"
-	use ldap	&& myconf="${myconf} --enable-ldap"
-	use ssl		&& myconf="${myconf} --with-ssl"
-
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc LEGAL CHANGES README 
-	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL 
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-ftp/curl/files/digest-curl-7.10.4 b/net-ftp/curl/files/digest-curl-7.10.4
deleted file mode 100644
index f96c54cfc0a8..000000000000
--- a/net-ftp/curl/files/digest-curl-7.10.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ea69876573104384be9d7f4c346ae33 curl-7.10.4.tar.bz2 874255
diff --git a/net-ftp/curl/files/digest-curl-7.10.5 b/net-ftp/curl/files/digest-curl-7.10.5
deleted file mode 100644
index 6b0f72cd4e59..000000000000
--- a/net-ftp/curl/files/digest-curl-7.10.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cef8a0c26ca7f4ff6b844d9f69b533f1 curl-7.10.5.tar.bz2 943890