version bump, clean up

(Portage version: 2.0.51.22-r2)

16 files changed, 20 insertions, 273 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 9178b97d124d..70c78f93115e 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.33 2005/08/26 03:41:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.34 2005/09/30 23:50:19 carlo Exp $
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  -python-ldap-2.0.0_pre05-r1.ebuild, -python-ldap-2.0.0_pre06.ebuild,
+  -python-ldap-2.0.0_pre13.ebuild, -python-ldap-2.0.0_pre15.ebuild,
+  -python-ldap-2.0.1.ebuild, -python-ldap-2.0.7.ebuild,
+  -python-ldap-2.0.8.ebuild, +python-ldap-2.0.10.ebuild:
+  clean up
+
+*python-ldap-2.0.10 (30 Sep 2005)
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.10.ebuild:
+  version bump
 
   26 Aug 2005; Aron Griffis <agriffis@gentoo.org> python-ldap-2.0.8.ebuild:
   add ~ia64
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index f29e49f169dd..67282c06c182 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,18 +1,6 @@
+MD5 4181dc2efd94addb992201f2eff8dde1 python-ldap-2.0.10.ebuild 1428
 MD5 0d58c818214b1bc1e5c4f0fd7c93749e python-ldap-2.0.6.ebuild 1499
-MD5 7e37fe12975e3aedab254498f3ce3a67 python-ldap-2.0.8.ebuild 1518
-MD5 a5d963dc1fb8bf4b38b2256d21aba2a6 python-ldap-2.0.0_pre13.ebuild 1223
-MD5 3f920172b2c1cd03da5a3b199958a36a python-ldap-2.0.1.ebuild 1217
+MD5 64e038700621d7c88e6769c076ef26ea ChangeLog 4485
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 80696f585e84d0c00c71dad19f27e2d9 python-ldap-2.0.7.ebuild 1503
-MD5 835b680b788e80e2ef4fd3257da24b38 ChangeLog 4044
-MD5 b7e59d7cc60c3e4318a95b8c473e2184 python-ldap-2.0.0_pre15.ebuild 1224
-MD5 43a536a09d803ef117c03acc94140483 python-ldap-2.0.0_pre06.ebuild 807
-MD5 ab4ee9bc20346917722d8ad1b7b280f4 python-ldap-2.0.0_pre05-r1.ebuild 862
-MD5 45f27ac957d1d832996bbea74d5a2cd4 files/digest-python-ldap-2.0.0_pre15 73
-MD5 32f8805ac258891cf2b812650e9ccada files/digest-python-ldap-2.0.8 146
-MD5 aaef21adf6aa58c8fc0a0627f3ceae5f files/digest-python-ldap-2.0.0_pre06 73
+MD5 69d713e85c4b770343fa03ed0e8c01b7 files/digest-python-ldap-2.0.10 147
 MD5 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
