Remove useless doc and introspection USE flags from pygobject-2. Add 3.4.2-r1 that uses python-r1.eclass. Drop old.

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 53 insertions, 191 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index c031ca12013f..8434327389a2 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.182 2012/11/12 17:23:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.183 2012/12/10 04:04:38 tetromino Exp $
+
+*pygobject-3.4.2-r1 (10 Dec 2012)
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -pygobject-2.28.6-r51.ebuild, pygobject-2.28.6-r52.ebuild,
+  -pygobject-3.4.1.1.ebuild, +pygobject-3.4.2-r1.ebuild:
+  Remove useless doc and introspection USE flags from pygobject-2. Add 3.4.2-r1
+  that uses python-r1.eclass. Drop old.
 
 *pygobject-3.4.2 (12 Nov 2012)
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index d0ec7a9d98a9..593c0d3fea58 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -15,24 +15,22 @@ AUX pygobject-3.4.1.1-make_check.patch 2959 SHA256 4d6902f32ff91bc42733da3bb1718
 DIST pygobject-2.28.6.tar.xz 747248 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c WHIRLPOOL 402f764d6ca73f238784738a1e09832858fd95af5a633e825412e9e6a21e89ab6b2090d3995902ed404fc4fde445cf970c76fcd93f8f64cf9def742452776c00
 DIST pygobject-3.0.4.tar.xz 547180 SHA256 f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661 SHA512 46bc73e8650bdc7bef4216ab097d24fee7049dbf75472b7478ad735a33b23d06a25cb48e8e34d5518ddb44dc61259f9c2b3ca46a8a39ff4be7302a17af8dc750 WHIRLPOOL 811e1bb19c370039f5a0d622e2be39b0eef3eaaeb75e91dd02ec57196d18c696985555674b65c4c99da131779d8f6c5533f846bd1a858f2a54f81bbcae3adaaf
 DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0 SHA512 b22c8fd4bcff0d110a08d7f0927df086d4e1e11546e3d7aa08f4e5ec66643d1ba88ac199b0354dca145bf06532c8ab8a427ea9450751ee52b914f355a6d7e9e7 WHIRLPOOL f3e4aaafadfeae5e6fafd0e173c856c2f8c937eb097732760c21ccaced6c7c96e36e5b683d729e78b0043302fafa92818ea90fa845fe266caf5e2d0a8ae8ff8f
-DIST pygobject-3.4.1.1.tar.xz 613476 SHA256 dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017 SHA512 cd26d01573176cc78540fc98d675e5de114aa3ff441bcd26c931996353e3e1012e534f050a972dec3f74cfb342a3e97f5287f609c25b2ecc7cd48dedfcb2b110 WHIRLPOOL 4c548abf5ae8439bc042444dea85bd8b82a84ef90917d00eb16e94888c0d0dee0d32890140defdb30c75ac147e9f50b0be5492dc18f870037158e3c25317a255
 DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
