Add myself as maintainer, add live ebuild for python3 fork, fix unquited variables, remove two old, unstable versions.

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

11 files changed, 115 insertions, 177 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 01fe68b6783d..bd7d221e1a08 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.125 2013/06/27 14:06:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.126 2013/06/27 14:29:10 xmw Exp $
+
+*python-ldap-9999 (27 Jun 2013)
+
+  27 Jun 2013; Michael Weber <xmw@gentoo.org> +python-ldap-9999.ebuild,
+  -python-ldap-2.4.3.ebuild, -python-ldap-2.4.9.ebuild, metadata.xml,
+  python-ldap-2.3.13.ebuild, python-ldap-2.4.10-r1.ebuild,
+  python-ldap-2.4.10.ebuild, python-ldap-2.4.12.ebuild,
+  python-ldap-2.4.13.ebuild:
+  Add myself as maintainer, add live ebuild for python3 fork, fix unquited
+  variables, remove two old, unstable versions.
 
 *python-ldap-2.4.13 (27 Jun 2013)
 
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index ecf5d952eee3..d5893c38d7d9 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -6,25 +6,21 @@ DIST python-ldap-2.3.9.tar.gz 108209 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf
 DIST python-ldap-2.4.10.tar.gz 134153 SHA256 67cc7801bf24c29386ab99966ceb68d6a60fa9e0566cc95a4fbb2c4695a8ce54 SHA512 9f59c87acec4cc8f958c7dbea0ca82aa30f46ef7ff44c5cc424bbc37ccb7a15bf669262ad96e209cdbe4da21e33f46aa85fea736ae76363adb98de915ecac380 WHIRLPOOL c28772aad5d2cfdefc8a6dc9dfe5a29259bdd219038e6e71d2ff35580254e6cb434e5ba485be5eddbc74490012d0046d45ff1d16e222e079b6efabb6f4bcca85
 DIST python-ldap-2.4.12.tar.gz 135395 SHA256 8587f8007c603b09ea6aa72fd63f1619b8a0d7f97e81ce955a44e8f84c7c9088 SHA512 9cd5f35d374e1cdd6b01473e978a90478416dec46c566f3a347c44839b54f8a2aa255504acbc88a73e1ad0ac836445546830f28764542b10a6255f890052598e WHIRLPOOL 90bfe55e3ba91cf3bca7e4bf6812d5944a3a311b0652306a836bc2d26bc37882f481775ae713ea540165bcad73e6fe3d5c4634b2b4800e6f3289aea8f72b7681
 DIST python-ldap-2.4.13.tar.gz 135550 SHA256 96853b9bbdacb341d6a3d60fdc89f8cb8acef47970ce8492ee3cbe975b9c7dbf SHA512 c77c487b48fa63b9bb9926fca0082834f6a2c6c7e9be89849e59b45a9e7c18146e4a7a982fe0a0504659ba680c39823eea29f349842a9f8df36acf8f10bab975 WHIRLPOOL 0c70cff4f7c41b514befb517fbe89e39bc426bd0fa0b7164781c82d14a99213d6da5d89bba371cdfd5c373d4152cee2f19c19f3e4e65d3aff8e79bcbb41320ae
-DIST python-ldap-2.4.3.tar.gz 125989 SHA256 88fb00ed5811e3df49d0f28317a48be2ae7e46252e473923005c7eb292d25e9d SHA512 30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd WHIRLPOOL ba1c65152d1dd6e8e64de1326b59a970829cb338e9f6b2c7f44345e96f7fed28ef5e515c75512f82d56431f2e79d63a22b6abe530ef61b3324f74aa39b91638b
-DIST python-ldap-2.4.9.tar.gz 133453 SHA256 247c29f30faf016f0d1dbe702a5026a4633dfa9b8b90c7ef46de68a58424ee8b SHA512 ad32baed734e232d77994cdf01c6d263409b66a7cae5ff6cea3b1852c1999617e32643f06119d39b299b7c5f54f8a2a03c55a5a7dcc31cad6f4cdcdcba63ec26 WHIRLPOOL b011a5303437df6422047b525718c7b4bcf19c6a83cb956dcdc86bb333108f24cd1fa9b228b5349a9c389c68551bf39891e5f6427cad86036c08ff818ff2173e
 DIST python-ldap-docs-html-2.3.13.tar.gz 118531 SHA256 8ea9eee3135db006489268733e49ab1e80906ca2bc9e7960f19e548506ce08a4 SHA512 d4edca6b627b4c9449f1ddbda41ae793664924a41b05046b005909002a23cf8e830ab7178cc1173a373f6675e1e97af0e24232baf837ec9fa859888c8c4568f6 WHIRLPOOL f9117dc1bab2368b2976f97437bd03fba3870c5503492e73f1ef9cba4407cf777dbd91dea54f835d8ea4d01e592bb21c59ea7a52b9b8fb4d688915d37163e55e
 DIST python-ldap-docs-html-2.3.9.tar.gz 116913 SHA256 de8b4d91e1a35702d993f7d744fcc5a3e7cbf5be543d2d127791cda9df361124 SHA512 fe3259fbbc2620d88912e12d3d7c36776a9f2bc62bdfb704b1ff9671240badaf95bf28e5b93fcf738964f321c02c81f45deb6bb1f49d6d035a0b9990ee9d9279 WHIRLPOOL d85ebb31948c1b5baf7fd49340f1b9239a74c446ebf997e5800c5df7e4db0053ed5df356ea8697adf247b2b5fc34bf5fc92d3903b6f78408eec90b038761e092
