bump, remove old

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

4 files changed, 25 insertions, 75 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 6cbe93fd2a71..0fc644299edd 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.150 2015/05/17 15:32:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.151 2015/07/30 05:31:41 idella4 Exp $
+
+*python-ldap-2.4.20 (30 Jul 2015)
+
+  30 Jul 2015; Ian Delaney <idella4@gentoo.org> +python-ldap-2.4.20.ebuild,
+  -python-ldap-2.3.9.ebuild, -python-ldap-2.4.18.ebuild:
+  bump, remove old
 
   17 May 2015; Manuel Rüger <mrueg@gentoo.org> -python-ldap-2.4.10-r1.ebuild,
   -python-ldap-2.4.10.ebuild:
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index ac775529862f..a81acb0871e8 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,12 +1,21 @@
-DIST python-ldap-2.3.9.tar.gz 108209 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4 SHA512 7470c476c44b0a8ae1498fddac5f0c6ba64bd305742df578ad204f21348dbcec61624b9da15d32c14c9120a2104137d37727e9df5ebf74e380ab607c496bbbe7 WHIRLPOOL dd7502911349e3ab31ef9f7e67616aee0fff1aae2e2527f2597ec79a65190768397b1fd688eaa5b32502f944f8d3f162333d8b5d97d9b47cee8754d1fabfb735
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST python-ldap-2.4.15.tar.gz 111597 SHA256 30bcac33ded943557fbafb1b6d9c345deab34d89d63dbcee9e6b59207db11670 SHA512 2e2d5ecc4f96a63465dbc0da3b8a524729cf199f95eb559beeea5466da4fa9667f61aff7e482f73d6581d24477cb4780fccd599619fbb92b2810bdc81f2de310 WHIRLPOOL c3c3135a2b073cc74d2692df0b9d0baaf8353ce253619747fb0626fa34b3f6df8dde184894856b934b63666c413aed81e80f3321893539d1825660a1f75b1be6
-DIST python-ldap-2.4.18.tar.gz 137451 SHA256 e375c5b9dea6022299a56435b5fef92c803d23659799df1f7d45c89a74b007fa SHA512 102f462a70819f7b75ef23372522e99c54f5b6761586bd9e406f4717d2d032d7da74246900e3619ef0eabf6461f4ddbfc55ae8281f059184f5e1aa71eeca3c7f WHIRLPOOL 8e3801ad8d6ef4dd986184d39d2ef87850a490e4eaf20376bb4b001ece11ade3c0444c8b238e89e2175f2102a36f1d43ccefc49f2a1f1873204145ef16c75118
 DIST python-ldap-2.4.19.tar.gz 138503 SHA256 02fddb3accbfb54e40ff47a59457e422b253f9fb6cd64bb3851b349295fab048 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85 WHIRLPOOL 708c6744b41fc4c9dc4473a9ab088016aa722f5b196c080973fedbb07a08dd57f859ddb5d193665349f44d2d08ff9e2f797cfa6af23e34624f1d0a9e21d62d4d
-DIST python-ldap-docs-html-2.3.9.tar.gz 116913 SHA256 de8b4d91e1a35702d993f7d744fcc5a3e7cbf5be543d2d127791cda9df361124 SHA512 fe3259fbbc2620d88912e12d3d7c36776a9f2bc62bdfb704b1ff9671240badaf95bf28e5b93fcf738964f321c02c81f45deb6bb1f49d6d035a0b9990ee9d9279 WHIRLPOOL d85ebb31948c1b5baf7fd49340f1b9239a74c446ebf997e5800c5df7e4db0053ed5df356ea8697adf247b2b5fc34bf5fc92d3903b6f78408eec90b038761e092
-EBUILD python-ldap-2.3.9.ebuild 2007 SHA256 bd8c2938a5242d1c4d36e5397e5972c9f79cdc4de90dc07420a3c4093c0eb9f1 SHA512 fb8885beddca5ab320f8a95b0b8d641d9a537a6953dde88494732a0e6afc2f8d3fa300796ba8978f288647002073e2980cdd74c9804283cbc749f272f5db4f1e WHIRLPOOL cab8e7827d1166db49ff4baf3742bf17e643c1fe3684f056ff97926ddc94de5d02e6581c5b701b38b28de48c16e42abfeacf647f74f8fe5ccaa067a057c4912e
+DIST python-ldap-2.4.20.tar.gz 142355 SHA256 4b8891539a3171d993cf7896b632ff088a4c707ae85ac3c77db1454f7949f3e2 SHA512 d8afe217c18d49b70089bc47bac7c48f57774b78b1dd44ae3a60e669a3df59058d8579b9de64a2349af612db8e3c1ea5bfa5a47148c651cbfa4038dbc58b9ff2 WHIRLPOOL 562993e84f5c41b3aefd808a047d6cf8ea6c4284171f7f0d858d3a7417a67e31b06f283ed557fbad3fde25a4a9d2c049cbce52c0759b94850ea19848e4192f64
 EBUILD python-ldap-2.4.15.ebuild 2163 SHA256 f5194cb8cce0377178fed058dc89dfb129665db83f828581f18f5c58b074cc2a SHA512 138ddfa1aa2bc2ff160bb6f7c73b21526dbc19b884ad68d48bc7917b2d9f699105d996304f684ccbeb561ab234d18fe9b503ce230a134d9b855b04ec6da8524a WHIRLPOOL bfca8765d7cdea7c8d26e67d73442e8d0c7011eb4d3107b2279897a57eae0a266cba10ae4eab7e1ab664ba31d8fa0ead574fc043302672714a5211a4cfc6fabe
