Version bump.

(Portage version: 14770-svn/cvs/Linux x86_64)

3 files changed, 73 insertions, 57 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 5efc51c883ae..751cb39421f6 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.68 2009/10/05 16:39:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.69 2009/11/01 02:04:49 arfrever Exp $
+
+*python-ldap-2.3.10 (01 Nov 2009)
+
+  01 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -python-ldap-2.2.1.ebuild, +python-ldap-2.3.10.ebuild:
+  Version bump.
 
   05 Oct 2009; Raúl Porcel <armin76@gentoo.org> python-ldap-2.3.9.ebuild:
   ia64/sparc stable wrt #284973
diff --git a/dev-python/python-ldap/python-ldap-2.2.1.ebuild b/dev-python/python-ldap/python-ldap-2.2.1.ebuild
deleted file mode 100644
index ca1e6f27d563..000000000000
--- a/dev-python/python-ldap/python-ldap-2.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 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.2.1.ebuild,v 1.10 2007/06/24 20:55:26 dev-zero Exp $
-
-inherit distutils
-
-P_DOC="html-python-ldap-docs-2.0.3"
-
-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/"
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc sasl ssl"
-
-DEPEND=">=net-nds/openldap-2.2
-	sasl? ( dev-libs/cyrus-sasl )"
-
-PYTHON_MODNAME="ldap"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
-	sed -e "s:^library_dirs =.*:library_dirs =:" \
-		-e "s:^include_dirs =.*:include_dirs = /usr/include:" \
-		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/lib -Wl,-rpath=/usr/lib/sasl2:" \
-		-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
-	if use doc ; then
-		dohtml -r "${WORKDIR}/${P_DOC/html-/}"/*
-		insinto /usr/share/doc/${PF}
-		doins -r Demo
-	fi
-}
diff --git a/dev-python/python-ldap/python-ldap-2.3.10.ebuild b/dev-python/python-ldap/python-ldap-2.3.10.ebuild
new file mode 100644
index 000000000000..c56f12044095
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.3.10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 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.3.10.ebuild,v 1.1 2009/11/01 02:04:49 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils multilib
+
+DOC_P="${PN}-docs-html-2.3.7"
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="http://pypi.python.org/packages/source/p/python-ldap/${P}.tar.gz
+	doc? ( http://www.python-ldap.org/doc/${DOC_P}.tar.gz )"
+HOMEPAGE="http://python-ldap.sourceforge.net/ http://pypi.python.org/pypi/python-ldap"
+
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples sasl ssl"
+
+RDEPEND=">=net-nds/openldap-2.3
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${DEPEND}
+	dev-python/setuptools"
+RESTRICT_PYTHON_ABIS="3.*"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
+	sed -e "s:^library_dirs =.*:library_dirs =:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include /usr/include/sasl:" \
+		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/$(get_libdir) -Wl,-rpath=/usr/$(get_libdir)/sasl2:" \
+		-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"
+
+	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}/${DOC_P}"/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demo
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize dsml.py ldapurl.py ldif.py ldap
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}