Version bump.

(Portage version: 2203-svn)

6 files changed, 16 insertions, 93 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index bcfef454e18d..ec4ee13894d4 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.41 2006/04/30 10:37:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.42 2006/05/01 13:45:30 carlo Exp $
+
+*python-ldap-2.2.0 (01 May 2006)
+
+  01 May 2006; Carsten Lohrke <carlo@gentoo.org> -python-ldap-2.0.6.ebuild,
+  -python-ldap-2.0.10.ebuild, +python-ldap-2.2.0.ebuild:
+  Version bump.
 
   30 Apr 2006; Simon Stelling <blubb@gentoo.org> python-ldap-2.0.11.ebuild:
   stable on amd64
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 7ebc6fa105c2..0bed63af381b 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,33 +1,6 @@
-DIST html-python-ldap-docs-2.0.3.tar.gz 25857 size 25857
-DIST python-ldap-2.0.10.tar.gz 80655 size 80655
-DIST python-ldap-2.0.11.tar.gz 71715 size 71715
-DIST python-ldap-2.0.6.tar.gz 66029 size 66029
-EBUILD python-ldap-2.0.10.ebuild 1537 RMD160 9bcd6b554e73d6b5d4af3ee8ffe7a09854564f70 SHA1 7d69a029fd1ecb455bbdc8966e1a8230e38e0d27 SHA256 0d94b9d2baa10efee5f941164da622d199cec802bc300af8e18e93bf8c120ddc size 1537
-MD5 a42b1bf591212834005bfc07fae44dc9 python-ldap-2.0.10.ebuild 1537
-RMD160 9bcd6b554e73d6b5d4af3ee8ffe7a09854564f70 python-ldap-2.0.10.ebuild 1537
-SHA256 0d94b9d2baa10efee5f941164da622d199cec802bc300af8e18e93bf8c120ddc python-ldap-2.0.10.ebuild 1537
-EBUILD python-ldap-2.0.11.ebuild 1532 RMD160 4c00e4f12635db3efece744dffaf668a7297240f SHA1 3601250b12009b1233bebb0950f72634e7a2ee75 SHA256 2500a37b4ff15c0af5e6b622d4387324eaf8bd874d5c53ee0c20a0ba5b25863f size 1532
-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.0.6.ebuild 1499 RMD160 bc5f1f607a484afb2b6b910c8fcad22416175992 SHA1 3f7ec2bbcb9f94d29f7e6673ecdd343b96a0acbb SHA256 031f88cf84a2bff9cf7cf92efef9c3f01960a9247c639d395016c5a495251c99 size 1499
-MD5 0d58c818214b1bc1e5c4f0fd7c93749e python-ldap-2.0.6.ebuild 1499
-RMD160 bc5f1f607a484afb2b6b910c8fcad22416175992 python-ldap-2.0.6.ebuild 1499
-SHA256 031f88cf84a2bff9cf7cf92efef9c3f01960a9247c639d395016c5a495251c99 python-ldap-2.0.6.ebuild 1499
-MISC ChangeLog 5249 RMD160 4714d2328fe43580494a6f9046a84cd47bd98b4e SHA1 9e103caf13920e126add45e0413f61e85de01307 SHA256 0f6e4ce2026af8297c710ef38dcd31a2ed50e157f0655754643487168ca7b330 size 5249
-MD5 fbf18fd9b4a1d734d0aaf958b57d4544 ChangeLog 5249
-RMD160 4714d2328fe43580494a6f9046a84cd47bd98b4e ChangeLog 5249
-SHA256 0f6e4ce2026af8297c710ef38dcd31a2ed50e157f0655754643487168ca7b330 ChangeLog 5249
-MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 size 159
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
-SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 69d713e85c4b770343fa03ed0e8c01b7 files/digest-python-ldap-2.0.10 147
-RMD160 15dcfcf7d7e82bd2bad88e77bb3a65cbb29e05ed files/digest-python-ldap-2.0.10 147
-SHA256 e66aee0e60c3fea6e8f175dc301ce1a8015a36dc630c470798d1d5219c4587b3 files/digest-python-ldap-2.0.10 147
+MD5 95c2787edffea276345521d5c77b999a ChangeLog 5433
 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 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
-RMD160 366b048a7be355fbe19749ee5eb9a996e5413901 files/digest-python-ldap-2.0.6 146
-SHA256 0c0852ebfc3f470de935647063426dbc311cef45f96058f252968b8776c5e2d1 files/digest-python-ldap-2.0.6 146
+MD5 4ab66bf3319027a471e2294b5cef8957 files/digest-python-ldap-2.2.0 146
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 0878a01a11ac1154c001a52066fc0f02 python-ldap-2.0.11.ebuild 1532
+MD5 8e4d03708b1b5e47b3e73d5d36f242a8 python-ldap-2.2.0.ebuild 1534
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.10 b/dev-python/python-ldap/files/digest-python-ldap-2.0.10
deleted file mode 100644
index 8fed13c64d97..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6bae44766e9d7e0b03a1ea5efb5a4382 python-ldap-2.0.10.tar.gz 80655
-MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.6 b/dev-python/python-ldap/files/digest-python-ldap-2.2.0
index 63f2e3f48842..4bac22631324 100644
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.6
+++ b/dev-python/python-ldap/files/digest-python-ldap-2.2.0
@@ -1,2 +1,2 @@
-MD5 59fd9345a77451b7749a28a458406695 python-ldap-2.0.6.tar.gz 66029
 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.0.6.ebuild b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
deleted file mode 100644
index 9136e6a963a5..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 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.0.6.ebuild,v 1.7 2005/07/02 23:36:45 kloeri 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.0.11
-	sasl? ( dev-libs/cyrus-sasl )"
-
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="alpha ppc 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 = /usr/lib /usr/lib/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = /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
diff --git a/dev-python/python-ldap/python-ldap-2.0.10.ebuild b/dev-python/python-ldap/python-ldap-2.2.0.ebuild
index 0544e9d39ccc..215522daf857 100644
--- a/dev-python/python-ldap/python-ldap-2.0.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.10.ebuild,v 1.1 2005/09/30 23:50:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.2.0.ebuild,v 1.1 2006/05/01 13:45:30 carlo Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/python-ldap/${P}.tar.gz
 HOMEPAGE="http://python-ldap.sourceforge.net/"
 
 DEPEND="virtual/python
-	>=net-nds/openldap-2.0.11
+	>=net-nds/openldap-2.2
 	sasl? ( dev-libs/cyrus-sasl )"
 
 SLOT="0"