diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index 7449ee4a3..e8dddba10 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -1,15 +1,5 @@
-AUX pygobject-2.90.1-make_check.patch 2572 SHA256 e665baf786eb565cd095ca1651a696264b112dcbc534593c4fa3da2d4e3b2ddf SHA512 2162dc214b86cdfb9b4a465066cd2847419be9608dab55e911166e8c646d19da2ef5f4553926459f1b061bacc380aae9645365390b6852f56db4da25925a1417 WHIRLPOOL 0f67999b760486014aa108a2761983ccf07b80aa0c69e5dac814130b53541c7e916998250e35251c68b77681f569f60c183e991d70f2ba93f4a18c9934724b2e
-AUX pygobject-3.0.0-support_multiple_python_versions.patch 2794 SHA256 ee1e3182dadd4e585179916e4cff3836d2e4464663667a8f5afcf5949d3c000c SHA512 a604acb91b769d42830f59b80a564cc5eb96645d7a1ce0849f3f609a42c6c1232f1a855a077a2d8b358d1ffb0dac00d97ab55a29c63073e6740fffd5e32121bb WHIRLPOOL 272a3e56c604b2525918581fe34354508ed3ce16baa374eba4845d49d917198c38647ed0897266a8fa4638a79f4d766758d7543c00c57a1f785bdfd2411af4b4
-AUX pygobject-3.0.2-disable-new-gi-tests.patch 1078 SHA256 00d2ff216da8f26d57c1a9238f308a02fa77f4d9dcfbd931b238cddd9b99bccd SHA512 303536fb141c7f6681d9e5b14777d19ff4a66cb10cd9dbba66c87c2e108c1e3fcf77d9f1735a4b4693fcad72a1e00532eab61a6763e9234ab315838a245b94dd WHIRLPOOL 0a6b24cfd592f4bc91abdc8406513d397357c9ef8e80183d64aa12416a94a2300e0dd650136ff336e838c5649b38edb7df03282fccf24c0e78e323151527568b
-AUX pygobject-3.0.3-disable-new-gi-tests.patch 2825 SHA256 eec3f3cacfa7655d9dd0755cb5c9a1a235b5351990dfc0d39f646d5ba2e2deda SHA512 4bd10c6fe633217ff8828bdbe92712666c0c630cf693d11f19a0bc45f2778bf18997482b904f026a8cf64a3cf21a0725a215dbe27cd5411a628a19b37955c39c WHIRLPOOL 47cbe3e98c9a714529fa811f41456b5b204e8d42db122f6cea468ee85b76fed2dd510ee13f82b42715c3e7b7185a8febb05de0f1a2e5e0b6ff69de9cb0425bef
-AUX pygobject-3.0.3-gobject-property-min-max.patch 2505 SHA256 9f79c7a7f163323d3d72b2c2758fba4fd4c712869e5f8c7ba10364466a30d9c3 SHA512 7073c34658ca89d963a9d7dba0bfa60b86299175929eb2b552a56d1f9c476e18b28de510b4a6a9c28585def04a9e40d244ba067eec250b63e0c03db8874fff09 WHIRLPOOL e24483d0e3aa1c070bee3ea67883edeef8394317addde27aa137838b9da7f1bf099fee252a6a925fdd26976aa6ea974f24ba14078f4aeb615a471c1670e1f77c
-AUX pygobject-3.0.3-tests-python3.patch 953 SHA256 e9b9da15e44239a85b71d5dde5ae112780c9527b81bddf4edfa9d620bf371d00 SHA512 3f90a75217d728687b1e36f50ca236b4586f09d0a67f70b7337ff19649ad2dcce6c77fa3124f293b1783f999ae8cf2a94d16d656a56ba63f4378ff2f1efcdd8d WHIRLPOOL 4c0b0d0866804a42e35082f8aa41411a185ae5b4e9866e627392cfde9bb8f5c493e55a5bfb039cbf290e0d20b725184bfcc1a858c03e904f806fefce48b7e97b
 DIST pygobject-3.0.4.tar.xz 547180 SHA256 f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661
 DIST pygobject-3.2.0.tar.xz 561820 SHA256 1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3 SHA512 f3f381b43efeefee0187da39178d3c51fcf317c5ba7adc3fa95ad6145d84f72ccb006ad6d08fd4aac5b506599f69b47eb3c599d7f99f57ee22e82ae993465199 WHIRLPOOL c0d1eff36cd3b4c1a1ac945a3d82f54112ee4052698e3ec78f5305173f452a0672811c5cc1231e95002462147e5bedea230c379c663601dec8d95cb99ca51e42
 DIST pygobject-3.2.1.tar.xz 550392 SHA256 0f07401289fa33e8caee7a9342f5c838bb44cd0a386cb99093505edb5e42817a
 DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0 SHA512 b22c8fd4bcff0d110a08d7f0927df086d4e1e11546e3d7aa08f4e5ec66643d1ba88ac199b0354dca145bf06532c8ab8a427ea9450751ee52b914f355a6d7e9e7 WHIRLPOOL f3e4aaafadfeae5e6fafd0e173c856c2f8c937eb097732760c21ccaced6c7c96e36e5b683d729e78b0043302fafa92818ea90fa845fe266caf5e2d0a8ae8ff8f
