Add a python-r1-ized revision of pygobject-3.2.2. Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

9 files changed, 227 insertions, 312 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index d05c271f5e8b..5bc409da6d42 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.185 2012/12/10 09:30:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.186 2012/12/16 20:57:36 tetromino Exp $
+
+*pygobject-3.2.2-r1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/pygobject-3.0.0-support_multiple_python_versions.patch,
+  -files/pygobject-3.0.3-disable-new-gi-tests.patch,
+  -files/pygobject-3.0.3-tests-python3.patch, -pygobject-3.0.4.ebuild,
+  +pygobject-3.2.2-r1.ebuild, +files/pygobject-3.2.2-cairo-gobject.patch,
+  +files/pygobject-3.2.2-cairo-tests.patch, pygobject-3.4.2-r1.ebuild:
+  Add a python-r1-ized revision of pygobject-3.2.2. Drop old.
 
   10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   pygobject-3.4.2-r1.ebuild:
diff --git a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch
deleted file mode 100644
index f0fab7f7ba7f..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 228ce7f0f99d2f5fa7d4ac86784d4e81032f9a3a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 15:43:39 +0200
-Subject: [PATCH 2/3] Enable support to build against multiple version of
- python
-
----
- gi/Makefile.am          |    2 +-
- gi/_glib/Makefile.am    |   14 +++++++-------
- gi/_gobject/Makefile.am |    2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/gi/Makefile.am b/gi/Makefile.am
-index 0584cc9..9abb61d 100644
---- a/gi/Makefile.am
-+++ b/gi/Makefile.am
-@@ -83,7 +83,7 @@ _gi_la_CPPFLAGS = \
- _gi_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GI_LIBS) \
--	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gi_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "init_gi|PyInit__gi"
-diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
-index 3cf2593..eaa0ce9 100644
---- a/gi/_glib/Makefile.am
-+++ b/gi/_glib/Makefile.am
-@@ -27,24 +27,24 @@ pyglib_PYTHON = \
- 	__init__.py \
- 	option.py
- 
--lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- 
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \
- 	pyglib.c \
- 	pyglib.h \
- 	pyglib-private.h \
- 	pyglib-python-compat.h
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CPPFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CPPFLAGS = \
- 	$(extension_cppflags)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = \
- 	$(GLIB_CFLAGS)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(FFI_LIBS) \
- 	$(GLIB_LIBS)
- 
- if OS_WIN32
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LDFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LDFLAGS = \
- 	-no-undefined
- endif
- 
-@@ -73,7 +73,7 @@ _glib_la_CPPFLAGS = \
- _glib_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GLIB_LIBS) \
--	libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "_glib|PyInit__glib"
-diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
-index 6bddcf7..023907f 100644
---- a/gi/_gobject/Makefile.am
-+++ b/gi/_gobject/Makefile.am
-@@ -65,7 +65,7 @@ _gobject_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GLIB_LIBS) \
- 	$(FFI_LIBS) \
--	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gobject_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "_gobject|PyInit__gobject"
--- 
-1.7.6.1
-
diff --git a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch b/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
deleted file mode 100644
index a445374213ab..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Disable tests requiring >=gobject-introspection-1.31
-
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 43735e5..ecfdef4 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -507,22 +507,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/tests/test_gi.py b/tests/test_gi.py
-index 0a9b1b2..7e24778 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -770,18 +770,6 @@ class TestArray(unittest.TestCase):
-     def test_gstrv_inout(self):
-         self.assertEquals(['-1', '0', '1', '2'], GIMarshallingTests.gstrv_inout(['0', '1', '2']))
-     
--    def test_array_gvariant_none_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--    
--    def test_array_gvariant_container_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--    
--    def test_array_gvariant_full_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--
-     def test_bytearray_gvariant(self):
-         v = GLib.Variant.new_bytestring("foo")
-         self.assertEquals(v.get_bytestring(), "foo")
-@@ -1651,16 +1639,6 @@ class TestPythonGObject(unittest.TestCase):
-             def do_method_not_a_vfunc(self):
-                 pass
- 
--    def test_subsubobject(self):
--        class SubSubSubObject(GIMarshallingTests.SubSubObject):
--            def do_method_deep_hierarchy(self, num):
--                self.props.int = num * 2
--
--        sub_sub_sub_object = SubSubSubObject()
--        GIMarshallingTests.SubSubObject.do_method_deep_hierarchy(sub_sub_sub_object, 5)
--        self.assertEqual(sub_sub_sub_object.props.int, 5)
--
--
- class TestMultiOutputArgs(unittest.TestCase):
- 
-     def test_int_out_out(self):
diff --git a/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch b/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch
deleted file mode 100644
index a8477fa5edcb..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d88283688797b8fc70a7cbccd42a71b8518098d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 26 Dec 2011 00:44:56 -0500
-Subject: [PATCH] Fix bytearray test compatibility with python3
-
-https://bugs.gentoo.org/show_bug.cgi?id=321879
----
- tests/test_gi.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 0a9b1b2..8726187 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -783,8 +783,8 @@ class TestArray(unittest.TestCase):
-         self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
- 
-     def test_bytearray_gvariant(self):
--        v = GLib.Variant.new_bytestring("foo")
--        self.assertEquals(v.get_bytestring(), "foo")
-+        v = GLib.Variant.new_bytestring(b"foo")
-+        self.assertEquals(v.get_bytestring(), b"foo")
- 
- class TestGArray(unittest.TestCase):
- 
--- 
-1.7.8.1
-
diff --git a/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch b/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch
new file mode 100644
index 000000000000..dd6fc277017a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch
@@ -0,0 +1,26 @@
+From 62c2e962a225ec2527aa3d7406aa0dae232a0886 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Fri, 25 May 2012 17:09:55 -0400
+Subject: [PATCH] Fix build
+
+libregress now needs cairo-gobject
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4210730..08d6a9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,7 +185,7 @@ dnl gio
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
+ 
+ # we always need cairo (not pycairo) for building the tests
+-PKG_CHECK_MODULES(CAIRO, cairo)
++PKG_CHECK_MODULES(CAIRO, cairo cairo-gobject)
+ 
+ AC_ARG_ENABLE(cairo,
+     AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
+-- 
+1.8.0.2
+
diff --git a/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch b/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch
new file mode 100644
index 000000000000..73865349bef9
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch
@@ -0,0 +1,81 @@
+From fd7f8eefbe8aba0b29d80e3eb9d985d33a268c8a Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Thu, 3 May 2012 09:38:56 +0200
+Subject: [PATCH] Fix building with --disable-cairo
+
+Build gobject-introspection's regress.c against cairo, not pycairo/py3cairo. We
+always need cairo to build, so unconditionally check for this in configure.ac.
+
+In test_everything.py, gracefully handle the absence of the "cairo" Python
+module, which we do not have when building without cairo support.
+---
+ configure.ac             | 3 +++
+ tests/Makefile.am        | 4 ++--
+ tests/test_everything.py | 8 +++++++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8606bbd..ef5d7b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,6 +184,9 @@ AC_SUBST(LIBFFI_PC)
+ dnl gio
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
+ 
++# we always need cairo (not pycairo) for building the tests
++PKG_CHECK_MODULES(CAIRO, cairo)
++
+ AC_ARG_ENABLE(cairo,
+     AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
+     enable_cairo=$enableval,
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index fa9ab8c..a54bed8 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,8 +2,8 @@ CLEANFILES =
+ noinst_LTLIBRARIES = libregress.la libgimarshallingtests.la
+ 
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+-libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
+-libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(PYCAIRO_LIBS)
++libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
++libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+ libgimarshallingtests_la_CFLAGS = $(GLIB_CFLAGS)
+ libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+diff --git a/tests/test_everything.py b/tests/test_everything.py
+index 47408d4..dfe6eea 100644
+--- a/tests/test_everything.py
++++ b/tests/test_everything.py
+@@ -9,7 +9,11 @@ sys.path.insert(0, "../")
+ from sys import getrefcount
+ 
+ import copy
+-import cairo
++try:
++    import cairo
++    has_cairo = True
++except ImportError:
++    has_cairo = False
+ 
+ from gi.repository import GObject
+ from gi.repository import GLib
+@@ -25,6 +29,7 @@ else:
+ 
+ class TestEverything(unittest.TestCase):
+ 
++    @unittest.skipUnless(has_cairo, 'built without cairo support')
+     def test_cairo_context(self):
+         context = Everything.test_cairo_context_full_return()
+         self.assertTrue(isinstance(context, cairo.Context))
+@@ -33,6 +38,7 @@ class TestEverything(unittest.TestCase):
+         context = cairo.Context(surface)
+         Everything.test_cairo_context_none_in(context)
+ 
++    @unittest.skipUnless(has_cairo, 'built without cairo support')
+     def test_cairo_surface(self):
+         surface = Everything.test_cairo_surface_none_return()
+         self.assertTrue(isinstance(surface, cairo.ImageSurface))
+-- 
+1.8.0.2
+
diff --git a/dev-python/pygobject/pygobject-3.0.4.ebuild b/dev-python/pygobject/pygobject-3.0.4.ebuild
deleted file mode 100644
index 2f5a7ab71431..000000000000
--- a/dev-python/pygobject/pygobject-3.0.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.4.ebuild,v 1.15 2012/10/02 01:32:04 floppym Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6 3:3.1:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.3 *-jython 2.7-pypy-*"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools eutils 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
-REQUIRED_USE="test? ( cairo )"
-
-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? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-	virtual/pkgconfig"
-# 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)"
-
-	python_pkg_setup
-}
-
-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 >=gobject-introspection-1.31
-	epatch "${FILESDIR}/${PN}-3.0.3-disable-new-gi-tests.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=666852
-	epatch "${FILESDIR}/${PN}-3.0.3-tests-python3.patch"
-
-	python_clean_py-compile_files
-
-	eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
-		unset XDG_CACHE_HOME
-	}
-	python_execute_function -s testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize gi
-}
-
-pkg_postrm() {
-	python_mod_cleanup gi
-}
diff --git a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..aa428a8fad89
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.1 2012/12/16 20:57:36 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+
+inherit autotools eutils gnome2 python-r1 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 ~amd64-fbsd ~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"
+
+REQUIRED_USE="test? ( cairo )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+	>=dev-libs/gobject-introspection-1.31.20
+	virtual/libffi:=
+	cairo? ( >=dev-python/pycairo-1.10.0 )
+	${PYTHON_DEPS}"
+# TODO: should be >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]
+	virtual/pkgconfig
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )"
+
+# 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]"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--with-ffi
+		$(use_enable cairo)
+		$(use_enable threads thread)"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
+
+	# Fix cairo-using tests; in 3.4
+	epatch "${FILESDIR}/${P}-cairo-tests.patch"
+	epatch "${FILESDIR}/${P}-cairo-gobject.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir Xemake check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index 779382de48bd..68b034c1b852 100644
--- a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.3 2012/12/10 09:30:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.4 2012/12/16 20:57:36 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ REQUIRED_USE="test? ( cairo )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/gobject-introspection-1.34.1.1
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( >=dev-python/pycairo-1.10.0 )
 	${PYTHON_DEPS}"
 # TODO: should be >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
@@ -78,7 +78,7 @@ src_test() {
 	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
 
 	testing() {
-		export XDG_CACHE_HOME="${T}/${BUILD_DIR#${S}}"
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
 		run_in_build_dir Xemake check
 		unset XDG_CACHE_HOME
 	}