--- orca-2.30.2.ebuild	2010-09-11 22:08:07.000000000 +0200
+++ orca-2.32.0.ebuild	2010-10-12 00:24:52.000000000 +0200
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-2.30.2.ebuild,v 1.6 2010/09/11 18:38:52 josejx Exp $
 
-PYTHON_DEPEND="2" # Support for Python 3 not verified
+EAPI="3"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
 inherit gnome2 python
 
@@ -40,18 +41,26 @@
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
 
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	python_set_active_version 2
+}
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+	
+	python_convert_shebangs -r 2 .
+}
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 2 failed"
+src_configure() {
+	# FIXME: Workaround for bug #325611 until root cause is found
+	addpredict "$(unset HOME; echo ~)/.gconf" 
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	gnome2_src_configure
 }
 
 src_compile() {
@@ -63,10 +72,10 @@
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/orca
+	python_mod_optimize "${PN}"
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/orca
+	python_mod_cleanup "${PN}"
 }