-DIST python-ldap-docs-html-2.4.3.tar.gz 58672 SHA256 2f3a916453bc38d8644635a325eaed2944b265b3146710109e75cd6a3c518e26 SHA512 15c97fb90ee98d56d3b92bb225425bc964b208842a63bf916e76f25442b41958f6340c258cbde7a11eee2f22180b2fe1d8968b39c06e937ad9c477a2a1715cf3 WHIRLPOOL c26760e44af76b2354f15aa6d2d3efc3cc056fe4ac4dd5741efa66f6c52884758d85f2ade24ebd10781cc74742e2e89decd66b743ab0ed79a636bcd6ce35d20c
-EBUILD python-ldap-2.3.13.ebuild 2159 SHA256 c93575023ce5f40e34b920a64db672a73a2a1e543ed707fc190c527193508a2f SHA512 b5bb8f9a2ba36f344e498f4e0d12b3bdb23018a5df64965bbe46da738f410eb75c66bc2fe78664bd35d259391d0e71d6c515a4c8b7480eefab60167487640e81 WHIRLPOOL e6ba2adb165ac50a84880121816613d71cca33230a7bb512e426cb6a20dbd4396fc12b6cc3fe71af103ae1a92f4cc602ad4318d1b1b0abdfaf1fd706b15444b8
+EBUILD python-ldap-2.3.13.ebuild 2164 SHA256 0a58b3808b4adf150e6eb4f10852fd275a46cdc56137bd92aa1fe527c02cf90c SHA512 eab5556a38b304a974662117a64c668c78f1759276f9f66ed25bc8152738ec405bd597829d3c72fb6d59f9ab7950cfec9c1aac933b8b52fbbf17ba406577a7da WHIRLPOOL ce8ac5218a338330d670c8a3a19643cd6e1b9e98c6003f91aad69fb6defc6189afaba5897b453c913ce05fde1e35525d4a44476cc6f39496766c5efa5b23ca06
 EBUILD python-ldap-2.3.9.ebuild 2007 SHA256 bd8c2938a5242d1c4d36e5397e5972c9f79cdc4de90dc07420a3c4093c0eb9f1 SHA512 fb8885beddca5ab320f8a95b0b8d641d9a537a6953dde88494732a0e6afc2f8d3fa300796ba8978f288647002073e2980cdd74c9804283cbc749f272f5db4f1e WHIRLPOOL cab8e7827d1166db49ff4baf3742bf17e643c1fe3684f056ff97926ddc94de5d02e6581c5b701b38b28de48c16e42abfeacf647f74f8fe5ccaa067a057c4912e
