Version bump, disable tests that require unreleased gobject-introspection.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 162 insertions, 5 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index aa8cc6a05a93..ecdae2c76ccc 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.126 2011/10/19 01:23:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.127 2011/10/23 07:51:53 tetromino Exp $
+
+*pygobject-3.0.2 (23 Oct 2011)
+
+  23 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +pygobject-3.0.2.ebuild, +files/pygobject-3.0.2-disable-new-gi-tests.patch:
+  Version bump. Disable tests that require new regression functions present
+  only in git master of gobject-introspection.
+  Notable features: several important bugfixes, unbreaks gdk-2 support.
 
 *pygobject-3.0.1 (19 Oct 2011)
 *pygobject-2.28.6-r50 (19 Oct 2011)
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index bb4333efe2bb..5de29d5ec434 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -14,19 +14,22 @@ AUX pygobject-2.28.3-make_check.patch 2705 RMD160 e59fee5df0cbb89c0d64aabdd5eb30
 AUX pygobject-2.28.3-support_multiple_python_versions.patch 3938 RMD160 2cc8e5c1d278ff7285a02b596b2cb285e011cc5a SHA1 8c6a215cc3d5e142db9dae5644fe27ced2da5b52 SHA256 7269f232a9b4ffe1c920c610796cb8f1dc5bcdc5cd5d03ebc7045f45d5f5d089
 AUX pygobject-2.90.1-make_check.patch 2572 RMD160 15fa252864308469a9d84ed3d0195fe38b329127 SHA1 a3daba6e1cd7b15663c6cae862236abd876a50aa SHA256 e665baf786eb565cd095ca1651a696264b112dcbc534593c4fa3da2d4e3b2ddf
 AUX pygobject-3.0.0-support_multiple_python_versions.patch 2794 RMD160 3dd6dfc06063d7eca37c02a08b15c7d3c5615a12 SHA1 56311e3c80ff768d1f88ef635cae34441532cc1e SHA256 ee1e3182dadd4e585179916e4cff3836d2e4464663667a8f5afcf5949d3c000c
+AUX pygobject-3.0.2-disable-new-gi-tests.patch 1078 RMD160 d49ab860e2e3f4ee939ec34b6d69157f6f44cccc SHA1 b8c55b5850373db399a61a3f5ee1b8b38bd4b66c SHA256 00d2ff216da8f26d57c1a9238f308a02fa77f4d9dcfbd931b238cddd9b99bccd
 DIST pygobject-2.26.0.tar.bz2 808427 RMD160 dd164d29232509f729fe7f766b18d1985eca73f6 SHA1 d091412760d44477e76ae995125c8fc5a15eae74 SHA256 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7
 DIST pygobject-2.28.6.tar.xz 747248 RMD160 4bc5e8546a5029d3d6b154629ab3fa4023d96bef SHA1 b1749ba806499f4c2780dbd1cbb363aaf1f41e78 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
 DIST pygobject-3.0.1.tar.xz 543732 RMD160 304e569d428197bbf3770a9dd9e14cba6437c3e9 SHA1 fb8ad95378d5d479545a9796f99fe94d28bc76e6 SHA256 ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1
+DIST pygobject-3.0.2.tar.xz 545072 RMD160 afb2479933c047025ee8d467efda163915c074ce SHA1 6bb3cd5977d6992792cbfabc919b5b46bb8c2a8f SHA256 e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462
 EBUILD pygobject-2.26.0-r1.ebuild 3830 RMD160 66b0a34cc3dc97a812b5cc835634bbe4d137d411 SHA1 7b0112d2c3b69558bce8caece2699a6257308708 SHA256 24921120355c7e64502a581d8e798f16c954eb87bbd9a143b81d19ccbc44d17b
 EBUILD pygobject-2.28.6-r50.ebuild 4158 RMD160 015a82e027864e4b6ad976640894bd87a0d1e3b1 SHA1 7196915ec1be32885c4a81a510470ca9dbb1a1e5 SHA256 04b3eeae83e2e266e6ef7e124b2af90b38780aa9faf417277873b4dc25a73219
 EBUILD pygobject-2.28.6.ebuild 3826 RMD160 e821b108974957b88dfbea5826e8385a388cad8a SHA1 f926c7ed403b1ea736d1457a35d6841a11520bf3 SHA256 d5bfbd58c4cb81100b62de1becf9ae8e0a674cb540d55077ac4878ab66b2f37e
 EBUILD pygobject-3.0.1.ebuild 3121 RMD160 5bb78edde15b9946f48f35518fb1ac0431ae625a SHA1 9342c7a230702d5fe19e8d5163d4f320e5e3c758 SHA256 2c6f36e3ede787e166fe9a2a873c37cc04a2bdfbe7e444fa265911180d7f94d2
