--- pyside-1.1.2.ebuild	2012-12-26 07:29:30.000000000 +0100
+++ pyside-1.1.2-r1.ebuild	2013-02-04 02:02:15.109969536 +0100
@@ -2,15 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.2.ebuild,v 1.5 2012/12/26 06:29:30 pesa Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="2:2.6 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 3.3 *-jython 2.7-pypy-*"
+EAPI=5
 
-VIRTUALX_COMMAND="cmake-utils_src_test"
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
-inherit multilib cmake-utils python virtualx
+inherit multilib cmake-utils python-r1 virtualx
 
 MY_P="${PN}-qt4.8+${PV}"
 
@@ -40,7 +36,7 @@ REQUIRED_USE="
 QT_PV="4.7.0:4"
 
 RDEPEND="
-	>=dev-python/shiboken-${PV}
+	>=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
 	>=x11-libs/qt-core-${QT_PV}
 	X? (
 		>=x11-libs/qt-gui-${QT_PV}[accessibility]
@@ -83,51 +79,51 @@ src_prepare() {
 }
 
 src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_disable X QtGui)
+		$(cmake-utils_use_disable X QtDesigner)
+		$(cmake-utils_use_disable X QtTest)
+		$(cmake-utils_use_disable X QtUiTools)
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable help QtHelp)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_disable phonon)
+		$(cmake-utils_use_disable script QtScript)
+		$(cmake-utils_use_disable scripttools QtScriptTools)
+		$(cmake-utils_use_disable sql QtSql)
+		$(cmake-utils_use_disable svg QtSvg)
+		$(cmake-utils_use_disable webkit QtWebKit)
+		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+	)
+
 	configuration() {
 		local mycmakeargs=(
-			-DPYTHON_SUFFIX="-python${PYTHON_ABI}"
-			$(cmake-utils_use_build test TESTS)
-			$(cmake-utils_use_disable X QtGui)
-			$(cmake-utils_use_disable X QtDesigner)
-			$(cmake-utils_use_disable X QtTest)
-			$(cmake-utils_use_disable X QtUiTools)
-			$(cmake-utils_use_disable declarative QtDeclarative)
-			$(cmake-utils_use_disable help QtHelp)
-			$(cmake-utils_use_disable multimedia QtMultimedia)
-			$(cmake-utils_use_disable opengl QtOpenGL)
-			$(cmake-utils_use_disable phonon)
-			$(cmake-utils_use_disable script QtScript)
-			$(cmake-utils_use_disable scripttools QtScriptTools)
-			$(cmake-utils_use_disable sql QtSql)
-			$(cmake-utils_use_disable svg QtSvg)
-			$(cmake-utils_use_disable webkit QtWebKit)
-			$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+			-DPYTHON_SUFFIX="-${EPYTHON}"
+			"${mycmakeargs[@]}"
 		)
-		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_configure
+		cmake-utils_src_configure
 	}
-	python_execute_function configuration
+	python_foreach_impl configuration
 }
 
 src_compile() {
-	compilation() {
-		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_make
-	}
-	python_execute_function compilation
+	python_foreach_impl cmake-utils_src_make
 }
 
 src_test() {
-	testing() {
-		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" virtualmake
-	}
-	python_enable_pyc
-	python_execute_function testing
-	python_disable_pyc
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	local VIRTUALX_COMMAND="cmake-utils_src_test"
+	python_foreach_impl virtualmake
 }
 
 src_install() {
 	installation() {
-		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
+		cmake-utils_src_install
+		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
 	}
-	python_execute_function installation
+	python_foreach_impl installation
 }