-EBUILD pygobject-2.28.6-r51.ebuild 4155 SHA256 a938a71603d8c5b4b959d23c8d7c55cf6f554bec346fc4718b668ce74aa6e8de SHA512 c32721aba340a00c74d1996c1a1183e0049e4974c8f2ea138c0e9971a525b46689fdec505e39e7dd476ebb4a4995990624b122ed42b999ad04be235c726fca17 WHIRLPOOL fe2d56f2d11d55bfe3328ddc3667ef9d6eb8ebc29b985a67ca9ae4cea03b8ab88012f1554bf4de153cf0405585a9dab5c4e0f410d21e4da1b6c017fdf4785fcb
-EBUILD pygobject-2.28.6-r52.ebuild 4222 SHA256 48967b378a358db04f7475d7e44dcac041a75520427c1ca48aa1149714cd184b SHA512 581cb1777d42ef802cdaf998484c7d9345f34584b10c2d260da45a2d9b44412d9daaae69acafd337748f9a2b06c70c97f2a52e48e2631e4ae0f88ea1feecc248 WHIRLPOOL 981700f3d0c9d08e0f6ad8cf2565b44ddac28e54bf22c1de2d3aa4650f34a6145584ab825e35edeb7711cb697d422fcdf9218c160fd224cea683b1f5c67b562e
+EBUILD pygobject-2.28.6-r52.ebuild 3871 SHA256 497c600e763c677c9ef096836f4a3a033c8a165b8f47194271923f31213ca678 SHA512 9f326d8ef0a841f313b236be183b9b08dce2b92661301bda55b65c3e8ebb649dc9f1ab326e5ab4c488de36481e7fbd5a0fe78c178ba39b75ca1f7d2e7227eb09 WHIRLPOOL 6b0837205ed3717bbe9254580ebcadf6c5399baec210086051c946fd77e9cec7490e44851627e9d410876e1beacbfd9877da7e97e71dc26bd22b792dcf4359fa
 EBUILD pygobject-3.0.4.ebuild 3541 SHA256 3264e38e276fa49f566e4900c83f254d9703759ff6b8c5abdc83a2d8ba3992a2 SHA512 27db89b8122449a44494fb030b7070ca780274700ee3c8f843ef1a0fd9deca68d4ea78b572a3cd1dfd2420340f111d25c5e8ca4f1a2a81e6e526b3fd6b6e4b9c WHIRLPOOL 75708764dd848f7938b958ec1f9c34159fc62e6790061dbce099af167bc9e37c7b5725fb4e4b7cd8434b6fb24bb46a0ac6f6f196886844b84c8d3ded84a58dc3
 EBUILD pygobject-3.2.2.ebuild 3164 SHA256 0bf30444acc677b4cff3c20329e431f0e3e3564103379f490c3a9626a8447aa6 SHA512 f3d246ecb25bae944f25b12bd2d0f282f2bae18d8a6a0d5a751c00120790a699624df50612bd48addcf45328fcf3d06a361abeaea056ea2831c6a77081dcfef0 WHIRLPOOL 9eeacd45b83c21efd35528d2335a9823596c090e4d5d59b23bc40ad840fb61030668f63684c5778da2d51daf93cf27890da28f4d06a6e7dd38e213700f5b30bb
-EBUILD pygobject-3.4.1.1.ebuild 3094 SHA256 de122ff72005aaa3b8bab41f01736e8663d7751e9e800c521669cc9f1d763ff4 SHA512 0936d8a2ce2fbee403cf708aa18aad4180757f4c3dac4d379252d03f077b5d9c5bb33c167c1bd5fb62feb5fe86dc736e1022b567e0a2421e08bc660fd35fb015 WHIRLPOOL e195c479ad503a93f5da786fd77462b7a47a4891edd9238aca769369e7677ead71351f4f44272ae9f66959a67aae3e7c19376d78f53aab29555a161d08ed8a8e
+EBUILD pygobject-3.4.2-r1.ebuild 3337 SHA256 ea99b4bfdfddb80497ccf595455c564eb087307a310893c7bc4b60214a25f760 SHA512 3e801b093581648472e816b0ee2ef53e2bd4399c94a1d3382a2ce65356d3cf8edc00c4937b4799bdfe4c455019699fb7f1c20628ca87915117f661c5c8259745 WHIRLPOOL cf7634214e866d14333f7fd8da5f77447e476e4467f082c501e309319bce5d730b72a1049f3c3d0623efbc845e45d0433a4a49a22c85367c27a952dd424739ba
 EBUILD pygobject-3.4.2.ebuild 3098 SHA256 cb124592bb5f73653ea1e1ee10b9b694dabcbbb31815c9e9c85e520bff55d0d7 SHA512 ad9b850733009e5c980a7a22c7d21ce0347f3b6cd21c74a3028ccff34da9b3d315073e177f17dacfcbb327941fbbd4cb6c04906513f5d06a12e7919203f08f62 WHIRLPOOL 6864f40dda88fa15be121095aac1ab65ec25aa1f7d1c31fe334045a6bad5585ab6260e85557816c5eb6712469bd13991b20697a38729449ad45bafc56698cc09
