stable bump and cleanup

6 files changed, 13 insertions, 88 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1d9b4d43620c..6d0382e7b00d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,17 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 4cdac4063266a53633cc1756c315042c ChangeLog 6483
-MD5 6cf6fbc62f5747eb2ea1996a14232fb5 curl-7.10.5-r1.ebuild 1057
-MD5 429c2ec2ee12f471ec8ed45c9d2da140 curl-7.10.7.ebuild 974
 MD5 30687265d15bba921c501cf9ade9e00d curl-7.10.8-r1.ebuild 1088
 MD5 91cff829647dc675e59959c241d2062a curl-7.11.0.ebuild 979
 MD5 9ef221ccf3d48a21c4ec0ce428dd4677 curl-7.11.1.ebuild 1027
-MD5 b27d6ce2ad6fbceec5b46ee9872db14a curl-7.12.0-r2.ebuild 1278
+MD5 857f128a2aa3a48783e4d6519ac52f65 curl-7.12.0-r2.ebuild 1274
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 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 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
-MD5 93b049be221be3a9ce4a61ebd645c6ef files/digest-curl-7.10.7 64
 MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8-r1 65
 MD5 3d8968398ac9406fdf47efe23004dcdc files/digest-curl-7.11.0 65
 MD5 960d346648779ac90316a39974aff792 files/digest-curl-7.11.1 65
 MD5 b1be312bb3cb53a17c9ba9683bda165a files/digest-curl-7.12.0-r2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBc4srRkyva5PS18kRAm8lAKCmQ4isWIXOFXOZ/yJg21iYxRxnlQCgymHi
+uFMGk2rxylyCV9TP68RrCXc=
+=zzT3
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.10.5-r1.ebuild b/net-misc/curl/curl-7.10.5-r1.ebuild
deleted file mode 100644
index 3876b4748d50..000000000000
--- a/net-misc/curl/curl-7.10.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.10.5-r1.ebuild,v 1.4 2004/06/24 23:40:14 agriffis Exp $
-
-inherit eutils
-
-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 hppa amd64"
-IUSE="ssl ipv6 ldap"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
-	ldap? ( net-nds/openldap )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-badssl.patch
-}
-
-src_compile() {
-	local myconf="--with-gnu-ld	--enable-http
-		--enable-ftp --enable-gopher
-		--enable-file --enable-dict
-		--enable-telnet --enable-nonblocking"
-
-	econf ${myconf} \
-		`use_enable ipv6` \
-		`use_enable ldap` \
-		`use_with ssl` || die
-
-	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-misc/curl/curl-7.10.7.ebuild b/net-misc/curl/curl-7.10.7.ebuild
deleted file mode 100644
index f98c3c338a78..000000000000
--- a/net-misc/curl/curl-7.10.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.10.7.ebuild,v 1.2 2004/06/24 23:40:14 agriffis 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 hppa ~amd64 ia64"
-IUSE="ssl ipv6 ldap"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	local myconf="--with-gnu-ld	--enable-http
-		--enable-ftp --enable-gopher
-		--enable-file --enable-dict
-		--enable-telnet --enable-nonblocking"
-
-	econf ${myconf} \
-		`use_enable ipv6` \
-		`use_enable ldap` \
-		`use_with ssl` || die
-
-	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-misc/curl/curl-7.12.0-r2.ebuild b/net-misc/curl/curl-7.12.0-r2.ebuild
index f2fcdcc5bfa1..651f58db62f0 100644
--- a/net-misc/curl/curl-7.12.0-r2.ebuild
+++ b/net-misc/curl/curl-7.12.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.12.0-r2.ebuild,v 1.3 2004/09/29 09:01:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.12.0-r2.ebuild,v 1.4 2004/10/18 09:20:39 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT X11"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ppc64 ~s390"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ppc64 ~s390"
 IUSE="ssl ipv6 ldap"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
diff --git a/net-misc/curl/files/digest-curl-7.10.5-r1 b/net-misc/curl/files/digest-curl-7.10.5-r1
deleted file mode 100644
index 6b0f72cd4e59..000000000000
--- a/net-misc/curl/files/digest-curl-7.10.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cef8a0c26ca7f4ff6b844d9f69b533f1 curl-7.10.5.tar.bz2 943890
diff --git a/net-misc/curl/files/digest-curl-7.10.7 b/net-misc/curl/files/digest-curl-7.10.7
deleted file mode 100644
index 303d10e367f6..000000000000
--- a/net-misc/curl/files/digest-curl-7.10.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19f2f77279cd5d3026c71997463db791 curl-7.10.7.tar.bz2 987369