Version bump. Fixed tests. Removed older versions: 0.5.0, 0.10.0, 0.12.0, 0.13.0, 0.13.0-r1.

(Portage version: 2.1_pre7-r3)

15 files changed, 31 insertions, 249 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index e86e6f977a7c..496bdac4765c 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.24 2006/04/01 15:06:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.25 2006/04/02 18:19:06 lucass Exp $
+
+*logilab-common-0.15.0 (02 Apr 2006)
+
+  02 Apr 2006; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/logilab-common-0.13.0-configuration-help-test-less-strict.patch,
+  -files/logilab-common-0.13.0-dbapi-skip-tests.patch,
+  -logilab-common-0.5.0.ebuild, -logilab-common-0.10.0.ebuild,
+  -logilab-common-0.12.0.ebuild, -logilab-common-0.13.0.ebuild,
+  -logilab-common-0.13.0-r1.ebuild, +logilab-common-0.15.0.ebuild:
+  Version bump. Fixed tests. Removed older versions: 0.5.0, 0.10.0, 0.12.0,
+  0.13.0, 0.13.0-r1.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org>
   logilab-common-0.14.1.ebuild:
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index d0be1e36a2d2..732629c0ecb1 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 cfbb26f24c573c461eff593a07f0a498 ChangeLog 3865
 RMD160 3744793f395b95e710728923fab23f5120178366 ChangeLog 3865
 SHA256 22e02b319cf1e09d115807297b68ac20afc055ef53531398a63ba05674e1df5f ChangeLog 3865
@@ -22,6 +19,9 @@ SHA256 9100493b830f3f3ea8a79b0b0cf3f514a4eea8f4d58ce4da7ffeba07c5423503 files/di
 MD5 2f038e070b7228fd6c3c662f0b877de0 files/digest-logilab-common-0.14.1 241
 RMD160 eaef5a057c4d96eaab20a9f4027ec248fcc4d7c7 files/digest-logilab-common-0.14.1 241
 SHA256 42585eb8624454e058b47763aad013663afaec16c764ae48f57be965d570b098 files/digest-logilab-common-0.14.1 241
+MD5 26951cda621519b1e1189fda17c81020 files/digest-logilab-common-0.15.0 241
+RMD160 ea2d900cac25f380cd8d6009a4f2dc645916bff4 files/digest-logilab-common-0.15.0 241
+SHA256 87ba593fe60b1c54120f4bba7c1a4636a10d0d4cc969288313b253e6a1fb8764 files/digest-logilab-common-0.15.0 241
 MD5 229d5c1c48d6d7a481231e941be3abc6 files/digest-logilab-common-0.5.0 63
 RMD160 6574edd2ac4a312f1f30a55e814fc7dc97b595eb files/digest-logilab-common-0.5.0 63
 SHA256 664bf1037c309e0580262c86e042d588476bcf9eb2f523dacd7c4c1009a505f9 files/digest-logilab-common-0.5.0 63
@@ -55,6 +55,9 @@ SHA256 935c4e818a01f43323692be40d55e8c6f01f19c5993bad53dad7175746e0eb02 logilab-
 MD5 f07d841ba9378f36ebe85353e197045a logilab-common-0.14.1.ebuild 1431
 RMD160 ee75fccd22a01998bbf9baab27e3c8772066e42b logilab-common-0.14.1.ebuild 1431
 SHA256 7de95faaa2551a21ec13e1335d0a24fc9d35443dca34225706a477d2c78bd9ec logilab-common-0.14.1.ebuild 1431
+MD5 83347dd9a063380804d48227210f89a0 logilab-common-0.15.0.ebuild 1506
+RMD160 f2c90a801950c06758afe9e649268d34b841c09e logilab-common-0.15.0.ebuild 1506
+SHA256 8be414008bfb54dc49a07fd5e45d1838cc033d3e257c218e39cadd2b68f1ba45 logilab-common-0.15.0.ebuild 1506
 MD5 49e47ae120639f7eaed252393cd57f9c logilab-common-0.5.0.ebuild 627
 RMD160 694647c1b68324005ff4afebc391319588e92e84 logilab-common-0.5.0.ebuild 627
 SHA256 86478a41c2dec75ddd940e80956a14c1299479534307627ee89e4bbd648e6616 logilab-common-0.5.0.ebuild 627
