--- 	
+++ 	2013-07-03 10:58:17.871636849 -0400
@@ -2,12 +2,11 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.19.ebuild,v 1.4 2012/06/28 23:28:24 blueness Exp $
 
-EAPI="3"
+EAPI="5"
 
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
@@ -16,28 +15,26 @@ 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="+portage"
 
 DEPEND="app-text/xmlto"
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="2.5 3.*"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
-PYTHON_MODNAME="WebappConfig"
-
-src_compile() {
-	distutils_src_compile
+python_compile_all() {
 	#parallel build fixed in next release
 	emake -j1 -C doc/
 }
 
-src_install() {
+python_install() {
 	# According to this discussion:
 	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
 	# distutils does not provide for specifying two different script install
 	# locations. Since we only install one script here the following should
 	# be ok
-	distutils_src_install --install-scripts="/usr/sbin"
+	distutils-r1_python_install --install-scripts="/usr/sbin"
+}
 
+python_install_all() {
 	insinto /etc/vhosts
 	doins config/webapp-config
 
@@ -49,16 +46,12 @@ 
 	dohtml doc/*.[58].html
 }
 
-src_test() {
-	testing() {
-		PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
-	}
-	python_execute_function testing
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+		|| die "Testing failed with ${EPYTHON}"
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
 	elog "Now that you have upgraded webapp-config, you **must** update your"
 	elog "config files in /etc/vhosts/webapp-config before you emerge any"
 	elog "packages that use webapp-config."</pre></body></html>