-EBUILD python-ldap-2.4.10-r1.ebuild 2203 SHA256 43880ee7b91f7b38fc9a3f42773d103c38ca541b3184e2cb457a5e05b71ad7cc SHA512 c9c00a16e02d62fc542e76c60448b3aff48ea9fbe776ad1917c2301b5ec9cfc377fec4d77f4bbfc6e8d4a3c85d8a23b5f7747c201ffdeb7a797e5949567c82b9 WHIRLPOOL 5e60528ddfe306eff0b824734346ed6af30aa261759d14389702488906e9486f6d36c9ff52e48908fbbff27d13211e9c12ac9405a7bf1b9021efac5dead6e384
-EBUILD python-ldap-2.4.10.ebuild 2312 SHA256 083de69034d35161ed3c53ce60fbf94aae5f7de4348b77dec8b925f3f232b503 SHA512 83eea99a6e3800d35da3f5b838ce9d62acd1d43284a1c0f44bbec066790fba7c45c2996a748879a97230a62d552a311588a9a8648ae0ebc3ac7c98c966015238 WHIRLPOOL 5f75c3b8c6502fcc94942f4760fbf3dc18f5dc5685068f3345a821bd29d890e6e2653b6d0e5c4df1118ad2c736684e19756ebba560b47005382959bec01d996b
-EBUILD python-ldap-2.4.12.ebuild 2202 SHA256 b6441f6b4dc5e48665704abdcf2298e8cb3feae27cc91e422dc11783edd07be9 SHA512 47a4df12a1819d169c325beab01c1dc69fe8d4d6b6d276538f7a47df197c7c4207495b71c906d789d18c276d3759017b0a76ab3de4858e90be07a1c684a23e63 WHIRLPOOL c5d4986710718ed878b4439d2dd721c79338a0160cce86bf43763a01e94d614b1a77b8bcec625383ac61f71e49eceb4c78b8313764bcc928299c14116f40c4ec
-EBUILD python-ldap-2.4.13.ebuild 2198 SHA256 3e0db5432f3726f28378dacf916bf40b0641825700e4b0e4577c67dcf8bc277c SHA512 8b8671f6b26658968622a25f72dfdf0c68b54c64a9920725c252de2fc0abf4f092bef09f00fe474b36027b8a696ee7331d1442f41b3a186e6b62baa8f04732af WHIRLPOOL 766fe3ce506f5785b46c44a6d6d5283596e9b5e197eb7d612a423d183e0e27ff18e5344d1464597220b35c64841e933d2a4dbd140dd75ae236bd88eba18d007e
-EBUILD python-ldap-2.4.3.ebuild 2153 SHA256 d0d3de9db4ff466ac59ba93f25541b3565c5cdc1a13bd02d3537cb04c49334f0 SHA512 d1376cc2c31a6646e2383b62440e66fe73e652a641584142565c3d8cf97c261fce7ba3adf95046bed6eb6cdc5f4e3af7bedd21ce5b576a6081b4fd141080c7e6 WHIRLPOOL 02a42d2749aff5f179dca05052208c07fe24a3cbf9eb33de30001ae0656a9f35b56af09c6675b1c41e0d3ce016e36ff071f304e39acaa2bd63f7132c0040a5ce
-EBUILD python-ldap-2.4.9.ebuild 2322 SHA256 09622f566843a5e3ae275c43acb93a1ea305cf249ef80b3cf689dbfb39f35472 SHA512 909c8f176f4fcf689510ac806867f1aed5a2e292432bd1873865aabecfe9b35aac00206f6592f2a89dd5866d9dec68d66bb6c826ea782027509bf3006e014576 WHIRLPOOL 9b7ded28bfab21ce73f0be58ad11cf5926c4043972f05d82270b0aabb120f44b89246c6ecef508025ec09319382bdff93891c2e2178b1ec254b57d7b4d5b096b
-MISC ChangeLog 16228 SHA256 55bf0e89caa67e84dacf2461aa3515a5fd13ab2e6ad08873886d29697b75640c SHA512 12292dda89462e7faeddedbca2742d0d669e9714fb7ac97b3ddeb975a353b0fe38ff6eb9cfc03c0016a0e3fb7a3645b0913857e1d9a039e03746e3104a363370 WHIRLPOOL 0ed74b1d8de006514f5356928be24ebea040b38dab99dc1f64f80614ea4c752210ba678594edce0fa7c7c2c992d519875d946a8b08e134523ce17e389e95ec15
-MISC metadata.xml 234 SHA256 bb65b105ecc11f5ccd623915b51ba34331564c679960c837745762e5ee73cf2a SHA512 e85029bb25be6185931359a2e87f2740fc651557ec6b32c6e1b170c25494fea8fd906244f579f9ecffd41f7cc4da9326270d43eabec1a4e22a7f8c734d1c545a WHIRLPOOL 2ad8654789a73e9084ea813c0aef920ffb0c665d02fba41fdbf194beba88f1e908c45c8102a137ac6883430c24b95a1680f4bbff33334b9cce477c756f25196d
+EBUILD python-ldap-2.4.10-r1.ebuild 2209 SHA256 48cebd746237b2d46b4a63e7828b05536f5bef75341decb9acd4d70ccd31a734 SHA512 409d28dc8f625908ee9590a09ee9b6020285dd4a62350578437c66306b2ec970dd347407e8d9ac7ae13bd18c79ef65356f188830c2cc63b81ea074eef13b0309 WHIRLPOOL cee2a283aab4f05ddb1299e085082f220e4073baa0ce075a54df398818f189e10d810892c6e2122203e4247a3df330bf3084d9a9677d2f3c42bce87d95a3249f
+EBUILD python-ldap-2.4.10.ebuild 2321 SHA256 24079394afb8f3a2369c705dc8e3565f107902bc61d4c16e781910a37ce0e55e SHA512 63c558e3792ff89b40fa07a738618eac05ec3a8885d0dcbb22a0d1ef5aaf065de481a08451461c85567356bbce16c4fb180a12c080d1c3b2a8dce1af2fe6022b WHIRLPOOL 79a7a3f8f6e2ecc717bde5ab2e6f952613050415514f604d629091d5a5759147a79d2b731b5e10113dc2d2940cb1f93fef76e259375595f155f632d31493b19f
+EBUILD python-ldap-2.4.12.ebuild 2206 SHA256 7a6d592e32920be9d5cac8ad5afc66164f03d8b3dd8d139bf70c392e6b3310b5 SHA512 cdc4a51ec49bdbe3500c6967eed4e0864b26deebc840930c78598321b8873ac34c354ae5e0c5aea131f7de225ab8dc70f9d148dd84153fd726960432f75cd343 WHIRLPOOL 38175f399179d7cd12c141b0a2f09bd3cd31de00b840c2ae74d23ae29ee8200d44d1d3d8346c16acc3987312bd5654a46590fba2e5e219533cfcf915ef41520e
+EBUILD python-ldap-2.4.13.ebuild 2206 SHA256 11d35e756323a1498375683967eb116f4007bb491a10a0a8c31906b4d280f1ca SHA512 92c8d5b8ded955f08fb02658420e724c3bd3eac463c98bc8962785d4d967649a46825843f0ae7599a6e9a2ae2d5cdf8f740f4471e2e5cb923291e668d7a721a0 WHIRLPOOL 3879a1e6857bc130a077e92886a4b7f439e60f7e24a3fc82eb8a95c4d5c6c5af54566667a0ceb222cba62b23cabe1b0992e22dad149b7d8d82efb14eca56e893
+EBUILD python-ldap-9999.ebuild 2149 SHA256 a283e92ed825f130ede05e15fe13b59d802221df3e8b97f6385f71e181d7b953 SHA512 750a7a9fff0a02303c63d6d907b416743346ef928846a868f594ce89677b89812cbdc7d6dbb810ebd01fefb637874bede76cbf35213400d5bd57b24111260da2 WHIRLPOOL 119353346a388d20c597a6a9d9446f2b60b002d4af53ad8ccfcb49ae23e0dd28ec1422e1f0c75698e43fd063ec0c909efdcefb2cac4f04fd411cb42d0ea90a27
+MISC ChangeLog 16671 SHA256 e1d63b77d9e27d215bc37f474f3bfc44a5834db1dd4247f928dd696cc8ba5ff6 SHA512 7e1f108d2f20ce3ac7f2e77fb863cf68cd0e315969420b312e32be8ac36f1d9ccc9ff02ad490f49d0a1131a6b962e434f02f2f7589f3e27590fb4372b3d73b94 WHIRLPOOL ce2d335ec33efe503e58569823aea0f43e1d2f0378058da18a2da80f88d103d984d841d97a34b876e050cfd32ba389cc4b86f7aa755d6c659b046ef85680abb9
+MISC metadata.xml 382 SHA256 2401fbdf82488b2cc69337b156a5be00f178c1c325a1f7cbe7a021f5c20ac9e4 SHA512 6fa2990fffb89cc9ad16231746e539f0665a1ea816f17c424855f1b9bb27420adcf5fa4263e64678ad5802dbc6524f280592c34053f52a66b7ff9dac3fc76cee WHIRLPOOL 913ccc6cdd6902c8255d9e5b6a0a0c7027faea36aaa81320e9e9b6581a60bb62d4a5a4c59e90347dedb4e9dbe5ab1fca35b27309954b471623d86c8d37c4fc99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHMRuwACgkQknrdDGLu8JBcdgD/VCCRi9905mkO0xwd6oxIJOyT
-lm/pI8R4Cq9OFzbDiwIBAJhWubVAFwhnBP5T2Dbo4dGku25XuXoSotg11k+MgJvs
-=IVqb
+iF4EAREIAAYFAlHMTDIACgkQknrdDGLu8JBHuAD/YlJHzaV2YaLTnvoYp4ZBItMd
+wmpntM7PD2Kn8iWZyu4A/RPUP1kfiVC2yZmIHhE118GeCJC+XlntpMXTwdYc+mPR
+=MFSb
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml
index 72ad4032c311..c60eaa2fade6 100644
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Upstream of the python3 port</description>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ldap</remote-id>
 	</upstream>
