Version bump to 0.41.0. Cleanup.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 31 insertions, 81 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 2b10bf715520..c6906000345d 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/logilab-common
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.41 2009/05/27 14:38:06 fmccor Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.42 2009/06/04 13:01:39 idl0r Exp $
+
+*logilab-common-0.41.0 (04 Jun 2009)
+
+  04 Jun 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/logilab-common-0.14.0-remove-broken-modutils-test.patch,
+  -files/logilab-common-0.31.0-remove-broken-tests.patch,
+  -logilab-common-0.39.0.ebuild, +logilab-common-0.41.0.ebuild,
+  +files/logilab-common-0.41.0-remove-broken-tests.patch,
+  -files/logilab-common-setup.py.patch:
+  Version bump to 0.41.0. Cleanup.
 
   27 May 2009; Ferris McCormick <fmccor@gentoo.org>
   logilab-common-0.21.2.ebuild:
diff --git a/dev-python/logilab-common/files/logilab-common-0.14.0-remove-broken-modutils-test.patch b/dev-python/logilab-common/files/logilab-common-0.14.0-remove-broken-modutils-test.patch
deleted file mode 100644
index 0469606ce19d..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.14.0-remove-broken-modutils-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== modified file 'test/unittest_modutils.py'
---- test/unittest_modutils.py	
-+++ test/unittest_modutils.py	
-@@ -183,15 +183,6 @@
-         self.assertEqual(modules,
-                          [path.join('data', x) for x in ['__init__.py', 'module.py', 'module2.py', 'noendingnewline.py', 'nonregr.py']])
- 
--    def test_load_module_set_attribute(self):
--        import logilab.common
--        import logilab
--        del logilab.common
--        del sys.modules['logilab.common']
--        m = modutils.load_module_from_modpath(['logilab','common'])
--        self.assert_( hasattr(logilab,'common') )
--        self.assert_( m is logilab.common )
--
- from logilab.common.testlib import DocTest
- class ModuleDocTest(DocTest):
-     """test doc test in this module"""
-
diff --git a/dev-python/logilab-common/files/logilab-common-0.31.0-remove-broken-tests.patch b/dev-python/logilab-common/files/logilab-common-0.31.0-remove-broken-tests.patch
deleted file mode 100644
index 3edc94065ac2..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.31.0-remove-broken-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur logilab-common-0.31.0/fileutils.py logilab-common-0.31.0-no-b0rked-tests/fileutils.py
---- logilab-common-0.31.0/fileutils.py	2007-03-14 15:25:28.000000000 +0200
-+++ logilab-common-0.31.0-no-b0rked-tests/fileutils.py	2008-05-13 15:28:14.062840323 +0300
-@@ -63,11 +63,6 @@
- 
- def abspath_listdir(path):
-     """lists path's content using absolute paths
--
--    >>> os.listdir('/home')
--    ['adim', 'alf', 'arthur', 'auc']    
--    >>> abspath_listdir('/home')
--    ['/home/adim', '/home/alf', '/home/arthur', '/home/auc']
-     """
-     path = abspath(path)
-     return [join(path, filename) for filename in listdir(path)]
-diff -ur logilab-common-0.31.0/test/unittest_modutils.py logilab-common-0.31.0-no-b0rked-tests/test/unittest_modutils.py
---- logilab-common-0.31.0/test/unittest_modutils.py	2007-11-26 15:53:28.000000000 +0200
-+++ logilab-common-0.31.0-no-b0rked-tests/test/unittest_modutils.py	2008-05-13 15:29:15.969844656 +0300
-@@ -138,9 +138,6 @@
-     def test_knownValues_is_standard_module_3(self):
-         self.assertEqual(modutils.is_standard_module('unknown'), False)
- 
--    def test_knownValues_is_standard_module_4(self):
--        self.assertEqual(modutils.is_standard_module('StringIO'), True)
--
-     def test_knownValues_is_standard_module_5(self):
-         self.assertEqual(modutils.is_standard_module('data.module', (DATADIR,)), True)
-         self.assertEqual(modutils.is_standard_module('data.module', (path.abspath(DATADIR),)), True)
-diff -ur logilab-common-0.31.0/test/unittest_testlib.py logilab-common-0.31.0-no-b0rked-tests/test/unittest_testlib.py
---- logilab-common-0.31.0/test/unittest_testlib.py	2008-05-08 14:21:15.000000000 +0300
-+++ logilab-common-0.31.0-no-b0rked-tests/test/unittest_testlib.py	2008-05-13 15:28:54.715834462 +0300
-@@ -459,6 +459,7 @@
- class OutErrCaptureTC(TestCase):
-     
-     def setUp(self):
-+        self.skip("cannot get this to pass")
-         sys.stdout = sys.stderr = StringIO()
-         self.runner = SkipAwareTextTestRunner(stream=StringIO(), exitfirst=True, capture=True)
- 
diff --git a/dev-python/logilab-common/files/logilab-common-0.41.0-remove-broken-tests.patch b/dev-python/logilab-common/files/logilab-common-0.41.0-remove-broken-tests.patch
new file mode 100644
index 000000000000..ea0aa77ff493
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.41.0-remove-broken-tests.patch
@@ -0,0 +1,12 @@
+--- test/unittest_modutils.py.old	2009-06-03 18:08:14.000000000 +0200
++++ test/unittest_modutils.py	2009-06-04 14:38:06.611793523 +0200
+@@ -170,9 +170,6 @@ class is_standard_module_tc(TestCase):
+     def test_knownValues_is_standard_module_3(self):
+         self.assertEqual(modutils.is_standard_module('unknown'), False)
+ 
+-    def test_knownValues_is_standard_module_4(self):
+-        self.assertEqual(modutils.is_standard_module('StringIO'), True)
+-
+     def test_knownValues_is_standard_module_5(self):
+         self.assertEqual(modutils.is_standard_module('data.module', (DATADIR,)), True)
+         self.assertEqual(modutils.is_standard_module('data.module', (path.abspath(DATADIR),)), True)
diff --git a/dev-python/logilab-common/files/logilab-common-setup.py.patch b/dev-python/logilab-common/files/logilab-common-setup.py.patch
deleted file mode 100644
index fe384d264f02..000000000000
--- a/dev-python/logilab-common/files/logilab-common-setup.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.orig	2006-09-20 09:26:15.000000000 -0700
-+++ setup.py	2006-09-20 09:26:50.000000000 -0700
-@@ -15,11 +15,11 @@
- # You should have received a copy of the GNU General Public License along with
- # this program; if not, write to the Free Software Foundation, Inc.,
- # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+from __future__ import nested_scopes
- """ Generic Setup script, takes package info from __pkginfo__.py file """
- 
- __revision__ = '$Id: setup.py,v 1.23 2004/05/27 12:07:23 syt Exp $'
- 
--from __future__ import nested_scopes
- import os
- import sys
- import shutil
diff --git a/dev-python/logilab-common/logilab-common-0.39.0.ebuild b/dev-python/logilab-common/logilab-common-0.41.0.ebuild
index d2c65aec8652..48ea06257d88 100644
--- a/dev-python/logilab-common/logilab-common-0.39.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.41.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.39.0.ebuild,v 1.1 2009/04/18 18:46:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.41.0.ebuild,v 1.1 2009/06/04 13:01:39 idl0r Exp $
 
 inherit distutils eutils python
 
-#DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab"
 DESCRIPTION="useful miscellaneous modules used by Logilab projects"
 HOMEPAGE="http://www.logilab.org/projects/common/"
 SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz"
@@ -18,9 +17,14 @@ DEPEND="test? ( dev-python/egenix-mx-base )"
 RDEPEND=""
 
 PYTHON_MODNAME="logilab"
-
 # Extra documentation (html/pdf) needs some love
 
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${P}-remove-broken-tests.patch"
+}
+
 src_test() {
 	python_version
 
@@ -47,8 +51,6 @@ src_test() {
 		pushd "${lpath}/${P/-/_}-py${PYVER}.egg/${PN/-//}" >/dev/null || die
 	fi
 
-	epatch "${FILESDIR}/${P}-remove-broken-tests.patch"
-
 	# Bug 223079
 	if ! has userpriv ${FEATURES}; then
 		rm test/unittest_fileutils.py || die