-MISC ChangeLog 29846 SHA256 54368e7841627a14d265b3b6a061e216c0f78f0ac0157fc8d41b5c4e2c254ba0 SHA512 2f8be0761c0f2dc9ed729b811f316d100134c367a82301a8bc789c4ab9bcbeb3b09404d691ef0ac39f0fdea306746c156588b038058f667ac441f6718091c0a8 WHIRLPOOL 36d8b4e850c92aad68f780e0adbdb2630e7a743ec8d65ed71295646010432f841ba2def3e7f285827a4935599cf78c317aa9463ea06a7357b4182cbb74270565
+MISC ChangeLog 30179 SHA256 1020a6f9d8f23a948396b640b807dfc38f660fee0b968c5349e5562daff2d9b2 SHA512 5e2a2081f463126b0e273b6aa36ba594679b293824a4b718547499f991983c1a088f0c81d05a9d0f60bd508b7434379951cac2a5332b184395c5e18b2ed59de9 WHIRLPOOL 87a8fbe371e755b612b303e98a8e5ef43b9b3f7109427c7cdb95c823f025577b74e8b1222e998ada5a69857cb6d9d6469d3cbc031f19750c1f4abd5a218cc794
 MISC metadata.xml 291 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c SHA512 fc65893762f926c0ad7877e87f58be8b7ad77dfc63aa369c6b445ae65cd01ea6a0c1aafc84ab116ffd1969425882bceb27352bf9f22387a88ee625c234ee2097 WHIRLPOOL f3aaa2ccc5bdf6da492ed934b940248f8820dbf8e441184edd32e3f31ab2685f394112bfc62933cd01722934054f60b28e879a05e8d60982b4ec31d506a8de60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQoTCFAAoJEJ0WA1zPCt1hQl4IAKQBkTnTovNvCsQ967j3eyxC
-08k6Gej6IkKn3HvFUgTfTRgjljxQRUrC2Q1nCQgONQ0Fzx2R1vsdG+4KX7TMXUu3
-IsifQOmBmhc0159S7fL8Bap3aSFS115wItAnwQMT8epZ8XrMysGzZIUi3eqi3nv4
-mVACNlCd7IuYVoLo1XxJxBAauFI+hFEZbjzT66dBax9po5drUNjLnzreQr5jefzf
-mCrZjSy1hm/ocAl9WGa8zmlVQXjAsdNE2U+2TBlcGxEjH228dsfCJ1ADSxVNbrdI
-z6IllmxpVxAin32hwddMWkN1inI2rJ6jgjy96yRHQcxMiWq66G6ns0PyngeZo8A=
-=5HnD
+iQEcBAEBCAAGBQJQxV9XAAoJEJ0WA1zPCt1h3OsH/0LcfIPjiOpgmilyaXGKlPuS
+HZrTngAOq0acQlGPiuM2I6l67XnuKmCFB68QgwqaQI5CrBEpuGR40/K0eAgJ6myR
+K7UnJ48rv3h+WD5J6KtpurRY2av5q9X1rlyw/Hhgdb3625w9NvuXgrzIU9Z1uh62
+7tTh22GqTN1iT3QZLmbf4A+MWcD4OhoVEmgFWIdLWktwyzCI3rMV/8FiDpPjnKji
+j3VwcGNSaBhTYhQWD6Kh1UIKQP+CsTVet/2kLWTMchDdnWCoBxA+YEO/0p81j1/X
+xy5VcPVE9GfzFuTzIYl5Zl7Yse0fmlnsF4/xdzeFWFpcB7DG+7aiVvkZmFUUaDU=
+=NRrk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
deleted file mode 100644
index 31ea60cf117b..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r51.ebuild,v 1.16 2012/09/25 11:53:14 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-# pygobject is partially incompatible with Python 3.
-# PYTHON_DEPEND="2:2.6 3:3.1"
-# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools eutils gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-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="doc examples +introspection libffi test"
-# FIXME: tests require introspection support, but we can't enable introspection,
-# or we get file collisions with slot 3 :/
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
-	libffi? ( virtual/libffi )"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc )
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13"
-# Use slot 3 for introspection support per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
-# keep introspection USE flag in slot 2 for backward compatibility for now.
-PDEPEND="introspection? ( dev-python/pygobject:3 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	# --disable-introspection and --disable-cairo because we use pygobject:3
-	# for introspection support
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--disable-introspection
-		--disable-cairo
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
-	# Support installation for multiple Python versions, upstream bug #648292
-	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
-	# Disable tests that fail
-	epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	sed "s:/usr/bin/python:/usr/bin/python2:" \
-		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
-		|| die "Fix usage of python interpreter"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize glib gobject gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup glib gobject gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
index 5df167acf013..28bfd717cc83 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r52.ebuild,v 1.13 2012/10/28 15:44:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r52.ebuild,v 1.14 2012/12/10 04:04:38 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 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="doc examples +introspection libffi test"
+IUSE="examples libffi test"
 # FIXME: tests require introspection support, but we can't enable introspection,
 # or we get file collisions with slot 3 :/
 RESTRICT="test"
