Re-add python-ldap-2.3.9 as it was the last python-ldap release to support the openld...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 6a00243ebc71f7f432177fc789a5860d27a3b907..9f02848f535d4fec16ea41147a1be6a80f078e38 100644 (file)
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.104 2011/08/27 21:24:20 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.105 2011/09/04 03:15:10 robbat2 Exp $
+
+  04 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> +python-ldap-2.3.9.ebuild:
+  Re-add python-ldap-2.3.9 as it was the last python-ldap release to support
+  the openldap-2.3.x series. Please do NOT remove it from the tree until
+  OpenLDAP 2.3.x is removed.
 
   27 Aug 2011; Jesus Rivero <neurogeek@gentoo.org> python-ldap-2.3.13.ebuild,
   python-ldap-2.4.3.ebuild:

diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 43d207d6a92ea400d62a4b56a7175c1d7c8d9cd8..7108501875b1554fcd587fe9d7a10d5c67663f1c 100644 (file)
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST python-ldap-2.3.13.tar.gz 112397 RMD160 48ae889eefa742f89e226d5da8e26211c2f79464 SHA1 60199aa06ab85b0b7c9192a8163b9ff0d4633918 SHA256 417ae3f6e2f680461611dc60c95ac9fcb3c5bab2e00e06f9e0572b85903ecc9b
+DIST python-ldap-2.3.9.tar.gz 108209 RMD160 25d8555f548acdb418725f966f9ee94730f4ed77 SHA1 8d558259bfcda02e6b6be79e8dea18f744367dd5 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
 DIST python-ldap-2.4.3.tar.gz 125989 RMD160 ee12e22569ec4af8a2102f70d29cae4164e9bbbc SHA1 4bffa539fd24d5b666ce88fdc59bf3d67e56f2e6 SHA256 88fb00ed5811e3df49d0f28317a48be2ae7e46252e473923005c7eb292d25e9d
 DIST python-ldap-docs-html-2.3.11.tar.gz 84078 RMD160 917b44c7f1f9f7b38f8c41b164fd5bf35a096952 SHA1 79f8c7f8d4ed1a9a64c8dbd7a07caef6288a3b6d SHA256 b62d9d59cabb3ee4bf3e247a692310e69cf7780e4333888d7e5a21af5c56a312
+DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102
 DIST python-ldap-docs-html-2.4.3.tar.gz 58672 RMD160 138f4283a0f7d2abee42c176b78d9650a75a7c85 SHA1 853647bc4b98c2c08351f458a4766d1c02fdbebf SHA256 2f3a916453bc38d8644635a325eaed2944b265b3146710109e75cd6a3c518e26
 EBUILD python-ldap-2.3.13.ebuild 2013 RMD160 590106b61e77125cfcdd35b9997082bc7c8068f1 SHA1 7cd7e2e82b6a5fa6fe67b82ed9a1c5ccaffb8825 SHA256 f4349dcde928d877d6134349c407da2249d20bf318729a5a569c183606ea701a
+EBUILD python-ldap-2.3.9.ebuild 1859 RMD160 b5cb89d256d7073a499e9b54d7b35a6ea380f9e4 SHA1 ee063219d71ede63767aaf4b6561f7b372d2ff60 SHA256 85bc07bb8ded47c94d924b0b54c3b856c74261ea7517a7c257f35d4cf85506d4
 EBUILD python-ldap-2.4.3.ebuild 2019 RMD160 293d6b478a573cc71525b47e214046588352992e SHA1 4a5da55f56513bcb79be39d801e2826eed1b2226 SHA256 9076e461a721b005548a4a8b6cf8b9cb70b8bfdd92b16471fd7ea05a957532a5
-MISC ChangeLog 13049 RMD160 ef777afb12f665913b6c791161f978b4c6f46b01 SHA1 4ea3865dc89a0557c211b1a82cba842d52c616e7 SHA256 b9d13311f49b846306acee6d0c7c810dc35e050abe61379dc8b63245d6295b46
+MISC ChangeLog 13307 RMD160 7c7cd695f999127c5fbeadc10844acfb966caada SHA1 b9dae3d9b660cdc4cc628266c60bb4f2dc60e090 SHA256 38baca118dff2ed4cd83c4cfaba509b18774d85f2df567d29f59875b14ebf664
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk5ZKA8ACgkQdIssYB9vBoOw7gCfdtPE1UCIZwrQOrMyCWr2nMkZ
-CUYAniV48P0aDlTW96pV+gkJ664W7eXK
-=hH0Y
------END PGP SIGNATURE-----

diff --git a/dev-python/python-ldap/python-ldap-2.3.9.ebuild b/dev-python/python-ldap/python-ldap-2.3.9.ebuild
new file mode 100644 (file)
index 0000000..873f731
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.3.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 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.9.ebuild,v 1.15 2011/09/04 03:15:10 robbat2 Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils multilib
+
+DOC_P="${PN}-docs-html-2.3.7"
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://python-ldap.sourceforge.net/ http://pypi.python.org/pypi/python-ldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+       doc? ( http://www.python-ldap.org/doc/${DOC_P}.tar.gz )"
+
+LICENSE="PSF-2"
+SLOT="0"
+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"
+
+DOCS="CHANGES README"
+PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
+
+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
+
+       if use doc; then
+               dohtml -r "${WORKDIR}/${DOC_P}"/* || die "dohtml failed"
+       fi
+
+       if use examples; then
+               insinto /usr/share/doc/${PF}
+               doins -r Demo || die "doins failed"
+       fi
+}