Version bump to 0.0.42, add a patch to make the tests work with twisted 2.1.0, use mirror://debian/ in SRC_URI, add missing twisted-web dependency. Remove 0.0.41.

(Portage version: 2.0.53_rc7)

6 files changed, 42 insertions, 13 deletions

diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index 089623197978..c554cc2db5b4 100644
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/ldaptor
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.11 2005/08/26 14:20:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.12 2005/11/28 12:36:57 marienz Exp $
+
+*ldaptor-0.0.42 (28 Nov 2005)
+
+  28 Nov 2005; Marien Zwart <marienz@gentoo.org>
+  +files/ldaptor-0.0.42-trial-2.1-compat.patch, -ldaptor-0.0.41.ebuild,
+  +ldaptor-0.0.42.ebuild:
+  Version bump to 0.0.42, add a patch to make the tests work with twisted
+  2.1.0, use mirror://debian/ in SRC_URI, add missing twisted-web dependency.
+  Remove 0.0.41.
 
   26 Aug 2005; Aron Griffis <agriffis@gentoo.org> ldaptor-0.0.6.ebuild:
   add ~ia64
diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index e2219c023ef2..49b4252f6029 100644
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -1,6 +1,7 @@
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 f9fbcba8544e83a1d52fc2a1ce250bdf ChangeLog 1176
-MD5 c791de3cfca7aa2ac58ff95787146e90 ldaptor-0.0.6.ebuild 1261
-MD5 1386b13c98e416060b9fae1cd955bf87 ldaptor-0.0.41.ebuild 1880
-MD5 f1a50bdcead4cc02050cb4bcc614b1a0 files/digest-ldaptor-0.0.41 66
+MD5 1b48d695ec91405d218642bcb314d158 files/digest-ldaptor-0.0.42 66
 MD5 43feb7d34a8c766f9dc97801fb2a7ce5 files/digest-ldaptor-0.0.6 64
+MD5 da3a030bf2a5c7d1aad834223aa777ff files/ldaptor-0.0.42-trial-2.1-compat.patch 794
+MD5 0fce8e15adbbb3de7b2447bd45299af4 ldaptor-0.0.42.ebuild 1865
+MD5 c791de3cfca7aa2ac58ff95787146e90 ldaptor-0.0.6.ebuild 1261
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
diff --git a/dev-python/ldaptor/files/digest-ldaptor-0.0.41 b/dev-python/ldaptor/files/digest-ldaptor-0.0.41
deleted file mode 100644
index 57d21afa676d..000000000000
--- a/dev-python/ldaptor/files/digest-ldaptor-0.0.41
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f995e37ee84e35f64a0f75eb9d1ffbd1 ldaptor_0.0.41.tar.gz 201131
diff --git a/dev-python/ldaptor/files/digest-ldaptor-0.0.42 b/dev-python/ldaptor/files/digest-ldaptor-0.0.42
new file mode 100644
index 000000000000..212e18dee8c4
--- /dev/null
+++ b/dev-python/ldaptor/files/digest-ldaptor-0.0.42
@@ -0,0 +1 @@
+MD5 7ab24ff150b79c542c6f3f5e3e67e7b7 ldaptor_0.0.42.tar.gz 203500
diff --git a/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch b/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch
new file mode 100644
index 000000000000..97594ade28ef
--- /dev/null
+++ b/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch
@@ -0,0 +1,17 @@
+diff -ur ldaptor-0.0.42-orig/ldaptor/test/test_ldiftree.py ldaptor-0.0.42/ldaptor/test/test_ldiftree.py
+--- ldaptor-0.0.42-orig/ldaptor/test/test_ldiftree.py	2005-11-28 13:04:49.000000000 +0100
++++ ldaptor-0.0.42/ldaptor/test/test_ldiftree.py	2005-11-28 13:14:08.000000000 +0100
+@@ -23,11 +23,11 @@
+     def setUpClass(self):
+         self.__listdir = os.listdir
+         os.listdir = self.randomListdir
+-        super(RandomizeListdirMixin, self).setUpClass()
++        # super(RandomizeListdirMixin, self).setUpClass()
+ 
+     def tearDownClass(self):
+         os.listdir = self.__listdir
+-        super(RandomizeListdirMixin, self).tearDownClass()
++        # super(RandomizeListdirMixin, self).tearDownClass()
+ 
+ class Dir2LDIF(RandomizeListdirMixin, unittest.TestCase):
+     def setUp(self):
diff --git a/dev-python/ldaptor/ldaptor-0.0.41.ebuild b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
index edd55adc87e0..1b70d867ec8e 100644
--- a/dev-python/ldaptor/ldaptor-0.0.41.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.41.ebuild,v 1.1 2005/07/04 16:01:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.1 2005/11/28 12:36:57 marienz Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="set of LDAP utilities for use from the command line"
 HOMEPAGE="http://www.inoi.fi/open/trac/ldaptor"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/ldaptor/${PN}_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/l/ldaptor/${PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -17,7 +17,10 @@ DEPEND=">=dev-python/twisted-2
 	dev-python/twisted-names
 	dev-python/twisted-mail
 	dev-python/pyparsing
-	web? ( >=dev-python/nevow-0.3 )
+	web? (
+		>=dev-python/nevow-0.3
+		dev-python/twisted-web
+	)
 	doc? (
 		dev-python/epydoc
 		app-office/dia
@@ -30,9 +33,8 @@ DOCS="README TODO ldaptor.schema"
 
 src_unpack() {
 	unpack ${A}
-	if [ -f ${FILESDIR}/${P}-svn-update.patch ]; then
-		epatch ${FILESDIR}/${P}-svn-update.patch
-	fi
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-trial-2.1-compat.patch"
 }
 
 src_compile() {