--- java-config-2.1.12.ebuild	2012-11-02 10:46:33.255918152 +0100
+++ java-config-2.1.12-r1.ebuild	2012-11-02 10:49:56.044756690 +0100
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.12.ebuild,v 1.2 2012/09/16 13:20:41 chithanh Exp $
 
-EAPI="2"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
+EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
 
-inherit distutils eutils fdo-mime gnome2-utils
+inherit distutils-r1 eutils fdo-mime gnome2-utils
 
 DESCRIPTION="Java environment configuration tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/java/"
@@ -23,28 +22,22 @@ RDEPEND=">=dev-java/java-config-wrapper-
 PDEPEND=">=virtual/jre-1.5"
 # Tests fail when java-config isn't already installed.
 RESTRICT="test"
-RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
 
-PYTHON_MODNAME="java_config_2"
-
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
+	distutils-r1_python_prepare_all
 
 	cp config/jdk-defaults-{x86,amd64}-fbsd.conf || die #415397
 	echo "*= icedtea-7 icedtea-6 icedtea-bin-7 icedtea-bin-6" \
 		> config/jdk-defaults-arm.conf || die #305773
 }
 
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite2.py
-	}
-	python_execute_function testing
+python_test() {
+	"${PYTHON}" src/run-test-suite.py
+	"${PYTHON}" src/run-test-suite2.py
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	rm -rf "${D}"/usr/share/mimelnk #350459
 
 	insinto /usr/share/java-config-2/config/
@@ -52,13 +45,11 @@ src_install() {
 }
 
 pkg_postrm() {
-	distutils_pkg_postrm
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 }