diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index d610b365c..4e261bc1e 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -1 +1,2 @@
 DIST pygobject-3.18.2.tar.xz 730220 SHA256 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f SHA512 8001efdbfb07caa23d2e1024e90c5db7478468b2e8de319fb25695e69e5898524ebccc8b69edcedb71ff02d9fe333448986cc5a22014f8661230fd5acdffa19e WHIRLPOOL fe3002baaf7ef347efa7e3c0c1d22c5c5927133a8b86ebf7a634cae0517eab16eac38fe7c34e513ebdabce4993674ec3cac63a0fc2445d718e9d0bfbf95300fc
+DIST pygobject-3.20.1.tar.xz 749748 SHA256 3d261005d6fed6a92ac4c25f283792552f7dad865d1b7e0c03c2b84c04dbd745 SHA512 477ea2e87b8f6651d8697947439d10be9b4febca3c834dcc86e91e13b2fc1ed3bbf6f63377ae04f63c4f24756c8b8407d959222af0308ef60bbdd86d4fae39ac WHIRLPOOL 824a72b592515a4b77d53cb5b9b71b709a226e0ac053c9359ecd7b05820c43a303ed4ad99c5e34e41483bbe32a0a9d4e0c8a87d6f8852189407fac28da758268
diff --git a/dev-python/pygobject-base/metadata.xml b/dev-python/pygobject-base/metadata.xml
index 9b1bc26a9..08a5bd43f 100644
--- a/dev-python/pygobject-base/metadata.xml
+++ b/dev-python/pygobject-base/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild b/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
index a0bc3a5f8..11cb1e2d4 100644
--- a/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
+++ b/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 REAL_PN="${PN/-base}"
 GNOME_ORG_MODULE="${REAL_PN}"
 
-inherit autotools eutils gnome2 python-r1 virtualx
+inherit eutils gnome2 python-r1 virtualx
 
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
diff --git a/dev-python/pygobject-base/pygobject-base-3.20.1.ebuild b/dev-python/pygobject-base/pygobject-base-3.20.1.ebuild
new file mode 100644
index 000000000..055cb33ad
--- /dev/null
+++ b/dev-python/pygobject-base/pygobject-base-3.20.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+REAL_PN="${PN/-base}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.46.0:=
+	virtual/libffi:=
+"
+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]
+		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
+"
+# gnome-base/gnome-common required by eautoreconf
+
+# 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() {
+	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
+	configuring() {
+		gnome2_src_configure \
+			--disable-cairo \
+			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	export SKIP_PEP8="yes"
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir virtx emake 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 d610b365c..4e261bc1e 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -1 +1,2 @@
 DIST pygobject-3.18.2.tar.xz 730220 SHA256 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f SHA512 8001efdbfb07caa23d2e1024e90c5db7478468b2e8de319fb25695e69e5898524ebccc8b69edcedb71ff02d9fe333448986cc5a22014f8661230fd5acdffa19e WHIRLPOOL fe3002baaf7ef347efa7e3c0c1d22c5c5927133a8b86ebf7a634cae0517eab16eac38fe7c34e513ebdabce4993674ec3cac63a0fc2445d718e9d0bfbf95300fc
+DIST pygobject-3.20.1.tar.xz 749748 SHA256 3d261005d6fed6a92ac4c25f283792552f7dad865d1b7e0c03c2b84c04dbd745 SHA512 477ea2e87b8f6651d8697947439d10be9b4febca3c834dcc86e91e13b2fc1ed3bbf6f63377ae04f63c4f24756c8b8407d959222af0308ef60bbdd86d4fae39ac WHIRLPOOL 824a72b592515a4b77d53cb5b9b71b709a226e0ac053c9359ecd7b05820c43a303ed4ad99c5e34e41483bbe32a0a9d4e0c8a87d6f8852189407fac28da758268
diff --git a/dev-python/pygobject-cairo/metadata.xml b/dev-python/pygobject-cairo/metadata.xml
index 9b1bc26a9..08a5bd43f 100644
--- a/dev-python/pygobject-cairo/metadata.xml
+++ b/dev-python/pygobject-cairo/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
index e0ae91a14..41ddfef80 100644
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 REAL_PN="${PN/-cairo}"
 GNOME_ORG_MODULE="${REAL_PN}"
 
-inherit autotools eutils gnome2 python-r1 virtualx
+inherit eutils gnome2 python-r1 virtualx
 
 DESCRIPTION="GLib's GObject library bindings for Python, Cairo Libraries"
 HOMEPAGE="http://www.pygtk.org/"
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.20.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.20.1.ebuild
new file mode 100644
index 000000000..74b956f97
--- /dev/null
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.20.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+REAL_PN="${PN/-cairo}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python, Cairo Libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~dev-python/pygobject-base-${PV}[threads=]
+	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]
+	gnome-base/gnome-common"
+# gnome-base/gnome-common required by eautoreconf
+
+# 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() {
+	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
+	configuring() {
+		gnome2_src_configure \
+			--enable-cairo \
+			$(use_enable threads thread)
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+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
+
+	# /usr/lib64/python2.7/site-packages/gi/_gi_cairo.so
+	# /usr/lib64/python3.3/site-packages/gi/_gi_cairo.cpython-33.so
+	# /usr/lib64/python3.4/site-packages/gi/_gi_cairo.cpython-34.so
+
+	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/metadata.xml b/dev-python/pygobject/metadata.xml
index 9b1bc26a9..08a5bd43f 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.20.1.ebuild b/dev-python/pygobject/pygobject-3.20.1.ebuild
new file mode 100644
index 000000000..ec4c24b3f
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.20.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit python-r1
+
+DESCRIPTION="GLib's GObject library bindings for Python, meta package"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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="${PYTHON_REQUIRED_USE}"
+
+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}"