Version bump to 0.41.0. Cleanup.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 35 insertions, 86 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/Manifest b/dev-python/logilab-common/Manifest
index 1b06455c2747..b21558071415 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,14 +1,13 @@
-AUX logilab-common-0.14.0-remove-broken-modutils-test.patch 760 RMD160 5a3aa174592a14df5d8a2c1cb0c929a50279459d SHA1 2b79e7bedd04378df7d1462e296054a827ee2cc9 SHA256 de9210bea8acae9306d6ec3f60b297ca721c7db3f571dbfa9c2da87125ca4ae1
 AUX logilab-common-0.21.2-disable-access-tests-as-root.patch 1235 RMD160 f0db83d132957637d0bc1042201d035369141e47 SHA1 2395c781bf5a6c56e49f6a249aec697db1a985ff SHA256 6b8185b71a72b4d4d24c8966f5c6c66957c4fbd95f03caf136853230a1ce766a
 AUX logilab-common-0.21.2-remove-broken-tests.patch 916 RMD160 f0ec4be70ef6828ee8bbf1e1f356235f4dbf5d96 SHA1 38d62f07d30e3fffb6a946cc92d52e2500525812 SHA256 9272dc65490f7b9c82705b1b74f081a69fd01aea28ca278a592fd17a43de9333
-AUX logilab-common-0.31.0-remove-broken-tests.patch 2045 RMD160 d91343e1aafebb026f47b9b48423763defa33119 SHA1 bca77e3f4342fbbbb2a73a4cad77fdb3bbe75b75 SHA256 b6a817767577b3429080646f1b0a24c5879d04494b94e9e1912a6f9cf1470848
 AUX logilab-common-0.39.0-recursion.patch 516 RMD160 505e64a648ead5e4e01ab46f0f24f76d3a611226 SHA1 f8a920792dae3110defed3ebc056ffe7f9b015f9 SHA256 73b557388d9c901adad3476ed8c15a47a50f4420e91e427538a0cf02c4541f5f
 AUX logilab-common-0.39.0-remove-broken-tests.patch 1520 RMD160 775d5cecf91220a4b612000db979b630bd983606 SHA1 3b2906920663fde3c7157a4ee5b1879b843b470c SHA256 55d48469e605a2a6c1819e8e3084041d49f07fd5e7628cf45af88f0dcd07c9fb
-AUX logilab-common-setup.py.patch 596 RMD160 dfcc88bd4adc347f6e9f675ed32642f62bdb7036 SHA1 7aa8124db4478c4982c9c33cc3961b28dcc0cd3c SHA256 e8fccb01d1199890b91a15f61ddf943a060cb9e68af277cead63d03a2516e6d7
+AUX logilab-common-0.41.0-remove-broken-tests.patch 697 RMD160 bf3fa9c83abb0a47155486efe6d87714b4af2e68 SHA1 d226f60e0568a8476b8aa23a662b7f1cb74f6bb7 SHA256 71e5cdcdd983ec4da56a893b4191e50739aba2267a4105d4b1709ee4f4418dfd
 DIST logilab-common-0.21.2.tar.gz 121708 RMD160 f16470bd3c7d729e5e1da155d35d28d89d69c62c SHA1 1ca4e822749400458619cc6890d4aeeba277520c SHA256 11fcb8a7096e73b1be72f17427377f1693244dc0e3b071ce067560f45980780b
 DIST logilab-common-0.39.0.tar.gz 176629 RMD160 02de1650175e8c3e383c71f8e0aa935d2b132e87 SHA1 596657988e024d5d0286ba3a2a71f167eca9af1a SHA256 40dab682017bb399606a66d3f72c7906b61669ffcd113d096a7b7e1c9054550e
+DIST logilab-common-0.41.0.tar.gz 181593 RMD160 3edb5d3f27c125cc6d3d8dabc73f717a768667d4 SHA1 c08bb86b7d71851b630f906431c2ae697f40b847 SHA256 be083809adb9d161b43c05971032ce03c96d85d4d65fc383157c16f9f53d715a
 EBUILD logilab-common-0.21.2.ebuild 1684 RMD160 b0652f601a64a833002bad1ccfe5adb6b4e001f8 SHA1 cc0d188b6f46319dda66b3f018ca0e8c4f77e942 SHA256 50e3edd9907e84c4d0c474f52d19396f0e38295016d2b09d9db56919509df066
 EBUILD logilab-common-0.39.0-r1.ebuild 2326 RMD160 3ebac9d4abc72f2371e016125143d33fc7eca5eb SHA1 92a20ccec15294276256af772beff3a3bbce32f1 SHA256 60e2ae6d9074ffb3b716c166fab8adc60007d5b4d51feac6e953c5e3c5ec7ee0
-EBUILD logilab-common-0.39.0.ebuild 2240 RMD160 11b383439b7389e0bf030ee97085531baaaf0d6c SHA1 a9d31b4e39e16fe65eb9c2bfd356e42382910a57 SHA256 8333879397446e5d20a2baa3812ccfaef2963bdac844db008c8785df7ebbdf30
-MISC ChangeLog 7142 RMD160 925170f38f5b6f44a83f1f106e875326969164cf SHA1 587cca9feed862a68a00307e66a9700eb373ea9c SHA256 ab091be55f3ec4f075ed2bc6b46088592b81e5cb048d6e7e698f3a709cd2251f
+EBUILD logilab-common-0.41.0.ebuild 2157 RMD160 2636b35ae3c5728205071a69e604c47008cd5ba4 SHA1 ce17645026b135ba1f7b26226841489274429b8a SHA256 1667a250b574e80050bc8bf8bf285f12be69ff86ec86951519f782bcc87bb871
+MISC ChangeLog 7553 RMD160 253af2493953165310cba6f68d0f8c483f26f4fa SHA1 78ca803bb63098094a9a8b9ea178cad1dbe2667a SHA256 a1c60eb3382b21a9b7aaaca07253feda1e1ccca7443faf84ad19d565d3db09d4
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
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