Be less brutal with tests suppression.

(Portage version: 2.2.0_alpha17/cvs/Linux x86_64)

4 files changed, 66 insertions, 14 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index e77a04d6f7cd..aae8e92a5675 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.244 2011/01/19 14:36:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.245 2011/01/19 20:12:48 eva Exp $
+
+  19 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> pygtk-2.17.0.ebuild,
+  pygtk-2.22.0.ebuild, +files/pygtk-2.22.0-disable-broken-tests.patch:
+  Be less brutal with tests suppression.
 
 *pygtk-2.22.0 (19 Jan 2011)
 
diff --git a/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch b/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
new file mode 100644
index 000000000000..cc1998561f7a
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
@@ -0,0 +1,50 @@
+Disable tests using PObject that appears to be broken.
+Upstream unresponsive and application seem to be working still.
+
+Gentoo: #347183
+Gnome: #636589
+--- a/tests/test_enum.py	2010-08-07 07:23:44.000000000 +0200
++++ b/tests/test_enum.py	2011-01-19 18:43:58.946771795 +0100
+@@ -6,13 +6,6 @@
+ from common import gobject, atk, gtk, gdk
+ 
+ 
+-class PObject(gobject.GObject):
+-    enum = gobject.property(type=gtk.WindowType, default=gtk.WINDOW_TOPLEVEL)
+-    enum2 = gobject.property(type=gtk.WindowType, default=int(gtk.WINDOW_TOPLEVEL))
+-    flags = gobject.property(type=gtk.AttachOptions, default=gtk.EXPAND)
+-    flags2 = gobject.property(type=gtk.AttachOptions, default=int(gtk.EXPAND))
+-
+-
+ class EnumTest(unittest.TestCase):
+     def testEnums(self):
+         self.failUnless(issubclass(gobject.GEnum, int))
+@@ -90,14 +83,6 @@
+         self.failUnless('7' in repr(val))
+         self.failUnless('GtkIconSize' in repr(val))
+ 
+-    def testEnumProperty(self):
+-        default = PObject.props.enum.default_value
+-        self.failUnless(isinstance(default, gtk.WindowType))
+-        self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
+-        default = PObject.props.enum2.default_value
+-        self.failUnless(isinstance(default, gtk.WindowType))
+-        self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
+-
+     def testPickling(self):
+         values = [getattr(gtk, name) for name in dir(gtk)
+                   if isinstance(getattr(gtk, name), gobject.gobject.GEnum)]
+@@ -222,13 +207,5 @@
+         self.failUnless(flag <= 2)
+         self.failUnless(flag <= 10)
+ 
+-    def testFlagsProperty(self):
+-        default = PObject.props.flags.default_value
+-        self.failUnless(isinstance(default, gtk.AttachOptions))
+-        self.assertEqual(default, gtk.EXPAND)
+-        default = PObject.props.flags2.default_value
+-        self.failUnless(isinstance(default, gtk.AttachOptions))
+-        self.assertEqual(default, gtk.EXPAND)
+-
+ if __name__ == '__main__':
+     unittest.main()
diff --git a/dev-python/pygtk/pygtk-2.17.0.ebuild b/dev-python/pygtk/pygtk-2.17.0.ebuild
index 321f6e441b3b..93cbe0e2a519 100644
--- a/dev-python/pygtk/pygtk-2.17.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.17.0.ebuild,v 1.10 2011/01/17 18:17:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.17.0.ebuild,v 1.11 2011/01/19 20:12:48 eva Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.6"
@@ -56,6 +56,7 @@ src_test() {
 
 	testing() {
 		cd tests
+		export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)"
 		Xemake check-local
 	}
 	python_execute_function -s testing
diff --git a/dev-python/pygtk/pygtk-2.22.0.ebuild b/dev-python/pygtk/pygtk-2.22.0.ebuild
index 7e2c9b03025a..f4a937a1690c 100644
--- a/dev-python/pygtk/pygtk-2.22.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.22.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.22.0.ebuild,v 1.1 2011/01/19 14:36:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.22.0.ebuild,v 1.2 2011/01/19 20:12:48 eva Exp $
 
 EAPI="3"
-PYTHON_DEPEND="2:2.6"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
@@ -18,13 +19,13 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
-RDEPEND=">=dev-libs/glib-2.8
+RDEPEND=">=dev-libs/glib-2.8:2
 	>=x11-libs/pango-1.16
 	>=dev-libs/atk-1.12
-	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-2.22:2
 	>=gnome-base/libglade-2.5
 	>=dev-python/pycairo-1.0.2
-	>=dev-python/pygobject-2.21.3
+	>=dev-python/pygobject-2.21.3:2
 	dev-python/numpy"
 
 DEPEND="${RDEPEND}
@@ -38,12 +39,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
 
 	# Broken test, upstream bug #636589
-	sed -i -e '/test_enum.py/d' tests/Makefile.am || die
-	rm -f tests/test_enum.py || die
-
-	# Wants to write outside sandbox, bug #245103
-	sed -i -e '/test_filechooserdialog.py/d' tests/Makefile.am || die
-	rm -f tests/test_filechooserdialog.py || die
+	epatch "${FILESDIR}/${PN}-2.22.0-disable-broken-tests.patch"
 
 	# Disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
@@ -64,6 +60,7 @@ src_test() {
 
 	testing() {
 		cd tests
+		export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)"
 		Xemake check-local
 	}
 	python_execute_function -s testing