-EBUILD python-ldap-2.4.18.ebuild 2426 SHA256 373a9a80e3f5ea3174736a88fb43d0f36578fde73b8fb044e565544908e04346 SHA512 0e7f64511fc8114f13e7c3aab85374458771ef1048a778954b2751878eadb2f890e8b99d61a3c6f06551ec6247411935b2754d708fcdedb4f4d2fbfb226ed24e WHIRLPOOL 43fbad5c15ce6ed0b54aef5800b431ee7087dc638f5b8b7788167854e3bd8fdec33febcd5535949421a12f1679645cf931d66e504db406ee76489d056319c880
 EBUILD python-ldap-2.4.19.ebuild 2426 SHA256 a44b81e4c9fe4c2ac05e492646072ac844d7183a32453f5dd72aa7e5db64d738 SHA512 58430366f423cc2f1bc016f04feb7b3d88c3c50967a46c2f14a3ea797eedbbd46a8505b05e8d34b070ed371d888379c2d224a6325b249b7114d2a93f7eefc30f WHIRLPOOL 10b77896863da9e5bae29fbaaa5623de6d40861448bdce5579c95e1765ecdeede32ab482672449e22d2357903b76d5a2c0e64eeb1e1c370b9322bb953864e630
+EBUILD python-ldap-2.4.20.ebuild 2414 SHA256 9d4ae507af78e65c2822433b847a3fe16354b121317ecca64323f8652f6825ba SHA512 f04f89d4371576069887b2e9945c587fd36ffa61f5b288492ab9cc737ad2d7cc1674b907d274e22bd0c04cefafcdf1f04760bf66b92e6fdadd166d1f7d42b430 WHIRLPOOL f9d9e15fbbbba1c67d692718890a82ce043c4930053c324661f1db7f71b989514688400d3dd88afb583b4680c53ff8842b1872d18c5840d46587f690a2418c7d
 EBUILD python-ldap-9999.ebuild 2293 SHA256 cdd73927eb9a3ecfa4f9b72e39c0aaf3299bc7774d64da7f558a77b45bd5dde1 SHA512 717cf72c35e8a09f1f8a7a7332210531fa4cb9f808750014d0099ed46708aaf9a87a76760bff9cf96e2b4aac2219ce13e1343438953bae9a5993ab993062fbad WHIRLPOOL ba4ef16042cdbd37f965bd8529b647fa1743560a3fdbb529a63d5bd7453ae60b57149445f7ff7b2d31e57bec106827a689cac6d2ee70bcb717e65d9bba38a302
-MISC ChangeLog 19939 SHA256 592313bb7a6cadc485066df03b1a82a5038c543bbf6a5daa4cb62c6d0972ae7b SHA512 d0d7a5cf5f1f4fb29e69698674de6c1ba33122bd1e50739b4a8102a8f25967359ce33c0059766aa85ad3b8f771edcd052e217d59f99159f910f212410c9339c7 WHIRLPOOL 8b016f496a724893e56a594a66b7be175e37bdafdc66ba0783563bad40275a2ffbb375000b55235f95862432414d1456f285bbfbf43c5c150ebe99574eb43d4f
+MISC ChangeLog 20129 SHA256 363a7fb290a521366f614d88017d34e2032109ae963a74bc2e067475a833b0bf SHA512 c92207c8a2cae461d7fac18093b4c2b2cdd041cfff36e98ca68fa1ef1a844c5fa895a6cf739cb5a8fef7584ce1ffefa4591842a33925dddf55c10c06fa2d0e7d WHIRLPOOL 5ab86ac35f1552158b9e6c65ffd546c01bd7737fd7877aa19e05c6cccdd297bfdbfd1ba1cb7a34c4aaf9d4c5a59d0bae5334912d93d35f322a16db306fb4611d
 MISC metadata.xml 382 SHA256 2401fbdf82488b2cc69337b156a5be00f178c1c325a1f7cbe7a021f5c20ac9e4 SHA512 6fa2990fffb89cc9ad16231746e539f0665a1ea816f17c424855f1b9bb27420adcf5fa4263e64678ad5802dbc6524f280592c34053f52a66b7ff9dac3fc76cee WHIRLPOOL 913ccc6cdd6902c8255d9e5b6a0a0c7027faea36aaa81320e9e9b6581a60bb62d4a5a4c59e90347dedb4e9dbe5ab1fca35b27309954b471623d86c8d37c4fc99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iKYEAREIAGYFAlW5tr9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2QawCgvajEJj8Exm+7ZvHo85r+BjvT
+pZsAn2qQkBJjr6xlePSHdTAS/tndTt/T
+=ymTb
+-----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
deleted file mode 100644
index 19aa75bd3e0c..000000000000
--- a/dev-python/python-ldap/python-ldap-2.3.9.ebuild
+++ /dev/null
@@ -1,65 +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.3.9.ebuild,v 1.20 2012/11/14 08:17:33 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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://dev.gentoo.org/~xarthisius/distfiles/${DOC_P}.tar.gz )"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-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.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
-}
diff --git a/dev-python/python-ldap/python-ldap-2.4.18.ebuild b/dev-python/python-ldap/python-ldap-2.4.20.ebuild
index 1e4d6cbd4db2..1d160c533833 100644
--- a/dev-python/python-ldap/python-ldap-2.4.18.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.18.ebuild,v 1.3 2014/10/17 15:49:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.20.ebuild,v 1.1 2015/07/30 05:31:41 idella4 Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ 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.
 # OpenSSL is an optional runtime dep.
-# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
 RDEPEND=">net-nds/openldap-2.4.11
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]