-MD5 7c4a7f327a0bc9843e8fda91f445ee63 files/digest-python-ldap-2.0.0_pre13 73
-MD5 723c1d8442cfe6963dafc684fb63f947 files/digest-python-ldap-2.0.7 146
-MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
-MD5 541bee8c642ff21d07d3bec72c1ee6d4 files/digest-python-ldap-2.0.1 68
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre05-r1 b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre05-r1
deleted file mode 100644
index a0023f32cbb7..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre05-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8de6fb19e415a84e1cfc73264c0573df python-ldap-2.0.0pre05.tar.gz 46111
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre06 b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre06
deleted file mode 100644
index 9beaadea3d2f..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b0f7ff30bca97f7e9540ca9758961c2 python-ldap-2.0.0pre06.tar.gz 59668
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre13 b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre13
deleted file mode 100644
index 527ff8e678d4..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec69151b7d674f99f7498df9763eced7 python-ldap-2.0.0pre13.tar.gz 62480
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15 b/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15
deleted file mode 100644
index 99034b22d193..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.0_pre15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f948b4399a6b8068c4aae0e9cf5f6842 python-ldap-2.0.0pre15.tar.gz 73156
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.1 b/dev-python/python-ldap/files/digest-python-ldap-2.0.1
deleted file mode 100644
index 1c69f0f4333c..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb8b790d7825a8d400a080634a5ba0aa python-ldap-2.0.1.tar.gz 64782
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.7 b/dev-python/python-ldap/files/digest-python-ldap-2.0.10
index 9d651c6c9577..8fed13c64d97 100644
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.7
+++ b/dev-python/python-ldap/files/digest-python-ldap-2.0.10
@@ -1,2 +1,2 @@
-MD5 d26798f1224c894b2eb99f4c9babf142 python-ldap-2.0.7.tar.gz 70684
+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.8 b/dev-python/python-ldap/files/digest-python-ldap-2.0.8
deleted file mode 100644
index 1d10bee30439..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 69bf92673fba5c1965fdabcc98ea2941 python-ldap-2.0.8.tar.gz 72168
-MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre05-r1.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre05-r1.ebuild
deleted file mode 100644
index f9700858d5f5..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.0_pre05-r1.ebuild
+++ /dev/null
@@ -1,28 +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.0_pre05-r1.ebuild,v 1.14 2005/01/03 15:53:48 gustavoz Exp $
-
-VERSION="2.0.0pre05"
-S=${WORKDIR}/${PN}-${VERSION}
-DESCRIPTION="Various LDAP-related Python modules"
-SRC_URI="mirror://sourceforge/python-ldap/python-ldap-${VERSION}.tar.gz"
-HOMEPAGE="http://python-ldap.sourceforge.net/"
-
-DEPEND="virtual/python
-	>=net-nds/openldap-2.0.11"
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 sparc alpha"
-IUSE=""
-
-inherit distutils
-
-src_compile() {
-	mv setup.cfg setup.cfg.orig
-	sed -e "s|/usr/local/openldap2/lib|/usr/lib|" \
-	    -e "s|/usr/local/openldap2/include|/usr/include|" \
-		-e "s|libs = ldap lber|libs = ldap lber resolv|" \
-		setup.cfg.orig > setup.cfg || die
-
-	distutils_src_compile
-}
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre06.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre06.ebuild
deleted file mode 100644
index 907d658c3205..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.0_pre06.ebuild
+++ /dev/null
@@ -1,28 +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.0_pre06.ebuild,v 1.9 2005/01/03 15:53:48 gustavoz Exp $
-
-inherit distutils
-
-IUSE=""
-MYP=${P/_pre/pre}
-S=${WORKDIR}/${MYP}
-DESCRIPTION="Various LDAP-related Python modules"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-HOMEPAGE="http://python-ldap.sourceforge.net/"
-
-DEPEND="virtual/python
-	>=net-nds/openldap-2.0.11"
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 ~sparc ~alpha"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/openldap.*/lib|/usr/lib|" \
-	    -e "s|/usr/local/openldap.*/include|/usr/include|" \
-		-e "s|libs = ldap lber|libs = ldap lber resolv|" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-}
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild
deleted file mode 100644
index 8ed30fc251d5..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.0_pre13.ebuild
+++ /dev/null
@@ -1,46 +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.0_pre13.ebuild,v 1.9 2005/01/03 15:53:48 gustavoz Exp $
-
-inherit distutils
-
-IUSE="sasl ssl"
-MY_P=${P/_pre/pre}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Various LDAP-related Python modules"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.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="x86 sparc ~alpha"
-
-PYTHON_MODNAME="ldap"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/openldap.*/lib|/usr/lib|" \
-	    -e "s|/usr/local/openldap.*/include|/usr/include|" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs
-	use sasl \
-		&& mylibs="${mylibs} sasl2 ldap" \
-		|| mylibs="${mylibs} ldap"
-
-	# Fixes bug #25693
-	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
-
-	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"
-
-}
-
diff --git a/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild b/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild
deleted file mode 100644
index 9d433204b92c..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.0_pre15.ebuild
+++ /dev/null
@@ -1,46 +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.0_pre15.ebuild,v 1.6 2005/01/03 15:53:48 gustavoz Exp $
-
-inherit distutils
-
-IUSE="sasl ssl"
-MY_P=${P/_pre/pre}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Various LDAP-related Python modules"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.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="~x86 ~sparc alpha"
-
-PYTHON_MODNAME="ldap"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/openldap.*/lib|/usr/lib|" \
-	    -e "s|/usr/local/openldap.*/include|/usr/include|" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs
-	use sasl \
-		&& mylibs="${mylibs} sasl2 ldap" \
-		|| mylibs="${mylibs} ldap"
-
-	# Fixes bug #25693
-	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
-
-	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"
-
-}
-
diff --git a/dev-python/python-ldap/python-ldap-2.0.1.ebuild b/dev-python/python-ldap/python-ldap-2.0.1.ebuild
deleted file mode 100644
index 09c39bfd0297..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.1.ebuild
+++ /dev/null
@@ -1,44 +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.1.ebuild,v 1.6 2005/01/03 15:53:48 gustavoz Exp $
-
-inherit distutils
-
-IUSE="sasl ssl"
-#MY_P=${P/_pre/pre}
-#S=${WORKDIR}/${MY_P}
-DESCRIPTION="Various LDAP-related Python modules"
-SRC_URI="mirror://sourceforge/${PN}/${P}.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="x86 sparc alpha ppc"
-
-PYTHON_MODNAME="ldap"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/openldap.*/lib|/usr/lib|" \
-	    -e "s|/usr/local/openldap.*/include|/usr/include|" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs
-	use sasl \
-		&& mylibs="${mylibs} sasl2 ldap" \
-		|| mylibs="${mylibs} ldap"
-
-	# Fixes bug #25693
-	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
-
-	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"
-}
diff --git a/dev-python/python-ldap/python-ldap-2.0.8.ebuild b/dev-python/python-ldap/python-ldap-2.0.10.ebuild
index a584a8bf315c..0544e9d39ccc 100644
--- a/dev-python/python-ldap/python-ldap-2.0.8.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.0.10.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.3 2005/08/26 03:41:56 agriffis Exp $
+# $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 $
 
 inherit distutils
 
@@ -28,8 +28,8 @@ 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:" \
+	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"
diff --git a/dev-python/python-ldap/python-ldap-2.0.7.ebuild b/dev-python/python-ldap/python-ldap-2.0.7.ebuild
deleted file mode 100644
index 7c288a856797..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.7.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.7.ebuild,v 1.1 2005/05/15 21:54:01 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