diff --git a/dev-python/python-ldap/python-ldap-2.3.13.ebuild b/dev-python/python-ldap/python-ldap-2.3.13.ebuild
index 5c0450ed50c2..bcb3b624c354 100644
--- a/dev-python/python-ldap/python-ldap-2.3.13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.3.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.13.ebuild,v 1.14 2012/11/14 08:17:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.13.ebuild,v 1.15 2013/06/27 14:29:10 xmw Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -34,10 +34,10 @@ PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
 src_prepare() {
 	local rpath=
 	# sloppy logic, maybe better check if compiler links with GNU-ld
-	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2"
+	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=\"${EPREFIX}\"/usr/$(get_libdir)/sasl2"
 	# 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 = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
 		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
index 28e0c7ed0833..cd676f9a5861 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.10-r1.ebuild,v 1.3 2013/04/06 00:50:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.4 2013/06/27 14:29:10 xmw Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.4.10.ebuild b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
index 9a0d26769f4f..63352e6cca5b 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4.10.ebuild,v 1.9 2012/12/27 09:24:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.10 2013/06/27 14:29:10 xmw Exp $
 
 EAPI=4
 
@@ -33,10 +33,10 @@ PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
 src_prepare() {
 	local rpath=
 	# sloppy logic, maybe better check if compiler links with GNU-ld
-	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2"
+	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=\"${EPREFIX}\"/usr/$(get_libdir)/sasl2"
 	# 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 = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
 		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.12.ebuild b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
index c7c1d01625b1..244926f6a337 100644
--- a/dev-python/python-ldap/python-ldap-2.4.12.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.12.ebuild,v 1.1 2013/06/03 06:18:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.4.13.ebuild b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
index fcf8962bbf37..cfd15ed99768 100644
--- a/dev-python/python-ldap/python-ldap-2.4.13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.13.ebuild,v 1.1 2013/06/27 14:06:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.13.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.4.3.ebuild b/dev-python/python-ldap/python-ldap-2.4.3.ebuild
deleted file mode 100644
index 93b2e722897b..000000000000
--- a/dev-python/python-ldap/python-ldap-2.4.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 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.4.3.ebuild,v 1.6 2012/11/14 08:17:33 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils multilib
-
-DOC_P="${PN}-docs-html-${PV}"
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org/ 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 ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-RDEPEND=">=net-nds/openldap-2.4
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${DEPEND}
-	dev-python/setuptools"
-
-DOCS="CHANGES README"
-PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
-
-src_prepare() {
-	local rpath=
-	# sloppy logic, maybe better check if compiler links with GNU-ld
-	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2"
-	# 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 = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \
-		-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
-}
diff --git a/dev-python/python-ldap/python-ldap-2.4.9.ebuild b/dev-python/python-ldap/python-ldap-2.4.9.ebuild
deleted file mode 100644
index 20b8d35f153a..000000000000
--- a/dev-python/python-ldap/python-ldap-2.4.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 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.4.9.ebuild,v 1.3 2012/11/14 08:17:33 xarthisius Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-RDEPEND=">=net-nds/openldap-2.4
-	dev-python/pyasn1
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-DOCS="CHANGES README"
-PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
-
-src_prepare() {
-	local rpath=
-	# sloppy logic, maybe better check if compiler links with GNU-ld
-	[[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2"
-	# 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 = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs="ldap"
-	if use sasl; then
-		use ssl && mylibs="ldap_r"
-		mylibs="${mylibs} sasl2"
-	else
-		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
-	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_compile() {
-	distutils_src_compile
-	if use doc; then
-		pushd Doc &> /dev/null
-		PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib*)" \
-			sphinx-build -b html -d	_build/doctrees . _build/html
-		popd Doc &> /dev/null
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r Demo
-	fi
-
-	if use doc; then
-		dohtml -r Doc/_build/html/
-	fi
-}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
new file mode 100644
index 000000000000..844e4839af5b
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.1 2013/06/27 14:29:10 xmw Exp $
+
+EAPI=5
+
+# pypy: bug #458558 (wrong linker options due to not respecting CC)
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+
+inherit distutils-r1 git-2 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap"
+EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+RDEPEND=">=net-nds/openldap-2.4
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		cd Doc || die
+		sphinx-build -b html -d _build/doctrees . _build/html || die
+	fi
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r Demo
+		docompress -x /usr/share/doc/${FP}/Demo
+	fi
+}