Version bump + x86 stable bump.

(Portage version: 2.0.51.21-r1)

5 files changed, 74 insertions, 20 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index e83d4ba4c78b..41405883e48e 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.26 2005/01/03 15:53:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.27 2005/05/15 21:54:01 kloeri Exp $
+
+*python-ldap-2.0.7 (15 May 2005)
+
+  15 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.6.ebuild, +python-ldap-2.0.7.ebuild:
+  Version bump + x86 stable bump.
 
   03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   python-ldap-2.0.1.ebuild:
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 411a4a1f00c9..615ee78ad958 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 efd7cc7fbfba4822eabb16ae203bebb6 python-ldap-2.0.6.ebuild 1505
+MD5 43a536a09d803ef117c03acc94140483 python-ldap-2.0.0_pre06.ebuild 807
 MD5 5f9b150197c5dd8c65e3a3846df56971 ChangeLog 3260
+MD5 3f920172b2c1cd03da5a3b199958a36a python-ldap-2.0.1.ebuild 1217
+MD5 b7e59d7cc60c3e4318a95b8c473e2184 python-ldap-2.0.0_pre15.ebuild 1224
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 ab4ee9bc20346917722d8ad1b7b280f4 python-ldap-2.0.0_pre05-r1.ebuild 862
-MD5 43a536a09d803ef117c03acc94140483 python-ldap-2.0.0_pre06.ebuild 807
+MD5 953bf89a23be097da9c18470ef600f29 python-ldap-2.0.7.ebuild 1505
 MD5 a5d963dc1fb8bf4b38b2256d21aba2a6 python-ldap-2.0.0_pre13.ebuild 1223
-MD5 b7e59d7cc60c3e4318a95b8c473e2184 python-ldap-2.0.0_pre15.ebuild 1224
-MD5 3f920172b2c1cd03da5a3b199958a36a python-ldap-2.0.1.ebuild 1217
-MD5 efd7cc7fbfba4822eabb16ae203bebb6 python-ldap-2.0.6.ebuild 1505
+MD5 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
 MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
+MD5 723c1d8442cfe6963dafc684fb63f947 files/digest-python-ldap-2.0.7 146
+MD5 541bee8c642ff21d07d3bec72c1ee6d4 files/digest-python-ldap-2.0.1 68
+MD5 45f27ac957d1d832996bbea74d5a2cd4 files/digest-python-ldap-2.0.0_pre15 73
 MD5 aaef21adf6aa58c8fc0a0627f3ceae5f files/digest-python-ldap-2.0.0_pre06 73
 MD5 7c4a7f327a0bc9843e8fda91f445ee63 files/digest-python-ldap-2.0.0_pre13 73
-MD5 45f27ac957d1d832996bbea74d5a2cd4 files/digest-python-ldap-2.0.0_pre15 73
-MD5 541bee8c642ff21d07d3bec72c1ee6d4 files/digest-python-ldap-2.0.1 68
-MD5 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB2WqVKRy60XGEcJIRAqLeAJoD+h0Vrg77DXLWNdEhgTUqEzS4pwCdF7R0
-YwEdzGfa9J2Wz15W7LyyVHA=
-=NnHU
------END PGP SIGNATURE-----
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.7 b/dev-python/python-ldap/files/digest-python-ldap-2.0.7
new file mode 100644
index 000000000000..9d651c6c9577
--- /dev/null
+++ b/dev-python/python-ldap/files/digest-python-ldap-2.0.7
@@ -0,0 +1,2 @@
+MD5 d26798f1224c894b2eb99f4c9babf142 python-ldap-2.0.7.tar.gz 70684
+MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
diff --git a/dev-python/python-ldap/python-ldap-2.0.6.ebuild b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
index 254d93c5ae12..2cdfcba46d0b 100644
--- a/dev-python/python-ldap/python-ldap-2.0.6.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.6.ebuild,v 1.3 2005/01/03 15:53:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.6.ebuild,v 1.4 2005/05/15 21:54:01 kloeri Exp $
 
 inherit distutils
 
@@ -19,7 +19,7 @@ DEPEND="virtual/python
 
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~alpha ~ppc ~sparc x86"
 IUSE="doc sasl ssl"
 
 PYTHON_MODNAME="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.0.7.ebuild b/dev-python/python-ldap/python-ldap-2.0.7.ebuild
new file mode 100644
index 000000000000..7c288a856797
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.7.ebuild,v 1.1 2005/05/15 21:54:01 kloeri Exp $
+
+inherit distutils
+
+#MY_P=${P/_pre/pre}
+#S=${WORKDIR}/${MY_P}
+P_DOC="html-python-ldap-docs-2.0.3" # no newer docs available
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="mirror://sourceforge/python-ldap/${P}.tar.gz
+	doc? ( mirror://sourceforge/python-ldap/${P_DOC}.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="PYTHON"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE="doc sasl ssl"
+
+PYTHON_MODNAME="ldap"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp setup.cfg setup.cfg.orig
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/lib /usr/lib/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl ; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+
+	# Fixes bug #25693
+	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
+
+	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"
+}
+
+src_install() {
+	distutils_src_install
+	use doc && dohtml -r ${WORKDIR}/${P_DOC/html-/}/*
+}
\ No newline at end of file