--- pygtk-2.17.0.ebuild	2011-01-08 03:09:21.000000000 +0100
+++ pygtk-2.22.0.ebuild	2011-01-18 10:36:24.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.17.0.ebuild,v 1.9 2011/01/08 01:36:01 ranger Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
@@ -21,10 +21,10 @@
 RDEPEND=">=dev-libs/glib-2.8
 	>=x11-libs/pango-1.16
 	>=dev-libs/atk-1.12
-	>=x11-libs/gtk+-2.18
+	>=x11-libs/gtk+-2.18:2
 	>=gnome-base/libglade-2.5
 	>=dev-python/pycairo-1.0.2
-	>=dev-python/pygobject-2.16.1
+	>=dev-python/pygobject-2.21.3
 	dev-python/numpy"
 
 DEPEND="${RDEPEND}
@@ -37,6 +37,10 @@
 	# Fix declaration of codegen in .pc
 	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
 
+	# Broken test, upstream bug #636589
+	sed -i -e '/test_enum.py/d' tests/Makefile.am || die
+	rm -f tests/test_enum.py || die
+
 	# Disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
@@ -53,9 +57,13 @@
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
+	export HOME="${T}"
+	export XDG_DATA_HOME="${T}"
+	export XDG_CACHE_HOME="${T}"
 
 	testing() {
 		cd tests
+		XDG_CACHE_HOME="${T}"
 		Xemake check-local
 	}
 	python_execute_function -s testing
@@ -64,12 +72,12 @@
 src_install() {
 	python_src_install
 	python_clean_installation_image
-	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO || die
 
 	if use examples; then
 		rm examples/Makefile*
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples || die
 	fi
 }