diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index ec25c511a..1b4fc400c 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -1,5 +1 @@
-DIST pygobject-3.12.1.tar.xz 701872 SHA256 da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35 SHA512 095754d06507bb5c5d802603d8fd97fabcc3057172f1fe6f34138e9553281cc7b474a0dd9f235678718eccc4f7adee38b10ec1365d5fd8c4c61a47e4a24fd5a1 WHIRLPOOL 3cc3c96f7f644c17ef9c9704107af3ff0577da3a54258de208b048eee1cf8e329ed572b4d8cea6e336a9757d6f60a969ce9c84fdd9987abf114b3e79a4ee3c18
-DIST pygobject-3.13.3.tar.xz 710452 SHA256 28c4d28c4083ce9c249cf7a8621a1452ecc557951650810a09bf946b21df7452 SHA512 3e8aca047f95d903e89bdfe0e24daf226a10a2bdf783142164fa22a11e6047da528d004711d289067b8cbd80d247c517b2a029cd4df11e54df7f6e6b907833a3 WHIRLPOOL b709d55b93986d7067c65be737c5824d9a26bf1d8ee3ab4c2a0193e24cfb29dea378407d4dbc41772d7ffa259bea1fbda43787a4aef68feafb1f27c416acdf0b
-DIST pygobject-3.14.0.tar.xz 720128 SHA256 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 SHA512 f6e1e5826a6afe81eb0a37bb554b433769622f8a0d17ac9836498425d70c4583cf8157027a555c21fd7a0d6686863c7803a350550665a375a906fccdabca2090 WHIRLPOOL 0a665504b792691238b89d2704ce1cc024f89ddf96fd6b626f1f5b05dbccfd633e61f9b45b0ca09873029c576b9804edcfa77e1bceae9e995be44a3fd60852ca
-DIST pygobject-3.15.0.tar.xz 722740 SHA256 ba6e9a0a2ca3942e3e35343b4b306b6560104eb5cf632a0cdcfe96999ac9be8d SHA512 e7895c89be6ec30c98e6c4fd15355cf2e53024fc31c82f1c6bc9155951d45b20baa6b2d4157c58588fcd6814051487b499c224ed8df057583b79c4f8e0954ffa WHIRLPOOL aa1865b763851f454ab1910ed99d1c11613f165e221d40ed25df57f645181f42690d856075deb58083d61753ebde51ddc72f3909865acb976887a98de6690a17
 DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2
diff --git a/dev-python/pygobject-base/pygobject-base-3.12.1.ebuild b/dev-python/pygobject-base/pygobject-base-3.12.1.ebuild
deleted file mode 100644
index f2259a38f..000000000
--- a/dev-python/pygobject-base/pygobject-base-3.12.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_7,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 ~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-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.38
-	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() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# docs disabled by upstream default since they are very out of date
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--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
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	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() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-base/pygobject-base-3.13.3.ebuild b/dev-python/pygobject-base/pygobject-base-3.13.3.ebuild
deleted file mode 100644
index 1590677fb..000000000
--- a/dev-python/pygobject-base/pygobject-base-3.13.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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_7,3_2,3_3,3_4} )
-
-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 ~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-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.38
-	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() {
-	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 \
-			--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
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	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() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-base/pygobject-base-3.14.0.ebuild b/dev-python/pygobject-base/pygobject-base-3.14.0.ebuild
deleted file mode 100644
index 66df9c388..000000000
--- a/dev-python/pygobject-base/pygobject-base-3.14.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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_7,3_3,3_4} )
-
-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="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~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-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39
-	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] )
-"
-# 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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--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
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	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() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-base/pygobject-base-3.15.0.ebuild b/dev-python/pygobject-base/pygobject-base-3.15.0.ebuild
deleted file mode 100644
index 66df9c388..000000000
--- a/dev-python/pygobject-base/pygobject-base-3.15.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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_7,3_3,3_4} )
-
-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="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~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-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39
-	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] )
-"
-# 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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--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
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	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() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-base/pygobject-base-3.16.1.ebuild b/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild
index 3a424640a..a75c5052e 100644
--- a/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild
+++ b/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 REAL_PN="${PN/-base}"
 GNOME_ORG_MODULE="${REAL_PN}"
diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index ec25c511a..1b4fc400c 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -1,5 +1 @@
-DIST pygobject-3.12.1.tar.xz 701872 SHA256 da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35 SHA512 095754d06507bb5c5d802603d8fd97fabcc3057172f1fe6f34138e9553281cc7b474a0dd9f235678718eccc4f7adee38b10ec1365d5fd8c4c61a47e4a24fd5a1 WHIRLPOOL 3cc3c96f7f644c17ef9c9704107af3ff0577da3a54258de208b048eee1cf8e329ed572b4d8cea6e336a9757d6f60a969ce9c84fdd9987abf114b3e79a4ee3c18
-DIST pygobject-3.13.3.tar.xz 710452 SHA256 28c4d28c4083ce9c249cf7a8621a1452ecc557951650810a09bf946b21df7452 SHA512 3e8aca047f95d903e89bdfe0e24daf226a10a2bdf783142164fa22a11e6047da528d004711d289067b8cbd80d247c517b2a029cd4df11e54df7f6e6b907833a3 WHIRLPOOL b709d55b93986d7067c65be737c5824d9a26bf1d8ee3ab4c2a0193e24cfb29dea378407d4dbc41772d7ffa259bea1fbda43787a4aef68feafb1f27c416acdf0b
-DIST pygobject-3.14.0.tar.xz 720128 SHA256 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 SHA512 f6e1e5826a6afe81eb0a37bb554b433769622f8a0d17ac9836498425d70c4583cf8157027a555c21fd7a0d6686863c7803a350550665a375a906fccdabca2090 WHIRLPOOL 0a665504b792691238b89d2704ce1cc024f89ddf96fd6b626f1f5b05dbccfd633e61f9b45b0ca09873029c576b9804edcfa77e1bceae9e995be44a3fd60852ca
-DIST pygobject-3.15.0.tar.xz 722740 SHA256 ba6e9a0a2ca3942e3e35343b4b306b6560104eb5cf632a0cdcfe96999ac9be8d SHA512 e7895c89be6ec30c98e6c4fd15355cf2e53024fc31c82f1c6bc9155951d45b20baa6b2d4157c58588fcd6814051487b499c224ed8df057583b79c4f8e0954ffa WHIRLPOOL aa1865b763851f454ab1910ed99d1c11613f165e221d40ed25df57f645181f42690d856075deb58083d61753ebde51ddc72f3909865acb976887a98de6690a17
 DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.12.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.12.1.ebuild
deleted file mode 100644
index e0e553ced..000000000
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 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_7,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 ~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="
-	~dev-python/pygobject-base-${PV}[threads=]
-	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[glib]
-	gnome-base/gnome-common"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-# gnome-base/gnome-common required by eautoreconf
-
-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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--enable-cairo \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-cairo/pygobject-cairo-3.13.3.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.13.3.ebuild
deleted file mode 100644
index b503386fb..000000000
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.13.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 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_7,3_2,3_3,3_4} )
-
-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 ~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="
-	~dev-python/pygobject-base-${PV}[threads=]
-	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[glib]
-	gnome-base/gnome-common"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-# gnome-base/gnome-common required by eautoreconf
-
-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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--enable-cairo \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-cairo/pygobject-cairo-3.14.0.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.14.0.ebuild
deleted file mode 100644
index 112f2051b..000000000
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 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_7,3_3,3_4} )
-
-REAL_PN="${PN/-cairo}"
-GNOME_ORG_MODULE="${REAL_PN}"
-
-inherit autotools 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 ~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="
-	~dev-python/pygobject-base-${PV}[threads=]
-	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[glib]
-	gnome-base/gnome-common"
-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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--enable-cairo \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-cairo/pygobject-cairo-3.15.0.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.15.0.ebuild
deleted file mode 100644
index 7fd010cdb..000000000
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.15.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 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_7,3_3,3_4} )
-
-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 ~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="
-	~dev-python/pygobject-base-${PV}[threads=]
-	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[glib]
-	gnome-base/gnome-common"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-# gnome-base/gnome-common required by eautoreconf
-
-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
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--enable-cairo \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	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-cairo/pygobject-cairo-3.16.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild
index 6b31de72a..8f57d7c74 100644
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 REAL_PN="${PN/-cairo}"
 GNOME_ORG_MODULE="${REAL_PN}"
diff --git a/dev-python/pygobject/pygobject-3.12.1.ebuild b/dev-python/pygobject/pygobject-3.12.1.ebuild
deleted file mode 100644
index 0182d1d83..000000000
--- a/dev-python/pygobject/pygobject-3.12.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,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 ~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}"
diff --git a/dev-python/pygobject/pygobject-3.13.3.ebuild b/dev-python/pygobject/pygobject-3.13.3.ebuild
deleted file mode 100644
index b055cd56e..000000000
--- a/dev-python/pygobject/pygobject-3.13.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-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 ~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}"
diff --git a/dev-python/pygobject/pygobject-3.14.0.ebuild b/dev-python/pygobject/pygobject-3.14.0.ebuild
deleted file mode 100644
index a80d203c8..000000000
--- a/dev-python/pygobject/pygobject-3.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-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 ~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}"
diff --git a/dev-python/pygobject/pygobject-3.15.0.ebuild b/dev-python/pygobject/pygobject-3.15.0.ebuild
deleted file mode 100644
index a80d203c8..000000000
--- a/dev-python/pygobject/pygobject-3.15.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-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 ~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}"
diff --git a/dev-python/pygobject/pygobject-3.16.1.ebuild b/dev-python/pygobject/pygobject-3.16.1.ebuild
index a80d203c8..1c755cf99 100644
--- a/dev-python/pygobject/pygobject-3.16.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.16.1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit python-r1