Version bump, fixed bug #137503 and possible others. Dropped old version.

(Portage version: 2.1.2_rc4-r1)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 72 deletions

diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index ceaa8ff6e1f0..d17e4d7065f1 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,25 +1,25 @@
-DIST html-python-ldap-docs-2.0.3.tar.gz 25857
+DIST html-python-ldap-docs-2.0.3.tar.gz 25857 RMD160 2dbbdfd1ac420aea441ca31e785efb33aad1c652 SHA1 a2240e12c3760a32d6f4e4cd72d3b5cd1cd858d6 SHA256 d39a4ae2f72b18e7f17f3c01d6d204b97c7c91521c918c0dd9155705b843ad66
 DIST python-ldap-2.0.11.tar.gz 71715
-DIST python-ldap-2.2.0.tar.gz 70993
+DIST python-ldap-2.2.1.tar.gz 73122 RMD160 3eaa28ff399aa42ca527145b0d607dec5d422c20 SHA1 c2dee55a7002777fe417fcc201dceb090a0207e0 SHA256 eb8ce76c6df7a3f5139baad0b1e5c2d7e1cee73eead992a77deea0ffa00979c4
 EBUILD python-ldap-2.0.11.ebuild 1532 RMD160 4c00e4f12635db3efece744dffaf668a7297240f SHA1 3601250b12009b1233bebb0950f72634e7a2ee75 SHA256 2500a37b4ff15c0af5e6b622d4387324eaf8bd874d5c53ee0c20a0ba5b25863f
 MD5 0878a01a11ac1154c001a52066fc0f02 python-ldap-2.0.11.ebuild 1532
 RMD160 4c00e4f12635db3efece744dffaf668a7297240f python-ldap-2.0.11.ebuild 1532
 SHA256 2500a37b4ff15c0af5e6b622d4387324eaf8bd874d5c53ee0c20a0ba5b25863f python-ldap-2.0.11.ebuild 1532
