version bump

9 files changed, 110 insertions, 12 deletions

diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index 562a121ed926..a50eb7e6069a 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pycurl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.3 2003/11/02 15:39:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.4 2003/11/13 11:31:18 liquidx Exp $
+
+*pycurl-7.10.8 (13 Nov 2003)
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org> pycurl-7.10.8.ebuild:
+  version bump
 
 *pycurl-7.10.6 (02 Nov 2003)
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 56662b7f3a13..e61e716fdab1 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,10 +1,10 @@
-MD5 23a5eb5d43176b09cfaf114049a29d0f ChangeLog 1152
+MD5 0a560275d046dd99cb5c5f3ebbeb1149 ChangeLog 1269
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 5bed54ec83e2b4033bbdc66e81e79eaa pycurl-0.4.5.ebuild 610
 MD5 e9648121af331020643d1921ee4c3ad9 pycurl-7.10.3.ebuild 804
 MD5 f39da25b852a5b2562f4b335499d056a pycurl-7.10.4.ebuild 804
 MD5 d77dfc7b9f6757f6be3ccf16d2e25425 pycurl-7.10.6.ebuild 787
-MD5 d77dfc7b9f6757f6be3ccf16d2e25425 pycurl-7.10.8.ebuild 787
+MD5 80214a50a059eac56f44ad7f030bbd4a pycurl-7.10.8.ebuild 787
 MD5 163a02baffda306a7965e007324b2fb2 files/digest-pycurl-0.4.5 63
 MD5 249d6fc38f60f070566d83bbfa159350 files/digest-pycurl-7.10.3 64
 MD5 e493742a164b22b91b7b552c2620e3c1 files/digest-pycurl-7.10.4 127
