--- stfl-0.22-r1.ebuild	2012-10-26 12:07:24.000000000 -0400
+++ stfl-0.22-r2.ebuild	2014-08-29 14:35:01.000000000 -0400
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22-r1.ebuild,v 1.1 2012/10/26 16:07:24 scarabeus Exp $
 
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit eutils multilib perl-module python toolchain-funcs
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+GENTOO_DEPEND_ON_PERL=no
+inherit eutils multilib perl-module python-r1 toolchain-funcs
 
 DESCRIPTION="A library which implements a curses-based widget set for text terminals"
 HOMEPAGE="http://www.clifford.at/stfl/"
@@ -14,14 +13,14 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="examples perl python ruby static-libs"
 
 COMMON_DEPEND="sys-libs/ncurses[unicode]
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby )
-	python? ( dev-lang/python )"
+	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${COMMON_DEPEND}
 	perl? ( dev-lang/swig )
@@ -30,10 +29,6 @@
 
 RDEPEND="${COMMON_DEPEND}"
 
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
 src_prepare() {
 	sed -i \
 		-e 's/-Os -ggdb//' \
@@ -72,16 +67,19 @@
 	emake CC="$(tc-getCC)"
 
 	if use python ; then
-		python_copy_sources python
+		local BUILD_DIR="${S}/python"
+		python_copy_sources
 
 		# Based on code from python/Makefile.snippet.
 		building() {
+			pushd "${BUILD_DIR}" &>/dev/null || die
 			echo swig -python -threads stfl.i
-			swig -python -threads stfl.i
+			swig -python -threads stfl.i || die
 			echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
-			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
+			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die
+			popd &>/dev/null || die
 		}
-		python_execute_function -s --source-dir python building
+		python_foreach_impl building
 	fi
 }
 
@@ -89,11 +87,14 @@
 	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
 
 	if use python ; then
+		local BUILD_DIR="${S}/python"
+
 		installation() {
-			insinto $(python_get_sitedir)
-			doins stfl.py _stfl.so
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			python_domodule stfl.py _stfl.so
+			popd &>/dev/null || die
 		}
-		python_execute_function -s --source-dir python installation
+		python_foreach_impl installation
 	fi
 
 	dodoc README
@@ -116,11 +117,3 @@
 
 	fixlocalpod
 }
-
-pkg_postinst() {
-	use python && python_mod_optimize stfl.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup stfl.py
-}