--- qscintilla-python-2.7.ebuild	2012-12-10 12:27:54.000000000 +0000
+++ qscintilla-python-2.7.ebuild	2013-03-06 06:48:39.110186720 +0000
@@ -2,12 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.ebuild,v 1.1 2012/12/10 12:27:54 pesa Exp $
 
-EAPI=4
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit eutils python toolchain-funcs
+inherit eutils multilib python-r1 toolchain-funcs
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -21,8 +19,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc6
 IUSE="debug"
 
 DEPEND="
-	>=dev-python/sip-4.12
-	>=dev-python/PyQt4-4.8[X]
+	>=dev-python/sip-4.12[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.8[X,${PYTHON_USEDEP}]
 	~x11-libs/qscintilla-${PV}
 "
 RDEPEND="${DEPEND}"
@@ -32,14 +30,18 @@ S=${WORKDIR}/${MY_P}/Python
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.5.1-disable_stripping.patch"
 
-	python_src_prepare
+	python_copy_sources
 }
 
 src_configure() {
 	configuration() {
 		local myconf=(
-			"$(PYTHON)" configure.py
-			--destdir="${EPREFIX}$(python_get_sitedir)/PyQt4"
+			"${PYTHON}" configure.py
+			--apidir="${EPREFIX}"/usr/share/qt4/qsci
+			--destdir="$(python_get_sitedir)"/PyQt4
+			--sipdir="${EPREFIX}"/usr/share/sip
+			-n "${EPREFIX}"/usr/include/qt4
+			-o "${EPREFIX}"/usr/$(get_libdir)/qt4
 			-p 4
 			--no-timestamp
 			$(use debug && echo --debug)
@@ -47,12 +49,16 @@ src_configure() {
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die
 	}
-	python_execute_function -s configuration
+	python_parallel_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {
 	building() {
 		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)"
 	}
-	python_execute_function -s building
+	python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
 }