diff --git a/dev-python/pycurl/files/digest-pycurl-7.10.8 b/dev-python/pycurl/files/digest-pycurl-7.10.8
new file mode 100644
index 000000000000..6346e78de2e5
--- /dev/null
+++ b/dev-python/pycurl/files/digest-pycurl-7.10.8
@@ -0,0 +1 @@
+MD5 68663ae7bc73979a2f07e9693aed70ea pycurl-7.10.8.tar.gz 59733
diff --git a/dev-python/pycurl/pycurl-7.10.8.ebuild b/dev-python/pycurl/pycurl-7.10.8.ebuild
new file mode 100644
index 000000000000..eaa58a17f0c8
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.10.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.10.8.ebuild,v 1.1 2003/11/13 11:31:18 liquidx Exp $
+
+inherit distutils
+
+DESCRIPTION="python binding for curl/libcurl"
+SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
+HOMEPAGE="http://pycurl.sourceforge.net"
+
+IUSE=""
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=">=dev-lang/python-2.1.1
+	>=net-ftp/curl-${PV}"
+
+src_install(){
+	DOCS="TODO"
+	distutils_src_install
+	mv ${D}/usr/share/doc/pycurl/examples ${D}/usr/share/doc/${PF}
+	mv ${D}/usr/share/doc/pycurl/html ${D}/usr/share/doc/${PF}
+	mv ${D}/usr/share/doc/pycurl/tests ${D}/usr/share/doc/${PF}
+	rm -fr ${D}/usr/share/doc/pycurl
+}
diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 48bdab001d30..fe85949cf170 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.12 2003/09/02 23:56:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.13 2003/11/13 11:26:46 liquidx Exp $
+
+*python-ldap-2.0.0_pre15 (13 Nov 2003)
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild, python-ldap-2.0.0_pre15.ebuild:
+  version bump
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  fix sasl header (#25693), updated compile/optimise options, made compatible
+  with python-2.3
 
   03 Sep 2003; Alastair Tse <liquidx@gentoo.org>
   python-ldap-2.0.0_pre13.ebuild:
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 66bf3b764d74..1219b7f17e3b 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,9 +1,9 @@
-MD5 720242cf744ea151656dea91398f1a99 ChangeLog 1681
+MD5 1f97b16d8fd13ac109092d2b62553133 ChangeLog 1852
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 1b89298b351c120692bf3345fe4a7e0a python-ldap-2.0.0_pre05-r1.ebuild 922
 MD5 358a99a2d0f3a121b290ac7aaf2778c9 python-ldap-2.0.0_pre06.ebuild 871
-MD5 67cec0509b1dd58442515c3e2abebc2a python-ldap-2.0.0_pre13.ebuild 1293
-MD5 67cec0509b1dd58442515c3e2abebc2a python-ldap-2.0.0_pre15.ebuild 1293
+MD5 489a8b4c27ffea47f712b3d2da5a52c1 python-ldap-2.0.0_pre13.ebuild 1291
+MD5 ea8aad4a59ef9fa5ac6761b43edc241a python-ldap-2.0.0_pre15.ebuild 1292
 MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
 MD5 aaef21adf6aa58c8fc0a0627f3ceae5f files/digest-python-ldap-2.0.0_pre06 73
 MD5 7c4a7f327a0bc9843e8fda91f445ee63 files/digest-python-ldap-2.0.0_pre13 73
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15 b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15
new file mode 100644
index 000000000000..99034b22d193
--- /dev/null
+++ b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15
@@ -0,0 +1 @@
+MD5 f948b4399a6b8068c4aae0e9cf5f6842 python-ldap-2.0.0pre15.tar.gz 73156
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild
index 8e0dca74569f..8cfb862f1ee8 100644
--- a/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.0.0_pre13.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/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild,v 1.3 2003/09/06 23:32:28 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild,v 1.4 2003/11/13 11:26:46 liquidx Exp $
 
 inherit distutils
 
@@ -17,7 +17,9 @@ DEPEND="virtual/python
 
 SLOT="0"
 LICENSE="public-domain" # NOTE: win32 section is under questionable license
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~sparc ~alpha"
+
+PYTHON_MODNAME="ldap"
 
 src_unpack() {
 	unpack ${A}
@@ -28,11 +30,17 @@ src_unpack() {
 
 	local mylibs
 	use sasl \
-		&& mylibs="${mylibs} sasl2 ldap_r" \
+		&& mylibs="${mylibs} sasl2 ldap" \
 		|| mylibs="${mylibs} ldap"
+
+	# Fixes bug #25693
+	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
+
 	use ssl && mylibs="${mylibs} ssl crypto"
-	sed -e "s|^libs = .*|libs = lber resolv ${mylibs}|" -i setup.cfg \
-		|| die "error setting up libs in setup.cfg"
+	sed -e "s|^libs = .*|libs = lber resolv ${mylibs}|" \
+		-e "s|^compile.*|compile = 0|" \
+		-e "s|^optimize.*|optimize = 0|" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
 
 }
 
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild
new file mode 100644
index 000000000000..2ff3560b9fac
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild,v 1.1 2003/11/13 11:26:46 liquidx Exp $
+
+inherit distutils
+
+IUSE="sasl ssl"
+MY_P=${P/_pre/pre}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://python-ldap.sourceforge.net/"
+
+DEPEND="virtual/python
+	>=net-nds/openldap-2.0.11
+	sasl? ( dev-libs/cyrus-sasl )"
+
+SLOT="0"
+LICENSE="public-domain" # NOTE: win32 section is under questionable license
+KEYWORDS="~x86 ~sparc ~alpha"
+
+PYTHON_MODNAME="ldap"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -e "s|/usr/local/openldap.*/lib|/usr/lib|" \
+	    -e "s|/usr/local/openldap.*/include|/usr/include|" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs
+	use sasl \
+		&& mylibs="${mylibs} sasl2 ldap" \
+		|| mylibs="${mylibs} ldap"
+
+	# Fixes bug #25693
+	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
+
+	use ssl && mylibs="${mylibs} ssl crypto"
+	sed -e "s|^libs = .*|libs = lber resolv ${mylibs}|" \
+		-e "s|^compile.*|compile = 0|" \
+		-e "s|^optimize.*|optimize = 0|" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+}
+