@@ -29,19 +29,13 @@ RESTRICT="test"
 COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
 	libffi? ( virtual/libffi )"
 DEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+	dev-util/gtk-doc-am
 	test? (
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc )
 	virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13"
-# Use slot 3 for introspection support per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
-# keep introspection USE flag in slot 2 for backward compatibility for now.
-PDEPEND="introspection? ( dev-python/pygobject:3 )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
@@ -51,7 +45,6 @@ pkg_setup() {
 		--disable-dependency-tracking
 		--disable-introspection
 		--disable-cairo
-		$(use_enable doc docs)
 		$(use_with libffi ffi)"
 	python_pkg_setup
 }
diff --git a/dev-python/pygobject/pygobject-3.4.1.1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index 21b96e8f2a92..3827e6f0bcb1 100644
--- a/dev-python/pygobject/pygobject-3.4.1.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.1.1.ebuild,v 1.1 2012/10/30 08:22:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.1 2012/12/10 04:04:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 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-*"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 
-inherit autotools eutils gnome2 python virtualx
+inherit autotools eutils gnome2 python-r1 virtualx
 
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
@@ -18,7 +16,11 @@ 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
-REQUIRED_USE="test? ( cairo )"
+
+# FIXME: pycairo uses python.eclass, doesn't support multiple 2.x or 3.x pythons
+REQUIRED_USE="test? ( cairo )
+	?? ( python_targets_python2_6 python_targets_python2_7 )
+	?? ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/gobject-introspection-1.34.1.1
@@ -48,10 +50,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13
 	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
 
-pkg_setup() {
-	python_pkg_setup
-}
-
 src_prepare() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
 	# Hard-enable libffi support since both gobject-introspection and
@@ -67,20 +65,26 @@ src_prepare() {
 
 	eautoreconf
 	gnome2_src_prepare
-	python_clean_py-compile_files
 
 	python_copy_sources
 }
 
 src_configure() {
-	configuration() {
-		PYTHON="$(PYTHON)" gnome2_src_configure
+	configuring() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_configure
+		popd > /dev/null
 	}
-	python_execute_function -s configuration
+	python_foreach_impl configuring
 }
 
 src_compile() {
-	python_src_compile
+	compiling() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_compile
+		popd > /dev/null
+	}
+	python_foreach_impl compiling
 }
 
 # FIXME: With python multiple ABI support, tests return 1 even when they pass
@@ -89,28 +93,26 @@ src_test() {
 	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
 
 	testing() {
-		export XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
+		export XDG_CACHE_HOME="${T}/${BUILD_DIR#${S}}"
+		pushd "${BUILD_DIR}" >/dev/null
+		Xemake check
+		popd > /dev/null
 		unset XDG_CACHE_HOME
 	}
-	python_execute_function -s testing
+	python_foreach_impl testing
 	unset GIO_USE_VFS
 }
 
 src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
+	installing() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_install
+		popd > /dev/null
+	}
+	python_foreach_impl installing
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
 }
-
-pkg_postinst() {
-	python_mod_optimize gi
-}
-
-pkg_postrm() {
-	python_mod_cleanup gi
-}