Small fix by idl0r. Now astng and pylint shouldn't hit recursion limits anymore.

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

4 files changed, 103 insertions, 2 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index e06af385a4fb..02b62f9693ad 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,14 @@
 # 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.38 2009/04/18 18:46:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.39 2009/04/18 21:20:34 patrick Exp $
+
+*logilab-common-0.39.0-r1 (18 Apr 2009)
+
+  18 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/logilab-common-0.39.0-recursion.patch,
+  +logilab-common-0.39.0-r1.ebuild:
+  Small fix by idl0r. Now astng and pylint shouldn't hit recursion limits
+  anymore.
 
 *logilab-common-0.39.0 (18 Apr 2009)
 
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index 54dc4e00e9bb..ac30da77e7a6 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -2,6 +2,7 @@ AUX logilab-common-0.14.0-remove-broken-modutils-test.patch 760 RMD160 5a3aa1745
 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
 DIST common-0.15.0.tar.gz 140909 RMD160 c03fc7c7da4700c2320a78922ade833824d285a5 SHA1 5cb6df46c5bf47b1078885af636807fdf99cebd1 SHA256 c8bb306ec5dc7dfb9e6f3d61cf089bbac62e5e5fc22824ff41cb770fc8e8c2de
@@ -16,7 +17,8 @@ EBUILD logilab-common-0.19.2.ebuild 1300 RMD160 bf11446f190f13ffc621a6b88b70c6c7
 EBUILD logilab-common-0.21.0.ebuild 1199 RMD160 dc1796c428fdf33f1a4d4f7f5eae2eea1c276afd SHA1 189b29464a349ff0e673ffd9a923e50e3262d3ab SHA256 a78cc14f12dfe397f84b5f77f3153917a24619eedb68bc039400ecf2e6fbb743
 EBUILD logilab-common-0.21.2.ebuild 1685 RMD160 5bd113fbff1a64008a6c1e052ab9d6a253e765b6 SHA1 d482a96b418bb98a71b735b7ee48fb51630a097e SHA256 ff210053f2d172d80b0fe038b120fbcdb801224e695905f0e47d8724b8099b15
 EBUILD logilab-common-0.31.0.ebuild 1569 RMD160 7f7801064c55702318a0d51101316f8afdd5fc03 SHA1 279f239e4144d0c429629eed6851e45c93559d16 SHA256 fc31d5c6559b30bf66a818e64acad47196606cd71508eb9dbe7134c8c8e2c015
+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
 EBUILD logilab-common-0.9.3.ebuild 807 RMD160 8ed2d828926ea08609391c3c33ccbac6f3280d8a SHA1 fe4e1eb341f6b34511a19061f274703b54fe0fc9 SHA256 f9f1b622987e3cdc166693822e6568c52d6133594ac2cab44422e4a0c526764e
-MISC ChangeLog 6508 RMD160 80c1787ced38e30c80c15aa0b33381093536f65b SHA1 3c30c343946c18331367e9f21b59b10f590aabf5 SHA256 ebdbd7bd9b0db97fcbbcff8940947b638614065c79ac1057d6c7610ceb957f83
+MISC ChangeLog 6769 RMD160 64dfc3abed8656b84644acef85684b1a9c11f7ce SHA1 ffcd2137bec874cd19bfa7412dad5b06f3b1f6c0 SHA256 76a52c7f74947c30521b5eed7f5023b3624ed2d72ce8b4db38333c511c731f69
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/logilab-common/files/logilab-common-0.39.0-recursion.patch b/dev-python/logilab-common/files/logilab-common-0.39.0-recursion.patch
new file mode 100644
index 000000000000..1ae05ac538b5
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.39.0-recursion.patch
@@ -0,0 +1,12 @@
+--- logilab-common-0.39.0/modutils.py	2009-03-25 09:47:08.000000000 +0100
++++ logilab-common-0.39.0/modutils.py	2009-04-18 22:03:10.000000000 +0200
+@@ -622,7 +622,7 @@ def _has_init(directory):
+     else return None
+     """
+     mod_or_pack = join(directory, '__init__')
+-    for ext in PY_SOURCE_EXTS + ('.pyc', '.pyo'):
++    for ext in PY_SOURCE_EXTS + ('pyc', 'pyo'):
+         if exists(mod_or_pack + '.' + ext):
+-            return mod_or_pack + ext
++            return mod_or_pack + '.' + ext
+     return None
diff --git a/dev-python/logilab-common/logilab-common-0.39.0-r1.ebuild b/dev-python/logilab-common/logilab-common-0.39.0-r1.ebuild
new file mode 100644
index 000000000000..689674b259d9
--- /dev/null
+++ b/dev-python/logilab-common/logilab-common-0.39.0-r1.ebuild
@@ -0,0 +1,79 @@
+# 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-r1.ebuild,v 1.1 2009/04/18 21:20:34 patrick 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+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}-recursion.patch"
+}
+
+src_test() {
+	python_version
+
+	# Install temporarily.
+	local tpath="${T}/test"
+	local lpath="${tpath}/lib/python"
+
+	# setuptools would fail if the directory doesn't exist.
+	mkdir -p "${lpath}" || die
+
+	# We also have to add ${lpath} to PYTHONPATH else the installation would
+	# fail.
+	PYTHONPATH="${lpath}" ${python} setup.py install --home="${tpath}" || \
+		die "test copy failed"
+
+	# Get a rid of precompiled files to ensure we run our _modified_ tests
+	find ${lpath} -type f -name '*.pyc' -exec rm {} ';'
+
+	# Remove a botched tests.
+	# To support test w/o setuptools.
+	if [[ -d "${lpath}/${PN/-//}" ]]; then
+		pushd "${lpath}/${PN/-//}" >/dev/null || die
+	else
+		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
+	fi
+
+	popd >/dev/null || die
+
+	# It picks up the tests relative to the current dir, so cd in. Do
+	# not cd in too far though (to logilab/common for example) or some
+	# relative/absolute module location tests fail.
+	pushd "${lpath}" >/dev/null || die
+	PYTHONPATH="${lpath}" ${python} "${tpath}/bin/pytest" -v || die "tests failed"
+	popd >/dev/null || die
+}
+
+src_install() {
+	distutils_src_install
+
+	doman doc/pytest.1 || die "doman failed"
+
+	# Remove unittests since they're just needed during build-time
+	rm -rf "${D}/$(python_get_sitedir)/${PN/-//}/test" || die
+}