stable bump and dep cleanup

7 files changed, 28 insertions, 26 deletions

diff --git a/net-ftp/curl/ChangeLog b/net-ftp/curl/ChangeLog
index 097aa5006c41..2c3de0863c70 100644
--- a/net-ftp/curl/ChangeLog
+++ b/net-ftp/curl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2003/11/15 03:17:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.22 2003/12/09 23:38:56 liquidx Exp $
+
+  09 Dec 2003; Alastair Tse <liquidx@gentoo.org> curl-7.10.2.ebuild,
+  curl-7.10.3-r1.ebuild, curl-7.10.5-r1.ebuild, curl-7.10.7.ebuild,
+  curl-7.10.8.ebuild:
+  removed pam dependency, added openldap dep for older versions (#35343)
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> curl-7.10.3-r1.ebuild:
   Stable on ia64
diff --git a/net-ftp/curl/Manifest b/net-ftp/curl/Manifest
index b9adab0c4b56..1167b81e0b70 100644
--- a/net-ftp/curl/Manifest
+++ b/net-ftp/curl/Manifest
@@ -1,13 +1,13 @@
-MD5 b28933a59e292940e1f5935ee0a29dc9 ChangeLog 3248
-MD5 6c79f406b97ac5fbe57a276aa4bf93b6 curl-7.10.2.ebuild 1026
-MD5 3daf36be752194acb454ae27947f292e curl-7.10.5-r1.ebuild 1070
-MD5 01b65714db8072e12a67e5320e72374e curl-7.10.3-r1.ebuild 1029
-MD5 0595dd9d40c0e4759bedad0ca91151fe curl-7.10.7.ebuild 1001
+MD5 4fb33d89765496faaaf173dc7f5eee84 ChangeLog 3480
+MD5 8bb90517693a237a3699589bb25bf6dc curl-7.10.2.ebuild 1032
+MD5 89382ea8f13d9e546e296e7ee9f1e0a8 curl-7.10.3-r1.ebuild 1035
+MD5 de807d12b9927938d9720c9d7048a22b curl-7.10.5-r1.ebuild 1048
+MD5 a83fa46ddefd8f1420bcc19ee70df54c curl-7.10.7.ebuild 979
+MD5 36ecf67270ff56ce0080b13900b34409 curl-7.10.8.ebuild 980
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 0e3725455b9550bcfb993b21e7d3a162 curl-7.10.8.ebuild 1001
+MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
 MD5 a1805bbf77fb71c4485b6038e2fd6cb5 files/digest-curl-7.10.2 64
-MD5 93b049be221be3a9ce4a61ebd645c6ef files/digest-curl-7.10.7 64
-MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8 65
 MD5 fb70d6e30f7002a54234beb491b00831 files/digest-curl-7.10.3-r1 63
-MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
 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 65
diff --git a/net-ftp/curl/curl-7.10.2.ebuild b/net-ftp/curl/curl-7.10.2.ebuild
index da7d7a5eb921..7c242fbd9f09 100644
--- a/net-ftp/curl/curl-7.10.2.ebuild
+++ b/net-ftp/curl/curl-7.10.2.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.2.ebuild,v 1.10 2003/09/07 00:12:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.2.ebuild,v 1.11 2003/12/09 23:38:56 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -11,8 +11,8 @@ LICENSE="MIT X11"
 KEYWORDS="x86 ppc sparc alpha hppa"
 IUSE="ssl ipv6 ldap"
 
-DEPEND=">=sys-libs/pam-0.75
-	ssl? ( >=dev-libs/openssl-0.9.6a )"
+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 \
diff --git a/net-ftp/curl/curl-7.10.3-r1.ebuild b/net-ftp/curl/curl-7.10.3-r1.ebuild
index f3273387322f..4587313d144d 100644
--- a/net-ftp/curl/curl-7.10.3-r1.ebuild
+++ b/net-ftp/curl/curl-7.10.3-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.3-r1.ebuild,v 1.5 2003/11/15 03:17:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.3-r1.ebuild,v 1.6 2003/12/09 23:38:57 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -11,8 +11,8 @@ LICENSE="MIT X11"
 KEYWORDS="x86 ppc ~sparc alpha ia64"
 IUSE="ssl ipv6 ldap"
 
-DEPEND=">=sys-libs/pam-0.75
-	ssl? ( >=dev-libs/openssl-0.9.6a )"
+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 \
diff --git a/net-ftp/curl/curl-7.10.5-r1.ebuild b/net-ftp/curl/curl-7.10.5-r1.ebuild
index 472c423473aa..3deb60398bb9 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.7 2003/09/07 00:12:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.5-r1.ebuild,v 1.8 2003/12/09 23:38:57 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -11,8 +11,7 @@ LICENSE="MIT X11"
 KEYWORDS="x86 ppc ~sparc ~alpha hppa amd64"
 IUSE="ssl ipv6 ldap"
 
-DEPEND=">=sys-libs/pam-0.75
-	ssl? ( >=dev-libs/openssl-0.9.6a )
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
 	ldap? ( net-nds/openldap )"
 
 src_unpack() {
diff --git a/net-ftp/curl/curl-7.10.7.ebuild b/net-ftp/curl/curl-7.10.7.ebuild
index cc3b9fc13a06..4389123f2651 100644
--- a/net-ftp/curl/curl-7.10.7.ebuild
+++ b/net-ftp/curl/curl-7.10.7.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.7.ebuild,v 1.1 2003/11/03 09:11:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.7.ebuild,v 1.2 2003/12/09 23:38:57 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -8,11 +8,10 @@ HOMEPAGE="http://curl.haxx.se/"
 
 SLOT="0"
 LICENSE="MIT X11"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 IUSE="ssl ipv6 ldap"
 
-DEPEND=">=sys-libs/pam-0.75
-	ssl? ( >=dev-libs/openssl-0.9.6a )
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
 	ldap? ( net-nds/openldap )"
 
 src_compile() {
diff --git a/net-ftp/curl/curl-7.10.8.ebuild b/net-ftp/curl/curl-7.10.8.ebuild
index 07f7a919ec65..c3f3e30b4274 100644
--- a/net-ftp/curl/curl-7.10.8.ebuild
+++ b/net-ftp/curl/curl-7.10.8.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.8.ebuild,v 1.1 2003/11/03 10:05:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.8.ebuild,v 1.2 2003/12/09 23:38:57 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -11,8 +11,7 @@ LICENSE="MIT X11"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 IUSE="ssl ipv6 ldap"
 
-DEPEND=">=sys-libs/pam-0.75
-	ssl? ( >=dev-libs/openssl-0.9.6a )
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
 	ldap? ( net-nds/openldap )"
 
 src_compile() {