-EBUILD python-ldap-2.2.0.ebuild 1542 RMD160 9f25f733471a2d1f89f9576c6943f0117b0dd590 SHA1 3eec7483e62b4f67be7303b8d93cbbd60f26c2f6 SHA256 329831499e927db5099bfc767c5c9529d6a48d40e922bb23fea8aa6b97f8e30f
-MD5 b5300107ef3dfa10a777521dbf48e54f python-ldap-2.2.0.ebuild 1542
-RMD160 9f25f733471a2d1f89f9576c6943f0117b0dd590 python-ldap-2.2.0.ebuild 1542
-SHA256 329831499e927db5099bfc767c5c9529d6a48d40e922bb23fea8aa6b97f8e30f python-ldap-2.2.0.ebuild 1542
-MISC ChangeLog 5539 RMD160 849607d3a0b4af700682cf4a6a5a3283453f920b SHA1 b7ebc32a35d459edaf897d62f37c6b714a3c285a SHA256 b20d78f18b18ff9d691187615f507ade53b457555ce2f10ddf36279f314700d1
-MD5 3922b4e95af668f0a46e0a676940bf5c ChangeLog 5539
-RMD160 849607d3a0b4af700682cf4a6a5a3283453f920b ChangeLog 5539
-SHA256 b20d78f18b18ff9d691187615f507ade53b457555ce2f10ddf36279f314700d1 ChangeLog 5539
+EBUILD python-ldap-2.2.1.ebuild 1683 RMD160 6af6aeced1f15a89c9b9a2dacde28437f5671758 SHA1 dba5a78efc19f2809858e2d012a0a3bdf010b19a SHA256 be737f773d42764cc505d333d7bfa89ffc5af3ac7bdb5ddd112b4f37252a0a0a
+MD5 d3ab907c6d6e9801b65c127e1f7cb38f python-ldap-2.2.1.ebuild 1683
+RMD160 6af6aeced1f15a89c9b9a2dacde28437f5671758 python-ldap-2.2.1.ebuild 1683
+SHA256 be737f773d42764cc505d333d7bfa89ffc5af3ac7bdb5ddd112b4f37252a0a0a python-ldap-2.2.1.ebuild 1683
+MISC ChangeLog 5760 RMD160 6219d86d9cc49ea980656f367808455b25d8a815 SHA1 0aefe15e8cd5f2025e27744e0cb3ff6689b336fa SHA256 d45539879388f842d8734b31573bb6f526941f3f859872ab946e30c5366d9dde
+MD5 b0e18c9759ea4abb027a3d1b568ceae2 ChangeLog 5760
+RMD160 6219d86d9cc49ea980656f367808455b25d8a815 ChangeLog 5760
+SHA256 d45539879388f842d8734b31573bb6f526941f3f859872ab946e30c5366d9dde ChangeLog 5760
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 150055e48f2631fffd32bdb4e40b067b files/digest-python-ldap-2.0.11 147
-RMD160 9228f68eadeecd32911828fe1e8d7fd95d66fde5 files/digest-python-ldap-2.0.11 147
-SHA256 c64222112a92eb4bca07cee5eca09807faa8ef864e93ce12080d8aaab476da7e files/digest-python-ldap-2.0.11 147
-MD5 4ab66bf3319027a471e2294b5cef8957 files/digest-python-ldap-2.2.0 146
-RMD160 553af2e4d90d0843f79247e172bbb4a2adeb2920 files/digest-python-ldap-2.2.0 146
-SHA256 331ebc225b8704f5bd74ef30c1b7600782ab08af3b3ac5d0310e858ceed24209 files/digest-python-ldap-2.2.0 146
+MD5 6f942040b2dccbc9371623f64c5ac5a1 files/digest-python-ldap-2.0.11 349
+RMD160 5d46989a0b0e35e2abf848eb83985691df2b30ad files/digest-python-ldap-2.0.11 349
+SHA256 db09f05e1ca321125ffccc3e6bd5736d6a40b59aa39a11ed18333df656cf3b43 files/digest-python-ldap-2.0.11 349
+MD5 3901ffcf0bb1bb6a554f47ba58827414 files/digest-python-ldap-2.2.1 530
+RMD160 42e80c79f0287482f07c477aaafb0900a688d9ec files/digest-python-ldap-2.2.1 530
+SHA256 a8763ecec1e7b5a1b5d6c9fd8b7018e1b3420835266389a6446d428f1cc72b3d files/digest-python-ldap-2.2.1 530
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.2.0 b/dev-python/python-ldap/files/digest-python-ldap-2.2.0
deleted file mode 100644
index 4bac22631324..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
-MD5 f17b02ef1dc6ab12d819bfef9c036627 python-ldap-2.2.0.tar.gz 70993
diff --git a/dev-python/python-ldap/python-ldap-2.2.0.ebuild b/dev-python/python-ldap/python-ldap-2.2.0.ebuild
deleted file mode 100644
index 008a1b6fd125..000000000000
--- a/dev-python/python-ldap/python-ldap-2.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 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.0.ebuild,v 1.2 2006/12/22 19:44:44 corsair Exp $
-
-inherit distutils
-
-#MY_P=${P/_pre/pre}
-#S=${WORKDIR}/${MY_P}
-P_DOC="html-python-ldap-docs-2.0.3" # no newer docs available
-
-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/"
-
-DEPEND="virtual/python
-	>=net-nds/openldap-2.2
-	sasl? ( dev-libs/cyrus-sasl )"
-
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc sasl ssl"
-
-PYTHON_MODNAME="ldap"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp setup.cfg setup.cfg.orig
-	sed -e "s:^library_dirs =.*:library_dirs = ${ROOT}/usr/lib ${ROOT}/usr/lib/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${ROOT}/usr/include:" \
-		-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
-	use doc && dohtml -r ${WORKDIR}/${P_DOC/html-/}/*
-}
\ No newline at end of file