-MISC ChangeLog 19515 RMD160 3ec21aa7219ffec6608dbcac339783e81d76afef SHA1 48f21c8fbbfaac0997d0517094105c3d0792ecdd SHA256 18358dff5ae46524cabfbd86458ed9441aa062c9660756490a445bb8550ac8df
+EBUILD pygobject-3.0.2.ebuild 3249 RMD160 6172ae5644381f99c9ca0df7a44f7ae9210e74db SHA1 f5dcfb86043dc4860d5863bd8ccf4e3fcbf751ef SHA256 a9f7086444b150f4a95915253aacd417c8696f06a8689004ba1a6a87f6b6dbfa
+MISC ChangeLog 19880 RMD160 7fd797aaae4cc43f3cd7c50358682b522f6d903e SHA1 bb2baf6de0ae3c024c976939c9d7a44f2ff50371 SHA256 89ddb025f7304e7d7ef90c356b305bbba8584f03583485be3899bf1ba6d8ea26
 MISC metadata.xml 291 RMD160 2226a820b502bdd20583331e1601bb9cd04f96be SHA1 f5d19f3ae1f337179858f1818fc195a20ad7e4d9 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6eJtgACgkQdjK8w9WeBnAhbAEAkX3KTM5sZkKpIZ0P6abbT9WB
-FR3wVI7stXTDbOXu/dEA/2GFYyGSbVE+YrLxv7ObJQaIkyA3uYadM0cIH3NDdklH
-=wEPX
+iF4EAREIAAYFAk6jx58ACgkQdjK8w9WeBnBBrgD/QsDBf5H4Bi8ls6305SFw6tdQ
+3zTz/SrTf0F4WwTQ24QA/0mnPV0UAOgOgKLMPXTGbi8eunJRgiiC3Isl9MkO0zJ/
+=R+1+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch b/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch
new file mode 100644
index 000000000000..8fa2ceed9654
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch
@@ -0,0 +1,29 @@
+Disable tests requiring an unreleased version of gobject-introspection.
+
+diff --git a/tests/test_everything.py b/tests/test_everything.py
+index 19d345b..4a03890 100644
+--- a/tests/test_everything.py
++++ b/tests/test_everything.py
+@@ -483,22 +483,3 @@ class TestAdvancedInterfaces(unittest.TestCase):
+         self.assertEquals(ret[0], 51);
+         self.assertEquals(ret[1], 61);
+         self.assertEquals(ret[2], 32);
+-
+-    def test_obj_skip_return_val_no_out(self):
+-        obj = Everything.TestObj();
+-        # raises an error for 0, succeeds for any other value
+-        self.assertRaises(GLib.GError, obj.skip_return_val_no_out, 0)
+-
+-        ret = obj.skip_return_val_no_out(1)
+-        self.assertEquals(ret, None)
+-
+-class TestSignals(unittest.TestCase):
+-    def test_object_param_signal(self):
+-        obj = Everything.TestObj();
+-
+-        def callback (obj_param):
+-            self.assertEquals(obj_param.props.int, 3)
+-            self.assertEquals(obj_param.__grefcount__, 2)
+-
+-        obj.connect('sig-with-obj', callback)
+-        obj.emit_sig_with_obj()
diff --git a/dev-python/pygobject/pygobject-3.0.2.ebuild b/dev-python/pygobject/pygobject-3.0.2.ebuild
new file mode 100644
index 000000000000..13bd94886173
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.0.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.2.ebuild,v 1.1 2011/10/23 07:51:53 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
+GNOME2_LA_PUNT="yes"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6 3:3.1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
+
+# XXX: Is the alternatives stuff needed anymore?
+inherit alternatives autotools gnome2 python virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="3"
+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="+cairo examples test +threads" # doc
+
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
+	>=dev-libs/gobject-introspection-1.29
+	virtual/libffi
+	cairo? ( >=dev-python/pycairo-1.10.0 )"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		>=dev-libs/gobject-introspection-1.29.17 )
+	>=dev-util/pkgconfig-0.12"
+# docs disabled for now per upstream default since they are very out of date
+#	doc? (
+#		app-text/docbook-xml-dtd:4.1.2
+#		dev-libs/libxslt
+#		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--with-ffi
+		$(use_enable cairo)
+		$(use_enable threads thread)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
+
+	# Support installation for multiple Python versions, upstream bug #648292
+	epatch "${FILESDIR}/${PN}-3.0.0-support_multiple_python_versions.patch"
+
+	# Disable tests that fail
+	#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
+
+	# FIXME: disable tests that require git master of gobject-introspection
+	epatch "${FILESDIR}/${P}-disable-new-gi-tests.patch"
+
+	# disable pyc compiling
+	ln -sfn $(type -P true) py-compile
+
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
+		Xemake check PYTHON=$(PYTHON -a)
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize gi
+}
+
+pkg_postrm() {
+	python_mod_cleanup gi
+}