stable on x86, version bump

5 files changed, 74 insertions, 10 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 033c12c5bf97..f242da6b3cd4 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.21 2004/11/03 14:36:49 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.22 2004/12/14 19:58:11 carlo Exp $
+
+*python-ldap-2.0.6 (14 Dec 2004)
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> python-ldap-2.0.1.ebuild,
+  +python-ldap-2.0.6.ebuild:
+  stable on x86, version bump
 
   03 Nov 2004; <SeJo@gentoo.org> python-ldap-2.0.1.ebuild:
   added ppc keyword
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index ef902100a38a..fd555588f4cc 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,12 +1,14 @@
-MD5 4cd044ce8b8eb678cbfa02852cb6c882 ChangeLog 2683
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 52d87e6f6530204959eecd5b5e20696c python-ldap-2.0.0_pre05-r1.ebuild 862
-MD5 94184328f2bdb308bf2aafad2260b9b7 python-ldap-2.0.0_pre06.ebuild 807
 MD5 25976c2f6fcc9d003a35e463b5c0d3c7 python-ldap-2.0.0_pre13.ebuild 1223
 MD5 14ee892cab06ad12140549d8687be5e3 python-ldap-2.0.0_pre15.ebuild 1224
-MD5 9f162694c6208339eae174f8f772f696 python-ldap-2.0.1.ebuild 1216
-MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
+MD5 94184328f2bdb308bf2aafad2260b9b7 python-ldap-2.0.0_pre06.ebuild 807
+MD5 52d87e6f6530204959eecd5b5e20696c python-ldap-2.0.0_pre05-r1.ebuild 862
+MD5 e4b2ff9c5e5dd74dc4296febb9ecb7a8 python-ldap-2.0.6.ebuild 1398
+MD5 5d67b825571b07ed522d2557403bc520 python-ldap-2.0.1.ebuild 1215
+MD5 b985128f0f8659447e976b87f912441b ChangeLog 2852
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 541bee8c642ff21d07d3bec72c1ee6d4 files/digest-python-ldap-2.0.1 68
+MD5 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
 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 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.6 b/dev-python/python-ldap/files/digest-python-ldap-2.0.6
new file mode 100644
index 000000000000..63f2e3f48842
--- /dev/null
+++ b/dev-python/python-ldap/files/digest-python-ldap-2.0.6
@@ -0,0 +1,2 @@
+MD5 59fd9345a77451b7749a28a458406695 python-ldap-2.0.6.tar.gz 66029
+MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
diff --git a/dev-python/python-ldap/python-ldap-2.0.1.ebuild b/dev-python/python-ldap/python-ldap-2.0.1.ebuild
index e7585a0f2f04..a5f4bf4e38cf 100644
--- a/dev-python/python-ldap/python-ldap-2.0.1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.0.1.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/dev-python/python-ldap/python-ldap-2.0.1.ebuild,v 1.3 2004/11/03 14:36:49 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.1.ebuild,v 1.4 2004/12/14 19:58:11 carlo Exp $
 
 inherit distutils
 
@@ -17,7 +17,7 @@ DEPEND="virtual/python
 
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86 ~sparc ~alpha ppc"
+KEYWORDS="x86 ~sparc ~alpha ppc"
 
 PYTHON_MODNAME="ldap"
 
diff --git a/dev-python/python-ldap/python-ldap-2.0.6.ebuild b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
new file mode 100644
index 000000000000..3ef9746d6bdf
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 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.1 2004/12/14 19:58:11 carlo 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="~x86 ~sparc ~alpha ~ppc"
+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