-EBUILD pygobject-base-3.0.4.ebuild 3346 SHA256 a56da7150aa25d73453d3fa8b009bddf30d09825bd58089d3173f7f7565b14d8 SHA512 dc6950a9c9f67c5cc5e58839d821f3b714cd99689e94f25e97cc5f3809a5f48a77bddb6328dadb04bbefb51f753ca767a8dead15eb50a04401854ae267c1988b WHIRLPOOL a53a057a424be671c89b57024a8572f6b846e1ae5bd9c229fe1bd52ac4c2daf13f6911baef11d9a1838374dd70080250c9e0c8640003489f48533d10253f0205
-EBUILD pygobject-base-3.2.0.ebuild 2880 SHA256 93e970f75b2fd9a09eb2df10b5919fd579f4143cdd8de83b46ecbdc17239d365 SHA512 e9f1e66c4d5fe69f98ceb76a4c83c11ee5345749bee99a45de8bfd3fa8984b6062fbfdbbb7b0b2b5e16d2fa9bd945aa324413a61c4a0dcac3870769df4143e88 WHIRLPOOL cbff1b0cf8c24ee451989610be8154096211f08dfda4cbb315d12b4545bb9564ff96607abe2ad7e896b35946fedf00a10133241eb4aa8fcb7eabf491f939400a
-EBUILD pygobject-base-3.2.1.ebuild 2880 SHA256 93e970f75b2fd9a09eb2df10b5919fd579f4143cdd8de83b46ecbdc17239d365 SHA512 e9f1e66c4d5fe69f98ceb76a4c83c11ee5345749bee99a45de8bfd3fa8984b6062fbfdbbb7b0b2b5e16d2fa9bd945aa324413a61c4a0dcac3870769df4143e88 WHIRLPOOL cbff1b0cf8c24ee451989610be8154096211f08dfda4cbb315d12b4545bb9564ff96607abe2ad7e896b35946fedf00a10133241eb4aa8fcb7eabf491f939400a
-EBUILD pygobject-base-3.2.2.ebuild 2880 SHA256 93e970f75b2fd9a09eb2df10b5919fd579f4143cdd8de83b46ecbdc17239d365 SHA512 e9f1e66c4d5fe69f98ceb76a4c83c11ee5345749bee99a45de8bfd3fa8984b6062fbfdbbb7b0b2b5e16d2fa9bd945aa324413a61c4a0dcac3870769df4143e88 WHIRLPOOL cbff1b0cf8c24ee451989610be8154096211f08dfda4cbb315d12b4545bb9564ff96607abe2ad7e896b35946fedf00a10133241eb4aa8fcb7eabf491f939400a
-MISC metadata.xml 178 SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c SHA512 090602f45b8fe37eb4ec23c568d815bd1ea41903eb2ad2592c251915aeb3edd957eae84957d556eb3b4b3fbb5acf6aae7594e1640ee5e04297cb6e2efc6c4c41 WHIRLPOOL 69136c1dbfe808f569ccf5362e9df219ef8ba594cc608893dbf854ee6482111c5c969c2510f2f92b659b3a94e1a669490062815891988e71e76a8d0782b871e6
+DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
diff --git a/dev-python/pygobject-base/files/pygobject-3.4.1.1-make_check.patch b/dev-python/pygobject-base/files/pygobject-3.4.1.1-make_check.patch
new file mode 100644
index 000000000..7aa705816
--- /dev/null
+++ b/dev-python/pygobject-base/files/pygobject-3.4.1.1-make_check.patch
@@ -0,0 +1,84 @@
+From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH] Do not build tests unless needed
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
+---
+ tests/Makefile.am | 12 ++++++------
+ tests/runtests.py |  3 +++
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7a619bf..a3cbf57 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES = libgimarshallingtests.la
++check_LTLIBRARIES = libgimarshallingtests.la
+ test_typelibs = GIMarshallingTests-1.0.typelib
+ 
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
+ 
+ # regress.c needs cairo
+ if ENABLE_CAIRO
+-noinst_LTLIBRARIES += libregress.la
++check_LTLIBRARIES += libregress.la
+ test_typelibs += Regress-1.0.typelib
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
+@@ -52,7 +52,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
+ 
+ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
+ 
+-noinst_LTLIBRARIES += testhelper.la
++check_LTLIBRARIES += testhelper.la
+ 
+ testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+ 	test -L $@ || $(LN_S) .libs/$@ $@
+ 
+ 
+-all: $(LTLIBRARIES:.la=.so)
++all: $(check_LTLIBRARIES:.la=.so)
+ 
+ EXTRA_DIST = \
+ 	compathelper.py \
+@@ -112,7 +112,7 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so) file.txt~
++	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ 
+ DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
+ 	MALLOC_PERTURB_=85 \
+ 	TESTS_BUILDDIR=$(builddir)
+ 
+-check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
+ 	@echo "  CHECK  Pyflakes"
+ 	@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
+ 	@echo "  CHECK  PEP8"
+diff --git a/tests/runtests.py b/tests/runtests.py
+index c518fcc..35bb5c4 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
+     unittest.TestCase.assertGreater = assertGreater
+     unittest.TestCase.assertIsInstance = assertIsInstance
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
++
+ if '--help' in sys.argv:
+     print("Usage: ./runtests.py <testfiles>")
+     sys.exit(0)
+-- 
+1.7.12.4
+
diff --git a/dev-python/pygobject-base/pygobject-base-3.4.2-r1.ebuild b/dev-python/pygobject-base/pygobject-base-3.4.2-r1.ebuild
new file mode 100644
index 000000000..fa46307d8
--- /dev/null
+++ b/dev-python/pygobject-base/pygobject-base-3.4.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+REAL_PN="${PN/-base}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+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="examples test +threads" # doc
+
+COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+	>=dev-libs/gobject-introspection-1.34.1.1
+	virtual/libffi:=
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	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
+		--disable-cairo
+		$(use_enable threads thread)"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${REAL_PN}-3.4.1.1-make_check.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-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index 76c609b08..b7df79fb2 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -1,14 +1,5 @@
-AUX pygobject-2.90.1-make_check.patch 2572 SHA256 e665baf786eb565cd095ca1651a696264b112dcbc534593c4fa3da2d4e3b2ddf SHA512 2162dc214b86cdfb9b4a465066cd2847419be9608dab55e911166e8c646d19da2ef5f4553926459f1b061bacc380aae9645365390b6852f56db4da25925a1417 WHIRLPOOL 0f67999b760486014aa108a2761983ccf07b80aa0c69e5dac814130b53541c7e916998250e35251c68b77681f569f60c183e991d70f2ba93f4a18c9934724b2e
-AUX pygobject-3.0.0-support_multiple_python_versions.patch 2794 SHA256 ee1e3182dadd4e585179916e4cff3836d2e4464663667a8f5afcf5949d3c000c SHA512 a604acb91b769d42830f59b80a564cc5eb96645d7a1ce0849f3f609a42c6c1232f1a855a077a2d8b358d1ffb0dac00d97ab55a29c63073e6740fffd5e32121bb WHIRLPOOL 272a3e56c604b2525918581fe34354508ed3ce16baa374eba4845d49d917198c38647ed0897266a8fa4638a79f4d766758d7543c00c57a1f785bdfd2411af4b4
-AUX pygobject-3.0.3-disable-new-gi-tests.patch 2825 SHA256 eec3f3cacfa7655d9dd0755cb5c9a1a235b5351990dfc0d39f646d5ba2e2deda SHA512 4bd10c6fe633217ff8828bdbe92712666c0c630cf693d11f19a0bc45f2778bf18997482b904f026a8cf64a3cf21a0725a215dbe27cd5411a628a19b37955c39c WHIRLPOOL 47cbe3e98c9a714529fa811f41456b5b204e8d42db122f6cea468ee85b76fed2dd510ee13f82b42715c3e7b7185a8febb05de0f1a2e5e0b6ff69de9cb0425bef
-AUX pygobject-3.0.3-gobject-property-min-max.patch 2505 SHA256 9f79c7a7f163323d3d72b2c2758fba4fd4c712869e5f8c7ba10364466a30d9c3 SHA512 7073c34658ca89d963a9d7dba0bfa60b86299175929eb2b552a56d1f9c476e18b28de510b4a6a9c28585def04a9e40d244ba067eec250b63e0c03db8874fff09 WHIRLPOOL e24483d0e3aa1c070bee3ea67883edeef8394317addde27aa137838b9da7f1bf099fee252a6a925fdd26976aa6ea974f24ba14078f4aeb615a471c1670e1f77c
-AUX pygobject-3.0.3-tests-python3.patch 953 SHA256 e9b9da15e44239a85b71d5dde5ae112780c9527b81bddf4edfa9d620bf371d00 SHA512 3f90a75217d728687b1e36f50ca236b4586f09d0a67f70b7337ff19649ad2dcce6c77fa3124f293b1783f999ae8cf2a94d16d656a56ba63f4378ff2f1efcdd8d WHIRLPOOL 4c0b0d0866804a42e35082f8aa41411a185ae5b4e9866e627392cfde9bb8f5c493e55a5bfb039cbf290e0d20b725184bfcc1a858c03e904f806fefce48b7e97b
 DIST pygobject-3.0.4.tar.xz 547180 SHA256 f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661
 DIST pygobject-3.2.0.tar.xz 561820 SHA256 1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3 SHA512 f3f381b43efeefee0187da39178d3c51fcf317c5ba7adc3fa95ad6145d84f72ccb006ad6d08fd4aac5b506599f69b47eb3c599d7f99f57ee22e82ae993465199 WHIRLPOOL c0d1eff36cd3b4c1a1ac945a3d82f54112ee4052698e3ec78f5305173f452a0672811c5cc1231e95002462147e5bedea230c379c663601dec8d95cb99ca51e42
 DIST pygobject-3.2.1.tar.xz 550392 SHA256 0f07401289fa33e8caee7a9342f5c838bb44cd0a386cb99093505edb5e42817a SHA512 84d69b9015044d5cd2919de8a69afa79880bf72cecd923830dc31aa4fe269d6fbe9c79bec5e10a201426667ebfbb625d38cd1016fadbfa93c351aee3a51fdd3f WHIRLPOOL 89c124695206753296d68cc75e7e59a13985160ca37ceb6aed8e6c028a6d0a1787c5af0c1fdc8fa88b7c6a9a43ef08d1c264d7f7eab766936bf35d49b43468e3
 DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0 SHA512 b22c8fd4bcff0d110a08d7f0927df086d4e1e11546e3d7aa08f4e5ec66643d1ba88ac199b0354dca145bf06532c8ab8a427ea9450751ee52b914f355a6d7e9e7 WHIRLPOOL f3e4aaafadfeae5e6fafd0e173c856c2f8c937eb097732760c21ccaced6c7c96e36e5b683d729e78b0043302fafa92818ea90fa845fe266caf5e2d0a8ae8ff8f
