third time lucky. this time i have the symlinks properly fixed. sorry :(

6 files changed, 12 insertions, 47 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index cf3e424f0485..8f33b10d5f2f 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.11 2004/07/27 14:57:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.12 2004/07/28 18:52:38 liquidx Exp $
+
+*curl-7.12.0-r2 (28 Jul 2004)
+
+  28 Jul 2004; Alastair Tse <liquidx@gentoo.org> curl-7.12.0-r1.ebuild,
+  +curl-7.12.0-r2.ebuild:
+  third time lucky. this time i have the symlinks properly fixed. sorry :(
 
 *curl-7.12.0-r1 (27 Jul 2004)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index bf132e9ff9f6..fcda081aa60f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,18 +1,16 @@
-MD5 6f9d460cde5d1b01713daa4d7a982b74 curl-7.12.0.ebuild 1097
-MD5 7ed888c176feef082e3b0df288acdca6 curl-7.12.0-r1.ebuild 1172
 MD5 9ef221ccf3d48a21c4ec0ce428dd4677 curl-7.11.1.ebuild 1027
 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 2fcf4bb3b63d5ac073ec7bf621cd9aea curl-7.11.0.ebuild 980
-MD5 1a70630c5d99581207ff28f53063b1f7 ChangeLog 5975
+MD5 3fa62d59acb1738c2512c5e7563be430 ChangeLog 6180
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 47e546234b5ac02a8f63de8c87787390 curl-7.12.0-r2.ebuild 1172
 MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
 MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8-r1 65
-MD5 b1be312bb3cb53a17c9ba9683bda165a files/digest-curl-7.12.0-r1 65
+MD5 b1be312bb3cb53a17c9ba9683bda165a files/digest-curl-7.12.0-r2 65
 MD5 93b049be221be3a9ce4a61ebd645c6ef files/digest-curl-7.10.7 64
 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 65
 MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
 MD5 05e37478314d224f2ce5840f2e1f31c9 files/curl-7.10.8-transfer-segv.patch 744
diff --git a/net-misc/curl/curl-7.12.0-r1.ebuild b/net-misc/curl/curl-7.12.0-r2.ebuild
index 9d084decfe14..288a99bbd646 100644
--- a/net-misc/curl/curl-7.12.0-r1.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-r1.ebuild,v 1.1 2004/07/27 14:57:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.12.0-r2.ebuild,v 1.1 2004/07/28 18:52:38 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -36,5 +36,5 @@ src_install() {
 	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
 
 	# backwards compat link
-	dosym libcurl.so.2 /usr/lib/libcurl.so.3
+	dosym libcurl.so.3 /usr/lib/libcurl.so.2
 }
diff --git a/net-misc/curl/curl-7.12.0.ebuild b/net-misc/curl/curl-7.12.0.ebuild
deleted file mode 100644
index 7a922d564bc8..000000000000
--- a/net-misc/curl/curl-7.12.0.ebuild
+++ /dev/null
@@ -1,38 +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.12.0.ebuild,v 1.2 2004/07/25 19:33:34 liquidx Exp $
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-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"
-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-manual
-		--enable-telnet --enable-nonblocking --enable-largefile"
-
-	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
-
-	# backwards compat link
-	dosym /usr/lib/libcurl.so.3 libcurl.so.2
-}
diff --git a/net-misc/curl/files/digest-curl-7.12.0-r1 b/net-misc/curl/files/digest-curl-7.12.0-r1
deleted file mode 100644
index 99629fe383fa..000000000000
--- a/net-misc/curl/files/digest-curl-7.12.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0a717da32b162149004c936a7a2ba08 curl-7.12.0.tar.bz2 1193098
diff --git a/net-misc/curl/files/digest-curl-7.12.0 b/net-misc/curl/files/digest-curl-7.12.0-r2
index 99629fe383fa..99629fe383fa 100644
--- a/net-misc/curl/files/digest-curl-7.12.0
+++ b/net-misc/curl/files/digest-curl-7.12.0-r2