diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index d3a1af4b4..ae9dde944 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -5,6 +5,8 @@ AUX pygobject-3.0.3-gobject-property-min-max.patch 2505 RMD160 6bd1c482426102669
 AUX pygobject-3.0.3-tests-python3.patch 953 RMD160 da11f5e7541a44d69639a9cb2fb1c845bae5864b SHA1 83f864613330148cc4a58c56f6190a6db6beb3a1 SHA256 e9b9da15e44239a85b71d5dde5ae112780c9527b81bddf4edfa9d620bf371d00
 DIST pygobject-3.0.4.tar.xz 547180 RMD160 f72d82b862359fee51bffc12076c29a49b9c4b6a SHA1 72df1cdd6e34d52ada6e32f1bbd7f36f4be67512 SHA256 f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661
 DIST pygobject-3.2.0.tar.xz 561820 RMD160 5b0f6bf22dc5f6e30b50c26daab12867c96112ef SHA1 42ec81a638ddc735c062d0dae7389235242d7732 SHA256 1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3
+DIST pygobject-3.2.1.tar.xz 550392 RMD160 051b63507389426e0ca43155a867c5486dea0c75 SHA1 fa99e33a2917a24ad24359d0ec0c6af0b35a25d6 SHA256 0f07401289fa33e8caee7a9342f5c838bb44cd0a386cb99093505edb5e42817a
 EBUILD pygobject-cairo-3.0.4.ebuild 2383 RMD160 ab2ba4cf8957acdfdee17008665f23335d6aab08 SHA1 6528c288013517968d2688b3809ff9274cf86b58 SHA256 b770c0b5856615451f33c6170f85621bd564762fd9b8d1a707180d8a924f250a
 EBUILD pygobject-cairo-3.2.0.ebuild 1886 RMD160 3a1e3325bd0f0b0fd79ebb006e2e9cd2db79461f SHA1 ff38f9e79803d995def71b92f9e1cb63737977bb SHA256 f5ea7795a904b347cb1c44208ac7262b6f1d03e710d7177d3c9ad90a462f56b4
+EBUILD pygobject-cairo-3.2.1.ebuild 1886 RMD160 3a1e3325bd0f0b0fd79ebb006e2e9cd2db79461f SHA1 ff38f9e79803d995def71b92f9e1cb63737977bb SHA256 f5ea7795a904b347cb1c44208ac7262b6f1d03e710d7177d3c9ad90a462f56b4
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.2.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.2.1.ebuild
new file mode 100644
index 000000000..19d465ac3
--- /dev/null
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6 3:3.1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
+
+REAL_PN="${PN/-cairo}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit alternatives autotools gnome2 python 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 ~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}
+	sys-apps/findutils"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--with-ffi
+		--enable-cairo
+		$(use_enable threads thread)"
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${REAL_PN}-2.90.1-make_check.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
+}
+
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
+	# just keep /usr/$(get_libdir)/*/site-packages/gi/_gi_cairo.so
+	# discard the rest
+	rm $(find "${D}" -type f | grep -v "gi/_gi_cairo.so") \
+		$(find "${D}" -type l | grep -v "gi/_gi_cairo.so") || die
+	find "${D}" -depth -type d -empty -exec rmdir {} \; || die
+}
+
+pkg_postinst() {
+	python_mod_optimize gi
+}
+
+pkg_postrm() {
+	python_mod_cleanup gi
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 2470b3ed8..69abd7bf4 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,3 +1,4 @@
 EBUILD pygobject-3.0.4.ebuild 690 RMD160 6dcee7517cf374d7b3e1127782f556c73851ca84 SHA1 35259709fc7492834b076e02452d2b3620bf23f8 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37
 EBUILD pygobject-3.2.0.ebuild 690 RMD160 6dcee7517cf374d7b3e1127782f556c73851ca84 SHA1 35259709fc7492834b076e02452d2b3620bf23f8 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37
+EBUILD pygobject-3.2.1.ebuild 690 RMD160 6dcee7517cf374d7b3e1127782f556c73851ca84 SHA1 35259709fc7492834b076e02452d2b3620bf23f8 SHA256 276c82b3338a41c0a605767115213caee76c6ecfc8a86a94fa244db28674aa37
 MISC metadata.xml 291 RMD160 2226a820b502bdd20583331e1601bb9cd04f96be SHA1 f5d19f3ae1f337179858f1818fc195a20ad7e4d9 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c
diff --git a/dev-python/pygobject/pygobject-3.2.1.ebuild b/dev-python/pygobject/pygobject-3.2.1.ebuild
new file mode 100644
index 000000000..f47103305
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.2.1.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}"