@@ -64,10 +67,3 @@ SHA256 88d2229b0dd76b9274b999d2f829771ad22c9e93c0036b1e5ffd94c4aae9f45a logilab-
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELpcGJrHF4yAQTrARAi/AAKCc0nSWsSKT7r8ES6BJo2BesOrHFwCfQERD
-Zh1tmFllekvA5TQCwuw5QzQ=
-=GygX
------END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.10.0 b/dev-python/logilab-common/files/digest-logilab-common-0.10.0
deleted file mode 100644
index 697259a38951..000000000000
--- a/dev-python/logilab-common/files/digest-logilab-common-0.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 827603ee7ec459377cf78f0a5eb58d1b common-0.10.0.tar.gz 160428
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.12.0 b/dev-python/logilab-common/files/digest-logilab-common-0.12.0
deleted file mode 100644
index c63482fffb71..000000000000
--- a/dev-python/logilab-common/files/digest-logilab-common-0.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97d263de68c2ee73cc123969a91f6e7e common-0.12.0.tar.gz 170614
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.13.0 b/dev-python/logilab-common/files/digest-logilab-common-0.13.0
deleted file mode 100644
index ab6146f1c10b..000000000000
--- a/dev-python/logilab-common/files/digest-logilab-common-0.13.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz 140530
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.13.0-r1 b/dev-python/logilab-common/files/digest-logilab-common-0.13.0-r1
deleted file mode 100644
index ab6146f1c10b..000000000000
--- a/dev-python/logilab-common/files/digest-logilab-common-0.13.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz 140530
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.15.0 b/dev-python/logilab-common/files/digest-logilab-common-0.15.0
new file mode 100644
index 000000000000..b5763a5361d1
--- /dev/null
+++ b/dev-python/logilab-common/files/digest-logilab-common-0.15.0
@@ -0,0 +1,3 @@
+MD5 1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz 140909
+RMD160 c03fc7c7da4700c2320a78922ade833824d285a5 common-0.15.0.tar.gz 140909
+SHA256 c8bb306ec5dc7dfb9e6f3d61cf089bbac62e5e5fc22824ff41cb770fc8e8c2de common-0.15.0.tar.gz 140909
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.5.0 b/dev-python/logilab-common/files/digest-logilab-common-0.5.0
deleted file mode 100644
index 8ea02352a227..000000000000
--- a/dev-python/logilab-common/files/digest-logilab-common-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db6cbc67fe7b3d149513e0814322578c common-0.5.0.tar.gz 71639
diff --git a/dev-python/logilab-common/files/logilab-common-0.13.0-configuration-help-test-less-strict.patch b/dev-python/logilab-common/files/logilab-common-0.13.0-configuration-help-test-less-strict.patch
deleted file mode 100644
index f4c30bccd7a1..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.13.0-configuration-help-test-less-strict.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-=== modified file 'test/unittest_configuration.py'
---- test/unittest_configuration.py	
-+++ test/unittest_configuration.py	
-@@ -145,7 +145,13 @@
-         
-     def test_help(self):
-         self.cfg.add_help_section('bonus', 'a nice additional help')
--        self.assertLinesEquals(self.cfg.help().strip(), """usage: Just do it ! (tm)
-+        help = self.cfg.help().strip()
-+        # at least in python 2.4.2 the output is:
-+        # '  -v <string>, --value=<string>'
-+        # it is not unlikely some optik/optparse versions do print -v<string>
-+        # so accept both
-+        help = help.replace(' -v <string>, ', ' -v<string>, ')
-+        self.assertLinesEquals(help, """usage: Just do it ! (tm)
- 
- options:
-   -h, --help            show this help message and exit
-
diff --git a/dev-python/logilab-common/files/logilab-common-0.13.0-dbapi-skip-tests.patch b/dev-python/logilab-common/files/logilab-common-0.13.0-dbapi-skip-tests.patch
deleted file mode 100644
index 43a5d2c6551f..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.13.0-dbapi-skip-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-=== modified file 'test/unittest_db.py'
---- test/unittest_db.py	
-+++ test/unittest_db.py	
-@@ -92,9 +92,12 @@
- 
-     def test_connection_wrap(self):
-         """Tests the connection wrapping"""
--        cnx = get_connection('postgres',
--                             self.host, self.db, self.user, self.passwd,
--                             quiet=1)
-+        try:
-+            cnx = get_connection('postgres',
-+                                 self.host, self.db, self.user, self.passwd,
-+                                 quiet=1)
-+        except ImportError:
-+            self.skip('postgresql dbapi module not installed')
-         self.failIf(isinstance(cnx, PyConnection),
-                     'cnx should *not* be a PyConnection instance')
-         cnx = get_connection('postgres',
-@@ -106,9 +109,12 @@
- 
-     def test_cursor_wrap(self):
-         """Tests cursor wrapping"""
--        cnx = get_connection('postgres',
--                             self.host, self.db, self.user, self.passwd,
--                             quiet=1, pywrap = True)
-+        try:
-+            cnx = get_connection('postgres',
-+                                 self.host, self.db, self.user, self.passwd,
-+                                 quiet=1, pywrap = True)
-+        except ImportError:
-+            self.skip('postgresql dbapi module not installed')
-         cursor = cnx.cursor()
-         self.failUnless(isinstance(cursor, PyCursor),
-                         'cnx should be a PyCursor instance')
-@@ -134,8 +140,11 @@
-         
-     def test_pgdb_types(self):
-         """Tests that NUMBER really wraps all number types"""
--        set_prefered_driver('postgres', 'pgdb')        
--        module = get_dbapi_compliant_module('postgres')
-+        set_prefered_driver('postgres', 'pgdb')
-+        try:
-+            module = get_dbapi_compliant_module('postgres')
-+        except ImportError:
-+            self.skip('python-pqsql is not installed')
-         number_types = 'int2', 'int4', 'serial', \
-                        'int8', 'float4', 'float8', \
-                        'numeric', 'bool', 'money'
-@@ -146,16 +155,25 @@
-     def test_pypgsql_getattr(self):
-         """Tests the getattr() delegation for pyPgSQL"""
-         set_prefered_driver('postgres', 'pyPgSQL.PgSQL')
--        module = get_dbapi_compliant_module('postgres')
-+        try:
-+            module = get_dbapi_compliant_module('postgres')
-+        except ImportError:
-+            self.skip('python-pygresql is not installed')
-         try:
-             binary = module.BINARY
-         except AttributeError, err:
-             self.fail(str(err))        
- 
-     def test_adv_func_helper(self):
--        module = get_dbapi_compliant_module('postgres')
-+        try:
-+            module = get_dbapi_compliant_module('postgres')
-+        except ImportError:
-+            self.skip('postgres dbapi module is not installed')
-         self.failUnless(isinstance(module.adv_func_helper, _PGAdvFuncHelper))
--        module = get_dbapi_compliant_module('sqlite')
-+        try:
-+            module = get_dbapi_compliant_module('sqlite')
-+        except ImportError:
-+            self.skip('pysqlite is not installed')
-         self.failUnless(isinstance(module.adv_func_helper, _GenericAdvFuncHelper))
- 
- 
-
diff --git a/dev-python/logilab-common/logilab-common-0.10.0.ebuild b/dev-python/logilab-common/logilab-common-0.10.0.ebuild
deleted file mode 100644
index 1b2848acf26d..000000000000
--- a/dev-python/logilab-common/logilab-common-0.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 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.10.0.ebuild,v 1.1 2005/05/27 17:40:13 liquidx Exp $
-
-inherit distutils
-
-DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab."
-HOMEPAGE="http://www.logilab.org/projects/common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=""
-
-S=${WORKDIR}/${P#logilab-}
-
-PYTHON_MODNAME="logilab"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/dev-python/logilab-common/logilab-common-0.12.0.ebuild b/dev-python/logilab-common/logilab-common-0.12.0.ebuild
deleted file mode 100644
index 029fb2e0f06d..000000000000
--- a/dev-python/logilab-common/logilab-common-0.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 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.12.0.ebuild,v 1.1 2005/11/05 20:15:10 lucass Exp $
-
-inherit distutils
-
-DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab."
-HOMEPAGE="http://www.logilab.org/projects/common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )"
-
-S=${WORKDIR}/${P#logilab-}
-
-PYTHON_MODNAME="logilab"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/dev-python/logilab-common/logilab-common-0.13.0-r1.ebuild b/dev-python/logilab-common/logilab-common-0.13.0-r1.ebuild
deleted file mode 100644
index bfcd8565f2d3..000000000000
--- a/dev-python/logilab-common/logilab-common-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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/logilab-common/logilab-common-0.13.0-r1.ebuild,v 1.1 2006/01/19 16:45:37 marienz Exp $
-
-inherit distutils
-
-DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab."
-HOMEPAGE="http://www.logilab.org/projects/common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )"
-
-S=${WORKDIR}/${P#logilab-}
-
-PYTHON_MODNAME="logilab"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-dbapi-skip-tests.patch"
-	epatch "${FILESDIR}/${P}-configuration-help-test-less-strict.patch"
-	# the permissions for this file are 400 in the tarball for no
-	# obvious reason
-	chmod 444 test/data/noendingnewline.py || die "chmod failed"
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
-
-src_test() {
-	# The tests will not work properly from the source dir, so do a
-	# temporary install:
-	python_version
-	local spath="test/usr/$(get_libdir)/python${PYVER}/site-packages/"
-	${python} setup.py install --root="${T}/test" || die "test install failed"
-	# dir needs to be this or the tests fail
-	cd "${T}/${spath}/logilab/common/test"
-	PYTHONPATH="${T}/${spath}" "${python}" runtests.py || die "tests failed"
-	cd "${S}"
-	rm -rf "${T}/test"
-}
diff --git a/dev-python/logilab-common/logilab-common-0.13.0.ebuild b/dev-python/logilab-common/logilab-common-0.15.0.ebuild
index a82c2323239b..cc6e7d036fa1 100644
--- a/dev-python/logilab-common/logilab-common-0.13.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.13.0.ebuild,v 1.1 2006/01/11 16:02:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.15.0.ebuild,v 1.1 2006/04/02 18:19:06 lucass Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )"
@@ -22,8 +22,7 @@ PYTHON_MODNAME="logilab"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-dbapi-skip-tests.patch"
-	epatch "${FILESDIR}/${P}-configuration-help-test-less-strict.patch"
+	epatch "${FILESDIR}/${PN}-0.14.0-remove-broken-modutils-test.patch"
 	# the permissions for this file are 400 in the tarball for no
 	# obvious reason
 	chmod 444 test/data/noendingnewline.py || die "chmod failed"
@@ -40,11 +39,15 @@ src_install() {
 src_test() {
 	# The tests will not work properly from the source dir, so do a
 	# temporary install:
-	python_version
-	local spath="test/usr/$(get_libdir)/python${PYVER}/site-packages/"
-	${python} setup.py install --root="${T}/test" || die "test install failed"
+	local spath="test/lib/python"
+	"${python}" setup.py install --home="${T}/test" || die "test copy failed"
 	# dir needs to be this or the tests fail
 	cd "${T}/${spath}/logilab/common/test"
+
+	# These tests will fail:
+	rm unittest_db.py
+	has userpriv ${FEATURES} || rm unittest_fileutils.py
+
 	PYTHONPATH="${T}/${spath}" "${python}" runtests.py || die "tests failed"
 	cd "${S}"
 	rm -rf "${T}/test"
diff --git a/dev-python/logilab-common/logilab-common-0.5.0.ebuild b/dev-python/logilab-common/logilab-common-0.5.0.ebuild
deleted file mode 100644
index a205458990d8..000000000000
--- a/dev-python/logilab-common/logilab-common-0.5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 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.5.0.ebuild,v 1.9 2005/04/24 09:25:59 blubb Exp $
-
-inherit distutils
-
-DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab."
-HOMEPAGE="http://www.logilab.org/projects/common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc s390 x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${P#logilab-}
-
-PYTHON_MODNAME="logilab"
-DOCS=""