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

Package-Manager: portage-2.1.3_rc5

5 files changed, 16 insertions, 80 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/Manifest b/dev-python/python-ldap/Manifest
index 3339e89f9899..5623e9bad392 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,30 +1,22 @@
 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 RMD160 2fa1d7a0658d6f21f7c0bdc3ca0551f3f827418c SHA1 a19dca037ce1aedafb7f321a3938c3380ee1c91a SHA256 c320ca3502426de75a5b982da2a57c44dc20c1024986d169a782299663f1c69f
 DIST python-ldap-2.2.1.tar.gz 73122 RMD160 3eaa28ff399aa42ca527145b0d607dec5d422c20 SHA1 c2dee55a7002777fe417fcc201dceb090a0207e0 SHA256 eb8ce76c6df7a3f5139baad0b1e5c2d7e1cee73eead992a77deea0ffa00979c4
 DIST python-ldap-2.3.tar.gz 74902 RMD160 c6eb0ef9b93b48c0e6209f525bfada3377442ae9 SHA1 37f1192ea19bae0d0221e155733f9cc39c2885b4 SHA256 b3658638296224e71da3a9ac9fb6a02c37c0ff1e4f0b2f020c01c607c85aff0c
-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.1.ebuild 1660 RMD160 f65165d0de8cf425a6c18ee1c61732e6496932a3 SHA1 7680e7b1a2f3a683490ab7a85e841a3f02111c03 SHA256 04ce3edbd37fa3b7f993afd67b06029c1117c75b58e294cc6db7070d6cc24889
-MD5 680ca02e8170ae0a8e0236fc2d2a5cf5 python-ldap-2.2.1.ebuild 1660
-RMD160 f65165d0de8cf425a6c18ee1c61732e6496932a3 python-ldap-2.2.1.ebuild 1660
-SHA256 04ce3edbd37fa3b7f993afd67b06029c1117c75b58e294cc6db7070d6cc24889 python-ldap-2.2.1.ebuild 1660
+EBUILD python-ldap-2.2.1.ebuild 1644 RMD160 5b782518abb5c6e0e95b4d426a7f2f449769e6c4 SHA1 e8c1fbea0cb2bb891be445e68cad0e076e47ebb2 SHA256 9793b277db1470a17cb3df8d83d47cbe01ef0a7ea1da7162b44be8f0b253eb72
+MD5 9579f83d7840078a3dca61a9e565c56e python-ldap-2.2.1.ebuild 1644
+RMD160 5b782518abb5c6e0e95b4d426a7f2f449769e6c4 python-ldap-2.2.1.ebuild 1644
+SHA256 9793b277db1470a17cb3df8d83d47cbe01ef0a7ea1da7162b44be8f0b253eb72 python-ldap-2.2.1.ebuild 1644
 EBUILD python-ldap-2.3.ebuild 1710 RMD160 015913a787d09ee65239b065c45d07724adb3426 SHA1 11cb34d384ee94d3faf74d1e7d3d4b362ff9ae7e SHA256 332643ec810bfcf663613b1213a21c6a84917e701786a5ee059244d7fa0d3f8c
 MD5 3284657e151dab8b49ac3ab06379a90e python-ldap-2.3.ebuild 1710
 RMD160 015913a787d09ee65239b065c45d07724adb3426 python-ldap-2.3.ebuild 1710
 SHA256 332643ec810bfcf663613b1213a21c6a84917e701786a5ee059244d7fa0d3f8c python-ldap-2.3.ebuild 1710
-MISC ChangeLog 6860 RMD160 a25dc220cc065c2b2035aa9fbc02469e94cb5850 SHA1 8113e5ff8a2f1687a705a1038b6a65c8b777dc8c SHA256 af80ba665e5673ac9fb9deeb236735c402253146d878490080012f4c82226716
-MD5 ef73cf277c1b1a17c0d734eefa8b2cbd ChangeLog 6860
-RMD160 a25dc220cc065c2b2035aa9fbc02469e94cb5850 ChangeLog 6860
-SHA256 af80ba665e5673ac9fb9deeb236735c402253146d878490080012f4c82226716 ChangeLog 6860
+MISC ChangeLog 7027 RMD160 9c4e152f92b720aade52432a96b9fd32a7cf1c9e SHA1 d8a444c4217108746583decb623087c1c4558a1f SHA256 26c1e5473ecafedc9a962f5b616b22b59e8128441a7c99fa9bf925e073a9ef64
+MD5 435dcba1f0c4b154f0001106ad5cd1a7 ChangeLog 7027
+RMD160 9c4e152f92b720aade52432a96b9fd32a7cf1c9e ChangeLog 7027
+SHA256 26c1e5473ecafedc9a962f5b616b22b59e8128441a7c99fa9bf925e073a9ef64 ChangeLog 7027
 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 7e77f79ded9e7e931c23621e77b325f4 files/digest-python-ldap-2.0.11 533
-RMD160 d3b3d5c2e1fbaeb7b62d4302d02794434edad66a files/digest-python-ldap-2.0.11 533
-SHA256 adde0f748cb5cbbecf242bf10f7f0ba69d63efdbefe2e6b28e58babd46019f12 files/digest-python-ldap-2.0.11 533
 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.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"