Version bump with more robust cleanup of test files and a friendlier failure if pylint-gui is run without Tkinter present (bug #120771)

(Portage version: 2.1_pre7-r5)

5 files changed, 93 insertions, 11 deletions

diff --git a/dev-python/pylint/ChangeLog b/dev-python/pylint/ChangeLog
index 232f41030018..39fa80dbc1ab 100644
--- a/dev-python/pylint/ChangeLog
+++ b/dev-python/pylint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pylint
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.27 2006/04/01 15:24:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.28 2006/04/20 12:33:03 marienz Exp $
+
+*pylint-0.11.0 (20 Apr 2006)
+
+  20 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  +files/pylint-0.11.0-gui-no-tkinter.patch, +pylint-0.11.0.ebuild:
+  Version bump with more robust cleanup of test files and a friendlier failure
+  if pylint-gui is run without Tkinter present (bug #120771)
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> pylint-0.10.0.ebuild:
   Mark 0.10.0 ~ia64
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 4c862f9bb8c7..a7d244b2c7b0 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 661ceec43ead4b68789969d43ddb4e2e ChangeLog 4012
 RMD160 1a48194cee0fdb78f152ad49fc529ebf41b76d99 ChangeLog 4012
 SHA256 1b24a7ca65e6a4216f8d24d8dc8aa0836b771fb2d352e5f43df1473e0fbe82c6 ChangeLog 4012
 MD5 0818c6b3c0d95d525233ba5416de8428 files/digest-pylint-0.10.0 241
 RMD160 81a1fa833fc60da36e737673542dfc930304e163 files/digest-pylint-0.10.0 241
 SHA256 26a5e044c5a57cabf2790694f53e3c65a1340623098d9e3d89231df99dc1d9b7 files/digest-pylint-0.10.0 241
+MD5 5ed367fa1016779e1b1dc12a5ad0fd7e files/digest-pylint-0.11.0 241
+RMD160 31d147662b6a37694d85dd0f3b5541bc0bffb987 files/digest-pylint-0.11.0 241
+SHA256 ccc4f1de9be8573b867704d36575f2121df99dfd85fa784f7d10f54e4c1c1136 files/digest-pylint-0.11.0 241
 MD5 7dc504c0fc2deb503cde73e6c3b60578 files/digest-pylint-0.4.0 63
 RMD160 3f44237ce39e32b1bec244fd1d07f395184c613d files/digest-pylint-0.4.0 63
 SHA256 803cbf2f7543a96db71db393053ed2230c1f7cb39b7cc58bd79004642cb00886 files/digest-pylint-0.4.0 63
@@ -28,6 +28,9 @@ SHA256 9be40e60cbb5835bab06ad6ec418ddec0c9b98b0385c109e57308dd191403000 files/py
 MD5 73f3627d9b37238aa150c22794f345c2 files/pylint-0.10.0-extra-todo.patch 470
 RMD160 e27764eaf225e577bcc2c1e62699895ca4d0fca7 files/pylint-0.10.0-extra-todo.patch 470
 SHA256 64426d943952ecce38c810d3781628bdc9b856cfe91502aecd9f1011dadea76c files/pylint-0.10.0-extra-todo.patch 470
+MD5 c8c16e991525d131aed68fb6b8a6155f files/pylint-0.11.0-gui-no-tkinter.patch 381
+RMD160 b533f5e137b4a3c12fff4c7644c1b3e5b3ffdedc files/pylint-0.11.0-gui-no-tkinter.patch 381
+SHA256 c4a45aadc0fcac494b0d92f67fa882ddab21a949ae52b490b3aa0670440f868f files/pylint-0.11.0-gui-no-tkinter.patch 381
 MD5 73f3627d9b37238aa150c22794f345c2 files/pylint-0.9.0-extra-todo.patch 470
 RMD160 e27764eaf225e577bcc2c1e62699895ca4d0fca7 files/pylint-0.9.0-extra-todo.patch 470
 SHA256 64426d943952ecce38c810d3781628bdc9b856cfe91502aecd9f1011dadea76c files/pylint-0.9.0-extra-todo.patch 470
@@ -37,6 +40,9 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 4aa2e41d0fad5086354823441820c863 pylint-0.10.0.ebuild 1683
 RMD160 e4aab16701eca6f2dc9914eba81da6ca64e84699 pylint-0.10.0.ebuild 1683
 SHA256 d45dc32a468332fd3f084c5c261ea7e9412cd3438074a77045dda29bc8333949 pylint-0.10.0.ebuild 1683
+MD5 18b3b935ba2ffb19f2692b8ff38e56f0 pylint-0.11.0.ebuild 1792
+RMD160 d31e6c3ebf1858149bc9e09729a0f0ff0cd73fa7 pylint-0.11.0.ebuild 1792
+SHA256 5cf65c4b66128dd955f55fbd0095bd7d66c4d03a3cc2576b648f256b402b701e pylint-0.11.0.ebuild 1792
 MD5 71029c2683e4c6292583fa2a51b055d4 pylint-0.4.0.ebuild 561
 RMD160 fdd94d09e138b07a0dcfff4b3e7b3b337e2720c9 pylint-0.4.0.ebuild 561
 SHA256 c0ba69e304c2ca3e780f5a90edae1acab4bf4394f44e16f95fff665b0b9dc990 pylint-0.4.0.ebuild 561
@@ -52,10 +58,3 @@ SHA256 2ddc72504dd0fb5c4c22e211e041bb8fd6af089a287be0496d586399c62ee3a1 pylint-0
 MD5 3cc1a48ecff87e0cb9ba6e60865febde pylint-0.9.0.ebuild 1758
 RMD160 9d8e61beea92d28ab7e1d96ca454f5bf8f6ea457 pylint-0.9.0.ebuild 1758
 SHA256 e9e6ace9d30daa2386c56f6ed1463c564416ae74bbf05f9666b2510f1d237a64 pylint-0.9.0.ebuild 1758
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELptFJrHF4yAQTrARAo4pAKC+JWCsZSAMCHLM8kLKmJ7E57yjegCgpwZ9
-5/kYwEqV1r4sJmv7NWcgTjU=
-=M64O
------END PGP SIGNATURE-----
diff --git a/dev-python/pylint/files/digest-pylint-0.11.0 b/dev-python/pylint/files/digest-pylint-0.11.0
new file mode 100644
index 000000000000..5ff0b145b4c6
--- /dev/null
+++ b/dev-python/pylint/files/digest-pylint-0.11.0
@@ -0,0 +1,3 @@
+MD5 6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz 138311
+RMD160 4e25d34a477af791fc2019ff69506f8b319a8351 pylint-0.11.0.tar.gz 138311
+SHA256 5ff2de5008ef5a82a86702ea46bf38f7743aa5a47679bfd908e34be67b96cae7 pylint-0.11.0.tar.gz 138311
diff --git a/dev-python/pylint/files/pylint-0.11.0-gui-no-tkinter.patch b/dev-python/pylint/files/pylint-0.11.0-gui-no-tkinter.patch
new file mode 100644
index 000000000000..ac967247141f
--- /dev/null
+++ b/dev-python/pylint/files/pylint-0.11.0-gui-no-tkinter.patch
@@ -0,0 +1,17 @@
+=== modified file 'a/bin/pylint-gui' (properties changed)
+--- a/bin/pylint-gui	
++++ b/bin/pylint-gui	
+@@ -1,4 +1,12 @@
+ #!/usr/bin/env python
+ import sys
++
++try:
++    import Tkinter
++except ImportError:
++    print 'Importing Tkinter failed. You probably have to enable the tcltk'
++    print 'USE flag on python.'
++    sys.exit(1)
++
+ from pylint import gui 
+ gui.Run(sys.argv[1:])
+
diff --git a/dev-python/pylint/pylint-0.11.0.ebuild b/dev-python/pylint/pylint-0.11.0.ebuild
new file mode 100644
index 000000000000..0d95ad2ddb62
--- /dev/null
+++ b/dev-python/pylint/pylint-0.11.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.11.0.ebuild,v 1.1 2006/04/20 12:33:03 marienz Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="PyLint is a tool to check if a Pyhon module satisfies a coding standard"
+SRC_URI="ftp://ftp.logilab.org/pub/pylint/${P}.tar.gz"
+HOMEPAGE="http://www.logilab.org/projects/pylint/"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~ia64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )
+		>=dev-python/logilab-common-0.13.0
+		>=dev-python/astng-0.16.0"
+
+DOCS="doc/*.txt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This test fails
+	mv test/input/func_format.py test/input/func_format.py.skipped
+
+	# Disabling the above test triggers some extra TODOs
+	epatch "${FILESDIR}/${PN}-0.10.0-extra-todo.patch"
+	# Make the test that tries to import gtk a bit less strict
+	epatch "${FILESDIR}/${PN}-0.10.0-extra-gtk-disable.patch"
+
+	# Make pylint-gui print a gentoo-specific message if Tkinter is missing
+	epatch "${FILESDIR}/${P}-gui-no-tkinter.patch"
+}
+
+src_install() {
+	distutils_src_install
+	# do not install the test suite (we ran it from src_test already
+	# and it makes .py[co] generation very noisy because there are
+	# files with SyntaxErrors in there)
+	python_version
+	rm -rf "${D}"/usr/lib*/python${PYVER}/site-packages/pylint/test
+}
+
+src_test() {
+	# The tests will not work properly from the source dir, so do a
+	# temporary install:
+	"${python}" setup.py install --home="${T}/test" || die "test copy failed"
+	# dir needs to be this or the tests fail
+	cd "${T}/test/lib/python/pylint/test"
+	PYTHONPATH="${T}/test/lib/python" "${python}" runtests.py || \
+		die "tests failed"
+	cd "${S}"
+	rm -rf "${T}/test"
+}