Depend on a bugfixed astng allowing more tests to pass.

(Portage version: 2.1_pre5-r4)

6 files changed, 32 insertions, 39 deletions

diff --git a/dev-python/pylint/ChangeLog b/dev-python/pylint/ChangeLog
index 225234339ad9..8687f509689b 100644
--- a/dev-python/pylint/ChangeLog
+++ b/dev-python/pylint/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2006/03/06 18:39:59 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.26 2006/03/10 23:46:58 marienz Exp $
+
+  10 Mar 2006; Marien Zwart <marienz@gentoo.org>
+  +files/pylint-0.10.0-extra-gtk-disable.patch,
+  files/pylint-0.10.0-extra-todo.patch,
+  -files/pylint-0.10.0-skip-gtk-test.patch, pylint-0.10.0.ebuild:
+  Depend on a bugfixed astng allowing more tests to pass.
 
 *pylint-0.10.0 (06 Mar 2006)
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 4c24ebd492db..23c170c4b1d6 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 cd3b1112d067e7d1caf276261334ae24 ChangeLog 3656
 RMD160 d6dc71fe181f74de1ac0f6a1627d27e02d5f8d0a ChangeLog 3656
 SHA256 7b229ede2c0755ee42121c7fdd0c175041e0b0960395ed079f5a13fc273c2a8d ChangeLog 3656
@@ -22,21 +19,21 @@ SHA256 f77a7f90a9a838bc7effb49f3efc65e2698ddbba0460e268ef52217cbef432c8 files/di
 MD5 47373667a30fe4f73f73cc3fd41976c3 files/digest-pylint-0.9.0 64
 RMD160 e8a626993070b5df6e360067d67e792d5bf8dfa5 files/digest-pylint-0.9.0 64
 SHA256 8a7ea16563acb0d97716a04b275b8604ed0bedad06e8dce0924f4e2fd9a51a08 files/digest-pylint-0.9.0 64
-MD5 9244b26747870df244e42c149a9293a1 files/pylint-0.10.0-extra-todo.patch 479
-RMD160 6c403e88b3e39779c5bb905200805c4e7b2b0d1e files/pylint-0.10.0-extra-todo.patch 479
-SHA256 e880045ca633e75eee554569901b2150d41242ab768981e036ade0b05843c776 files/pylint-0.10.0-extra-todo.patch 479
-MD5 b3cff2802409f823e5eb0f498b1b0f0a files/pylint-0.10.0-skip-gtk-test.patch 479
-RMD160 b41d3206e51eee148749e35a9e97d48f86f9394d files/pylint-0.10.0-skip-gtk-test.patch 479
-SHA256 1cf4277cb2012482f6274747a871aa8550d68e012cc46c8224840c343547ecd5 files/pylint-0.10.0-skip-gtk-test.patch 479
+MD5 482b50a3f4f2fb978810a669cfdbb374 files/pylint-0.10.0-extra-gtk-disable.patch 280
+RMD160 f6427e45b1397f6cacd95c03ce05ac49abbc497a files/pylint-0.10.0-extra-gtk-disable.patch 280
+SHA256 9be40e60cbb5835bab06ad6ec418ddec0c9b98b0385c109e57308dd191403000 files/pylint-0.10.0-extra-gtk-disable.patch 280
+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 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
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 c40052d2bfb964a61410d5a5f2a11a86 pylint-0.10.0.ebuild 1684
-RMD160 f6ef960de0af47cbd175825667cfc23161daa679 pylint-0.10.0.ebuild 1684
-SHA256 fd54c244e2e6bec1e3e099f776416686c7e4e5edd89004a4dce849b7347a2f42 pylint-0.10.0.ebuild 1684
+MD5 deebaf7c515b11a519cf200e86717a6e pylint-0.10.0.ebuild 1676
+RMD160 330b610c0e87fcbb22cdbfabca4ca7422e72c3fd pylint-0.10.0.ebuild 1676
+SHA256 befc3c617bee7d2b5f8217aaf7027cfd555f254eb3a8ba141e120a89e1e40e41 pylint-0.10.0.ebuild 1676
 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 +49,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)
