bump; drop py2.6 support, drop IUSE doc, update deps

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 74 insertions, 17 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index a9338a0a27b5..2286dcf5069f 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.131 2014/04/09 21:32:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.132 2014/05/14 08:31:55 idella4 Exp $
+
+*python-ldap-2.4.15 (14 May 2014)
+
+  14 May 2014; Ian Delaney <idella4@gentoo.org> +python-ldap-2.4.15.ebuild,
+  python-ldap-2.4.14.ebuild:
+  bump; drop py2.6 support, drop IUSE doc, update deps
 
   09 Apr 2014; Michał Górny <mgorny@gentoo.org> python-ldap-9999.ebuild:
   Remove python2.5 leftover.
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 0f261fdcf0fd..6ab8009837cd 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -7,6 +7,7 @@ DIST python-ldap-2.4.10.tar.gz 134153 SHA256 67cc7801bf24c29386ab99966ceb68d6a60
 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.14.tar.gz 136808 SHA256 cd2bf964e298a56effeaeb4758c18150c233c6e22b8bdb622cb220a25b53e21d SHA512 77303db1cc14ef0e3d8c40a274db6653edebc1714648d54357a2be2b3dc0a0716ac2950828df5f3968b83058b1e090ef76c148e711645762033b260073a8165b WHIRLPOOL 9deb23d16b18f9ea53028b956bd0d0b79ea26ef3eef45190b05a836770389bd499d2d169ecf01294f9d02499d679b1c62b190adbf4114a0b224e58eabfb77dd6
+DIST python-ldap-2.4.15.tar.gz 111597 SHA256 30bcac33ded943557fbafb1b6d9c345deab34d89d63dbcee9e6b59207db11670 SHA512 2e2d5ecc4f96a63465dbc0da3b8a524729cf199f95eb559beeea5466da4fa9667f61aff7e482f73d6581d24477cb4780fccd599619fbb92b2810bdc81f2de310 WHIRLPOOL c3c3135a2b073cc74d2692df0b9d0baaf8353ce253619747fb0626fa34b3f6df8dde184894856b934b63666c413aed81e80f3321893539d1825660a1f75b1be6
 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
 EBUILD python-ldap-2.3.13.ebuild 2156 SHA256 01421eb4baa6f0624577f071480f0d9532df63d60dfc2e36b941b3e6b02bb8a7 SHA512 6bb5f267419f5ae9b8894a7c52ac2fd6de50addd91d0a4cd70acf6563cd80089f8cda6c2b31a6fc37526bf070a23686ea63b7cf3422d1de3bb55e607f588cece WHIRLPOOL c06bac74f8b246c7961f774aa883250a34697088f65b3dbf89c3a12e9e594e9d320ad0fd92df14ff5cdeb12a0c5755d9b0f23ce4f298ccb3b16228c2703651bc
@@ -16,25 +17,14 @@ EBUILD python-ldap-2.4.10.ebuild 2313 SHA256 3e50a0bc43b60bd172ddf547c7654fca342
 EBUILD python-ldap-2.4.12.ebuild 2197 SHA256 a064d04591cd20e6003554f18cc57f90a1dc18e6135c6f4639996f49982e4f18 SHA512 3706be139cf14b2666320fcfd3fbdde6338a036695ba4c41cf4c599ca596881ae6749fa9d01ec7c29f5c1d09d445fc70b618083a8f2f7da19c140776fc27598f WHIRLPOOL bac6f25e4ec82ebc6e1f9d05c6b2bc017a4b1f9a30ccab2ba6b34de960d0ca0e4a2d9bc6c9e8e6c7231684d9896a3205cc37df095f5635c928f1a80a53d7d330
 EBUILD python-ldap-2.4.13.ebuild 2197 SHA256 06666cfcf025b84b426b13d1883a6716147edef7b3e356fd577b6cf3e946298f SHA512 3c09066cbeb6fa89f68c33e71ec545f234e12d1a7463c455a2699f57b53ef00a07123928bc385ad3e0ce4cb3e8e987b69eb251f3cdd0cc7e98206a2bbb1f76c0 WHIRLPOOL fbbbad316303b47b9fb17a580db9011ca1842858d61c0c07424c12a28e36a6daa4bcee4d064f49fdfa2602e14d3272796bd1c78d1b666cebad1b267fb35dbbc6
 EBUILD python-ldap-2.4.14.ebuild 2195 SHA256 ae3dffe31c81fd2026d59ae14e2efe87269da4ec672b76ce176322a4d11d31fe SHA512 7049a161a50c6d867692f35e2c7a93614257196a98312e75ea8c20710af81c1dc413a968932ed9fc2fe62282e45e6efd5637ecc55e78fd80e4b3f6b9aab31ae1 WHIRLPOOL 3d36d2b4360df56d550fbded1e76ea3723555c6d156f6daa4545f8db0a3ca4e99cc13595a7149672187a43e59e59cb0d39f6162f3fe2ed00411f4f26674a9574
