Fixed $ROOT abuse (bug #167271), dropped old version.

(Portage version: 2.1.3_rc5)

4 files changed, 8 insertions, 64 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index a0768774442e..9365ec75e292 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.54 2007/06/15 20:10:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.55 2007/06/24 20:55:26 dev-zero Exp $
+
+  24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -python-ldap-2.0.11.ebuild, python-ldap-2.2.1.ebuild:
+  Fixed $ROOT abuse (bug #167271), dropped old version.
 
   15 Jun 2007; Raúl Porcel <armin76@gentoo.org> python-ldap-2.2.1.ebuild:
   alpha stable wrt #172535
diff --git a/dev-python/python-ldap/files/digest-python-ldap-2.0.11 b/dev-python/python-ldap/files/digest-python-ldap-2.0.11
deleted file mode 100644
index 6129578cbc52..000000000000
--- a/dev-python/python-ldap/files/digest-python-ldap-2.0.11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5b788a9c88c4ba645a16226a6291f8df html-python-ldap-docs-2.0.3.tar.gz 25857
-RMD160 2dbbdfd1ac420aea441ca31e785efb33aad1c652 html-python-ldap-docs-2.0.3.tar.gz 25857
-SHA256 d39a4ae2f72b18e7f17f3c01d6d204b97c7c91521c918c0dd9155705b843ad66 html-python-ldap-docs-2.0.3.tar.gz 25857
-MD5 1c20cdbe8cfab1c92b39848f7deeb6ec python-ldap-2.0.11.tar.gz 71715
-RMD160 2fa1d7a0658d6f21f7c0bdc3ca0551f3f827418c python-ldap-2.0.11.tar.gz 71715
-SHA256 c320ca3502426de75a5b982da2a57c44dc20c1024986d169a782299663f1c69f python-ldap-2.0.11.tar.gz 71715
diff --git a/dev-python/python-ldap/python-ldap-2.0.11.ebuild b/dev-python/python-ldap/python-ldap-2.0.11.ebuild
deleted file mode 100644
index 2655949d017d..000000000000
--- a/dev-python/python-ldap/python-ldap-2.0.11.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.0.11.ebuild,v 1.7 2006/04/30 10:37:40 blubb 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 amd64 ia64 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 = ${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-/}/*
-}
diff --git a/dev-python/python-ldap/python-ldap-2.2.1.ebuild b/dev-python/python-ldap/python-ldap-2.2.1.ebuild
index 2dcfbd3a54ad..ca1e6f27d563 100644
--- a/dev-python/python-ldap/python-ldap-2.2.1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.ebuild,v 1.9 2007/06/15 20:10:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.2.1.ebuild,v 1.10 2007/06/24 20:55:26 dev-zero Exp $
 
 inherit distutils
 
@@ -26,8 +26,8 @@ src_unpack() {
 
 	# 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 = ${ROOT}usr/include:" \
-		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=${ROOT}usr/lib -Wl,-rpath=${ROOT}usr/lib/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include:" \
+		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/lib -Wl,-rpath=/usr/lib/sasl2:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"