-
-iD8DBQFEDIIKW78445TWHXcRAlW/AJwJRwcdc8bjOXESsaIxRatJXFpL2gCght4L
-8ff2dWMaEgpLUyUbypyQGRw=
-=EfSp
------END PGP SIGNATURE-----
diff --git a/dev-python/pylint/files/pylint-0.10.0-extra-gtk-disable.patch b/dev-python/pylint/files/pylint-0.10.0-extra-gtk-disable.patch
new file mode 100644
index 000000000000..6ebcd93ace20
--- /dev/null
+++ b/dev-python/pylint/files/pylint-0.10.0-extra-gtk-disable.patch
@@ -0,0 +1,10 @@
+=== modified file 'test/regrtest_data/pygtk_import.py'
+--- test/regrtest_data/pygtk_import.py	
++++ test/regrtest_data/pygtk_import.py	
+@@ -1,4 +1,4 @@
+-#pylint: disable-msg=R0903,R0904
++#pylint: disable-msg=R0903,R0904,W0232
+ """#10026"""
+ __revision__ = 1
+ from gtk import VBox
+
diff --git a/dev-python/pylint/files/pylint-0.10.0-extra-todo.patch b/dev-python/pylint/files/pylint-0.10.0-extra-todo.patch
index 506a1c06ed4c..cc24c854717c 100644
--- a/dev-python/pylint/files/pylint-0.10.0-extra-todo.patch
+++ b/dev-python/pylint/files/pylint-0.10.0-extra-todo.patch
@@ -6,7 +6,7 @@
          todo.sort()
          if PY23:
 -            self.assertEqual(todo, ['E0503', 'F0002', 'F0202', 'F0321', 'I0001'])
-+            self.assertEqual(todo, ['C0321', 'C0322', 'C0323', 'C0324', 'E0503', 'F0002', 'F0202', 'F0321', 'I0001', 'R0401'])
++            self.assertEqual(todo, ['C0321', 'C0322', 'C0323', 'C0324', 'E0503', 'F0002', 'F0202', 'F0321', 'I0001'])
          else:
              self.assertEqual(todo, ['F0002', 'F0202', 'F0321', 'I0001'])
  
diff --git a/dev-python/pylint/files/pylint-0.10.0-skip-gtk-test.patch b/dev-python/pylint/files/pylint-0.10.0-skip-gtk-test.patch
deleted file mode 100644
index 53f4f70a582b..000000000000
--- a/dev-python/pylint/files/pylint-0.10.0-skip-gtk-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'test/regrtest.py'
---- test/regrtest.py	
-+++ test/regrtest.py	
-@@ -84,7 +84,7 @@
-         except ImportError:
-             self.skip('test skipped: gtk is not available')
-         except RuntimeError: # RuntimeError when missing display
--            pass
-+            self.skip('test skipped: no display available')
-         linter.check('regrtest_data/pygtk_import.py')
-         got = linter.reporter.finalize().strip()
-         self.failUnlessEqual(got, '')
-
diff --git a/dev-python/pylint/pylint-0.10.0.ebuild b/dev-python/pylint/pylint-0.10.0.ebuild
index 2c17bdf45716..39d84caa9ea5 100644
--- a/dev-python/pylint/pylint-0.10.0.ebuild
+++ b/dev-python/pylint/pylint-0.10.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/pylint/pylint-0.10.0.ebuild,v 1.1 2006/03/06 18:39:59 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.10.0.ebuild,v 1.2 2006/03/10 23:46:58 marienz Exp $
 
 inherit distutils eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~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.15.0"
+		>=dev-python/astng-0.15.1"
 
 DOCS="doc/*.txt"
 
@@ -23,14 +23,14 @@ src_unpack() {
 	cd "${S}"
 
 	# these two tests do not pass
-	for testname in func_w0401.py func_format.py \
+	for testname in func_format.py \
 		func_noerror_staticmethod_as_decorator.py; do
 		mv test/input/${testname} test/input/${testname}.skipped ||
 		die "skipping ${testname} failed"
 	done
 
 	epatch "${FILESDIR}/${P}-extra-todo.patch"
-	epatch "${FILESDIR}/${P}-skip-gtk-test.patch"
+	epatch "${FILESDIR}/${P}-extra-gtk-disable.patch"
 }
 
 src_install() {
@@ -39,7 +39,7 @@ src_install() {
 	# and it makes .py[co] generation very noisy because there are
 	# files with SyntaxErrors in there)
 	python_version
-	rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pylint/test
+	rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pylint/test"
 }
 
 src_test() {