diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index e8dddba10..03ffefe1e 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -3,3 +3,4 @@ DIST pygobject-3.2.0.tar.xz 561820 SHA256 1a2140c4c4ce0c1a5d7abe74eeb7a7040f426c
 DIST pygobject-3.2.1.tar.xz 550392 SHA256 0f07401289fa33e8caee7a9342f5c838bb44cd0a386cb99093505edb5e42817a
 DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0 SHA512 b22c8fd4bcff0d110a08d7f0927df086d4e1e11546e3d7aa08f4e5ec66643d1ba88ac199b0354dca145bf06532c8ab8a427ea9450751ee52b914f355a6d7e9e7 WHIRLPOOL f3e4aaafadfeae5e6fafd0e173c856c2f8c937eb097732760c21ccaced6c7c96e36e5b683d729e78b0043302fafa92818ea90fa845fe266caf5e2d0a8ae8ff8f
 DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
+DIST pygobject-3.8.2.tar.xz 654092 SHA256 caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5 SHA512 63295e2f5dd2cc6a8909f68884b7e9e055344f4ab341e310c54c90151aa54cb902e0f80c1522ec5227ad4dd33b236ecf75e0ab5a9334cb62a85070f5a51be608 WHIRLPOOL e445afd80e858dd8e698faf631fdbd04e9741dd7d5720ca6d57bee099b557a902e4da23caf44117ec24a4cb071b38e23c35b6dba4bfd7fe545f1f199babd4b97
diff --git a/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch b/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch
new file mode 100755
index 000000000..74db7757f
--- /dev/null
+++ b/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch
@@ -0,0 +1,86 @@
+From 319d6d68a398d326ef95e39f494da7c514facf81 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Fri, 8 Mar 2013 08:25:58 +0330
+Subject: [PATCH] pygobject-3.7.90-make check
+
+originaly by [Alexandre Rostovtsev <tetromino@gmail.com>
+don't build tests unless it's needed
+
+---
+ 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 287542d..2cc0da9 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 \
+@@ -116,7 +116,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= \
+@@ -130,7 +130,7 @@ RUN_TESTS_ENV_VARS= \
+ 
+ # pygtkcompat tests need to be run in a separate process as they
+ # clobber global name space
+-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
+ 	@if test -z "$$SKIP_PEP8"; then \
+diff --git a/tests/runtests.py b/tests/runtests.py
+index d3a4f47..5a53d3f 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -54,6 +54,9 @@ if sys.version_info[:2] == (2, 6):
+ if sys.version_info[:2] == (2, 7):
+     unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+ 
++# 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.8.1.2
+
diff --git a/dev-python/pygobject-base/pygobject-base-3.8.2.ebuild b/dev-python/pygobject-base/pygobject-base-3.8.2.ebuild
new file mode 100644
index 000000000..f8720b07d
--- /dev/null
+++ b/dev-python/pygobject-base/pygobject-base-3.8.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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="+cairo examples test +threads"
+
+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
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+		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"
+
+	# Do not build tests if unneeded, bug #226345, upstream bug #698444
+	epatch "${FILESDIR}/${REAL_PN}-3.7.90-make_check.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	# 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
+	python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--with-ffi \
+			--disable-cairo \
+			$(use_enable threads thread)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+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
+}
diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index b7df79fb2..485c84bba 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -3,3 +3,4 @@ DIST pygobject-3.2.0.tar.xz 561820 SHA256 1a2140c4c4ce0c1a5d7abe74eeb7a7040f426c
 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
 DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
+DIST pygobject-3.8.2.tar.xz 654092 SHA256 caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5 SHA512 63295e2f5dd2cc6a8909f68884b7e9e055344f4ab341e310c54c90151aa54cb902e0f80c1522ec5227ad4dd33b236ecf75e0ab5a9334cb62a85070f5a51be608 WHIRLPOOL e445afd80e858dd8e698faf631fdbd04e9741dd7d5720ca6d57bee099b557a902e4da23caf44117ec24a4cb071b38e23c35b6dba4bfd7fe545f1f199babd4b97
diff --git a/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch b/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch
new file mode 100755
index 000000000..74db7757f
--- /dev/null
+++ b/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch
@@ -0,0 +1,86 @@
+From 319d6d68a398d326ef95e39f494da7c514facf81 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Fri, 8 Mar 2013 08:25:58 +0330
+Subject: [PATCH] pygobject-3.7.90-make check
+
+originaly by [Alexandre Rostovtsev <tetromino@gmail.com>
+don't build tests unless it's needed
+
+---
+ 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 287542d..2cc0da9 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 \
+@@ -116,7 +116,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= \
+@@ -130,7 +130,7 @@ RUN_TESTS_ENV_VARS= \
+ 
+ # pygtkcompat tests need to be run in a separate process as they
+ # clobber global name space
+-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
+ 	@if test -z "$$SKIP_PEP8"; then \
+diff --git a/tests/runtests.py b/tests/runtests.py
+index d3a4f47..5a53d3f 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -54,6 +54,9 @@ if sys.version_info[:2] == (2, 6):
+ if sys.version_info[:2] == (2, 7):
+     unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+ 
++# 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.8.1.2
+
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.8.2.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.8.2.ebuild
new file mode 100644
index 000000000..1aabf4e24
--- /dev/null
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.8.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 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[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+
+	# Do not build tests if unneeded, bug #226345, upstream bug #698444
+	epatch "${FILESDIR}/${REAL_PN}-3.7.90-make_check.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	# 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
+	python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--with-ffi \
+			--enable-cairo \
+			$(use_enable threads thread)
+}
+
+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
+}
diff --git a/dev-python/pygobject/pygobject-3.8.2.ebuild b/dev-python/pygobject/pygobject-3.8.2.ebuild
new file mode 100644
index 000000000..3d909439b
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit python-r1
+
+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 ~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" # doc
+
+COMMON_DEPEND="
+	~dev-python/pygobject-base-${PV}[threads=,examples=,test=,${PYTHON_USEDEP}]
+	cairo? ( ~dev-python/pygobject-cairo-${PV}[threads=,${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"