-EBUILD pygobject-cairo-3.0.4.ebuild 2390 SHA256 d7d0539e4991eccd9e8bed8c29419b8f091bc6a205206deb36769ea047eee759 SHA512 4411f1f94ede746c0598bf3213e239636b06f30e7a382f8ac0df8388998e07a537cac266b7908570ce484e0b39249e62b2bb4bf8174e0498f3304a990b88f39b WHIRLPOOL f0a4dbedd587bdf0a5ac352bb76912fcec4db54099277522f5fd9427a4efe5f5b12d05f6fb308caf730e472fb8bb7088c04d460b80b356dfc32772ea9f5cf936
-EBUILD pygobject-cairo-3.2.0.ebuild 1893 SHA256 f5584eef1195e839e2eb989b8f02d7039c894f21c976754448fca6beb7639743 SHA512 d5069fad7ccbb34fe6319285181022233babe947209d3ea2b188c622dac634062b5ab871129df74ad96bf23c34d6310038125126911cd8e31ee92a922d5af59d WHIRLPOOL 4c3c19005c2e0863305746041723dd96cb3b2e542ed79921367a8508c89a1a1f83bdc046c82a4554bb5ea383ce62dcfb7debbe6b8e9b790281abb6812eaee9b5
-EBUILD pygobject-cairo-3.2.1.ebuild 1893 SHA256 f5584eef1195e839e2eb989b8f02d7039c894f21c976754448fca6beb7639743 SHA512 d5069fad7ccbb34fe6319285181022233babe947209d3ea2b188c622dac634062b5ab871129df74ad96bf23c34d6310038125126911cd8e31ee92a922d5af59d WHIRLPOOL 4c3c19005c2e0863305746041723dd96cb3b2e542ed79921367a8508c89a1a1f83bdc046c82a4554bb5ea383ce62dcfb7debbe6b8e9b790281abb6812eaee9b5
-EBUILD pygobject-cairo-3.2.2.ebuild 1893 SHA256 f5584eef1195e839e2eb989b8f02d7039c894f21c976754448fca6beb7639743 SHA512 d5069fad7ccbb34fe6319285181022233babe947209d3ea2b188c622dac634062b5ab871129df74ad96bf23c34d6310038125126911cd8e31ee92a922d5af59d WHIRLPOOL 4c3c19005c2e0863305746041723dd96cb3b2e542ed79921367a8508c89a1a1f83bdc046c82a4554bb5ea383ce62dcfb7debbe6b8e9b790281abb6812eaee9b5
-MISC metadata.xml 178 SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c SHA512 090602f45b8fe37eb4ec23c568d815bd1ea41903eb2ad2592c251915aeb3edd957eae84957d556eb3b4b3fbb5acf6aae7594e1640ee5e04297cb6e2efc6c4c41 WHIRLPOOL 69136c1dbfe808f569ccf5362e9df219ef8ba594cc608893dbf854ee6482111c5c969c2510f2f92b659b3a94e1a669490062815891988e71e76a8d0782b871e6
+DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
diff --git a/dev-python/pygobject-cairo/files/pygobject-3.4.1.1-make_check.patch b/dev-python/pygobject-cairo/files/pygobject-3.4.1.1-make_check.patch
new file mode 100644
index 000000000..7aa705816
--- /dev/null
+++ b/dev-python/pygobject-cairo/files/pygobject-3.4.1.1-make_check.patch
@@ -0,0 +1,84 @@
+From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH] Do not build tests unless needed
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
+---
+ tests/Makefile.am | 12 ++++++------
+ tests/runtests.py |  3 +++
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7a619bf..a3cbf57 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES = libgimarshallingtests.la
++check_LTLIBRARIES = libgimarshallingtests.la
+ test_typelibs = GIMarshallingTests-1.0.typelib
+ 
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
+ 
+ # regress.c needs cairo
+ if ENABLE_CAIRO
+-noinst_LTLIBRARIES += libregress.la
++check_LTLIBRARIES += libregress.la
+ test_typelibs += Regress-1.0.typelib
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
+@@ -52,7 +52,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
+ 
+ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
+ 
+-noinst_LTLIBRARIES += testhelper.la
++check_LTLIBRARIES += testhelper.la
+ 
+ testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+ 	test -L $@ || $(LN_S) .libs/$@ $@
+ 
+ 
+-all: $(LTLIBRARIES:.la=.so)
++all: $(check_LTLIBRARIES:.la=.so)
+ 
+ EXTRA_DIST = \
+ 	compathelper.py \
+@@ -112,7 +112,7 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so) file.txt~
++	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ 
+ DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
+ 	MALLOC_PERTURB_=85 \
+ 	TESTS_BUILDDIR=$(builddir)
+ 
+-check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
+ 	@echo "  CHECK  Pyflakes"
+ 	@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
+ 	@echo "  CHECK  PEP8"
+diff --git a/tests/runtests.py b/tests/runtests.py
+index c518fcc..35bb5c4 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
+     unittest.TestCase.assertGreater = assertGreater
+     unittest.TestCase.assertIsInstance = assertIsInstance
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
++
+ if '--help' in sys.argv:
+     print("Usage: ./runtests.py <testfiles>")
+     sys.exit(0)
+-- 
+1.7.12.4
+
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.4.2-r1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.4.2-r1.ebuild
new file mode 100644
index 000000000..f2075c1f3
--- /dev/null
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.4.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+REAL_PN="${PN/-cairo}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit autotools eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python, Cairo Libraries"
+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="+threads"
+
+COMMON_DEPEND="
+	~dev-python/pygobject-base-${PV}[threads=]
+	>=dev-python/pycairo-1.10.0"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]
+	sys-apps/findutils"
+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
+		--enable-cairo
+		$(use_enable threads thread)"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${REAL_PN}-3.4.1.1-make_check.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
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	# just keep /usr/$(get_libdir)/*/site-packages/gi/_gi_cairo.so
+	# discard the rest
+	rm $(find "${ED}" -type f | grep -v "gi/_gi_cairo.so") \
+		$(find "${ED}" -type l | grep -v "gi/_gi_cairo.so") || die
+	find "${ED}" -depth -type d -empty -exec rmdir {} \; || die
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
deleted file mode 100644
index d539aa992..000000000
--- a/dev-python/pygobject/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-EBUILD pygobject-3.0.4.ebuild 690 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37 SHA512 1ba28f23aa7ff66eec56d6181a8f66c07b7725aafa4eaaec43d21e4095d4bd5a20c21148f9bda820c542eb33adeee386838f8eb2aa66d8602e9409b0aed6ce04 WHIRLPOOL ba07ac55537d53162b0c53c0992ec9b4ddf81ea87bd7c85184b2bb647144859e01e87d4ba88c9e2cfa7a01a3002b97d1164707c4c2c1f95eee9ff6de51b1318b
-EBUILD pygobject-3.2.0.ebuild 690 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37 SHA512 1ba28f23aa7ff66eec56d6181a8f66c07b7725aafa4eaaec43d21e4095d4bd5a20c21148f9bda820c542eb33adeee386838f8eb2aa66d8602e9409b0aed6ce04 WHIRLPOOL ba07ac55537d53162b0c53c0992ec9b4ddf81ea87bd7c85184b2bb647144859e01e87d4ba88c9e2cfa7a01a3002b97d1164707c4c2c1f95eee9ff6de51b1318b
-EBUILD pygobject-3.2.1.ebuild 690 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37 SHA512 1ba28f23aa7ff66eec56d6181a8f66c07b7725aafa4eaaec43d21e4095d4bd5a20c21148f9bda820c542eb33adeee386838f8eb2aa66d8602e9409b0aed6ce04 WHIRLPOOL ba07ac55537d53162b0c53c0992ec9b4ddf81ea87bd7c85184b2bb647144859e01e87d4ba88c9e2cfa7a01a3002b97d1164707c4c2c1f95eee9ff6de51b1318b
-EBUILD pygobject-3.2.2.ebuild 690 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37 SHA512 1ba28f23aa7ff66eec56d6181a8f66c07b7725aafa4eaaec43d21e4095d4bd5a20c21148f9bda820c542eb33adeee386838f8eb2aa66d8602e9409b0aed6ce04 WHIRLPOOL ba07ac55537d53162b0c53c0992ec9b4ddf81ea87bd7c85184b2bb647144859e01e87d4ba88c9e2cfa7a01a3002b97d1164707c4c2c1f95eee9ff6de51b1318b
-MISC metadata.xml 291 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c SHA512 fc65893762f926c0ad7877e87f58be8b7ad77dfc63aa369c6b445ae65cd01ea6a0c1aafc84ab116ffd1969425882bceb27352bf9f22387a88ee625c234ee2097 WHIRLPOOL f3aaa2ccc5bdf6da492ed934b940248f8820dbf8e441184edd32e3f31ab2685f394112bfc62933cd01722934054f60b28e879a05e8d60982b4ec31d506a8de60
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
new file mode 100644
index 000000000..20a26432b
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+DESCRIPTION="GLib's GObject library bindings for Python, meta package"
+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-python/pygobject-base-${PV}[threads=,examples=,test=]
+	cairo? ( ~dev-python/pygobject-cairo-${PV}[threads=] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"