+EBUILD python-ldap-2.4.15.ebuild 1967 SHA256 aa85b10adb3c5ed6bd6c88186082e593953eb40e9afa628c20542e9843fb6087 SHA512 78aa3749943d581ecc10da758aadb79882a60d9af9831d6a5bca9944f4bd39c697f6abcd66aabcd5f1ec3afa58e954a7472ccf01e2409c8e7136e9f2942768b1 WHIRLPOOL 5cf0aa1e65beb3772b6fb42da8da4561dc507ffc38b36c146e5e790202c325bff931ef85f3f20f0964c6c6160b14dea33ed06d7d425aae2961f18553a444888d
 EBUILD python-ldap-9999.ebuild 2221 SHA256 e8c26fb12d1f3ee4c3fdee19934dcd567c69195cc26d39b9c6c99133fdfa4670 SHA512 dea1e99c1eaf8ef3756837577bedb89a43118757d85a8549a9067e1eabea693040ef76ff9706c0321b1fb81edabfa696ca0d38a713614099ac48d2dfe8f82ed0 WHIRLPOOL 14dc1c24649d6b68d0bd2969f5e7b9f80cb4c0c2ffd4fba00b9cff92351ab9b8d74165a95ccddb78fd7686593f95b51b64ea46735cdb30b85f655531c45e91cd
-MISC ChangeLog 17512 SHA256 6d3c1399e360fd32ae43424fca63f6a95a5f4885d78670194a6fd903562f68f1 SHA512 210f1e41fbdf090044fa17e38af66614a40cf681e97ad07e04e9f965208ad4f2c0267cc094ac1bfcfeb96ab9d871469209c51911311bb8723f36097144d5ae59 WHIRLPOOL 5ffdb40e2ae296fe7573d9480783114af6480323e52559f1029a0489117877e6bdee41af36c2636cb2f29b6991cdf5e30d79fb52ecb650b9c0bb93592fd491f9
+MISC ChangeLog 17709 SHA256 29848fe45637278f4ebc015ea803e53ad965a5d8a6d7ddbb967b1392aca1653f SHA512 60400931dae32c6e3d775c687b54fc1e28027af97bbdb357ecbb5cc99f8e3c2740b611ba8b0d5cbef14f6be3cbc141f1a280f118bd545f0ba5fe9fd035626ecc WHIRLPOOL 36f8fd8df775c18bf49a86ba3b69e87d66e059eb16f522178394c444a37abc02aab4581bac38cd1c0aad30772356eef3220fda589352305a73af045d8774e384
 MISC metadata.xml 382 SHA256 2401fbdf82488b2cc69337b156a5be00f178c1c325a1f7cbe7a021f5c20ac9e4 SHA512 6fa2990fffb89cc9ad16231746e539f0665a1ea816f17c424855f1b9bb27420adcf5fa4263e64678ad5802dbc6524f280592c34053f52a66b7ff9dac3fc76cee WHIRLPOOL 913ccc6cdd6902c8255d9e5b6a0a0c7027faea36aaa81320e9e9b6581a60bb62d4a5a4c59e90347dedb4e9dbe5ab1fca35b27309954b471623d86c8d37c4fc99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTRbyDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOx4P/0lo9iCpjqgALosluk5oBlYv
-r9TADAF9If0KvKHjoBPFtmJv356xtZmSGxUbjA05eMCrRNItgBc+fCpLjAEx+L4F
-D1N35lAjZyUE+1+VbNSJUEBq7gMGevp+lEdpsKsHFRohIjKNirgvndfjDqD4uVoK
-H01Vx+pVOzNXuHq5T+ut4b6waJhb0mo1fIs5xVybAGABFfHL06EVixwDk4vRQUt7
-glmEHCuffoL4WhYlhCN0iRgt3iAq75qpy7b2tyy6w9WHRNAXx5P2CMvIt7jhxp+D
-dMuUWLE9YIu1SPTUcqXWVe+eRk7nCf7I1ar6umxpxWafHfhtoYbEBBx8QHPPeoQT
-RBoI/0fvrMB9pgiPAO/M2bsbruLhPF/Xc5MWBgGo3Fr0EXF+aZrkJoZKNaZZ4hzS
-gsXlCVT6/mvFXVeFU438v2zytE+EqeL9uk9zUE4YOIbOr03JSOvLNR13akiFvYYh
-HJQN1EGPwGfP8cW32x4+VPXcEHHwkdaUDEymF/regNA9QtJwDKVadAmLTs1cA7UP
-GGxhkPArWhnnhSDTeQ6en3Xh02Ecf203SmExrQqjS3hR/laTCMmodj60cblgpICq
-S/3GoToagoc+mCsgNDDQ5GVH+pgf4tgRKWnsCUj72sULmDETwJcHut1T17bOcUdi
-ggfh8YwNEweIGjozR0rG
-=Wu9G
+iEYEAREIAAYFAlNzKDYACgkQso7CE7gHKw1vwwCfQ5We0TL6qpK0tMmkAwg6e4I8
+/YAAn1P59KHwZ9gWo9QYPheC1xb4ODu2
+=6Zjm
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-ldap/python-ldap-2.4.15.ebuild b/dev-python/python-ldap/python-ldap-2.4.15.ebuild
new file mode 100644
index 000000000000..512ba586540a
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.4.15.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 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.15.ebuild,v 1.1 2014/05/14 08:31:55 idella4 Exp $
+
+EAPI=5
+
+# pypy: bug #458558 (wrong linker options due to not respecting CC)
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 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-fbsd ~x86-solaris"
+IUSE="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.
+# OpenSSL is an optional runtime dep.
+RDEPEND=">net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${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_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 examples && local EXAMPLES=( Demo/. )
+	distutils-r1_python_install_all
+}