Fix double prefix; remove old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

5 files changed, 22 insertions, 436 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 5e44cb75707c..8efa81a056fa 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.208 2013/02/04 16:22:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.209 2013/02/13 08:52:33 pesa Exp $
+
+  13 Feb 2013; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.9.6-r1.ebuild,
+  -PyQt4-4.9.6.ebuild, PyQt4-4.9.6-r2.ebuild:
+  Fix double prefix; remove old.
 
   04 Feb 2013; Michael Palimaka <kensington@gentoo.org> PyQt4-4.9.6-r2.ebuild:
   Use run_in_build_dir. Add python-3.3 support wrt bug #455020.
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 169e8690b0b2..b3008202dd02 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -7,19 +7,23 @@ AUX PyQt4-4.9.4-pyuic-custom-widgets.patch 3212 SHA256 8a59ee0fcd3f1d8a52745c68c
 DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.9.4-r1.ebuild 5742 SHA256 601ced757792b9e858a0c4ad69a5aa5ccb6fd961c791f681de8ad2469db0b83b SHA512 294287e228c70a3ca41b52cfeebc7e35b121aeea46ce6c84ead7e9239f1cd2a15d195535376306f917a9b51a9936a8b48c1c985410cd1b402f1be80f5a001820 WHIRLPOOL 6ff0cb2300333730e50222b00bc2f1b3ff66f03e379e33872214df44be9773b324645964aee7a1ff87d1140187e7737dd3f1892163fdc70c88d00b94bed52de2
-EBUILD PyQt4-4.9.6-r1.ebuild 5409 SHA256 0fc73c6d4e14621a63832485886e72e721509c6f4ad48e3f58ca9c01024ea78f SHA512 341cdd8b98b71bbec23d900f9415650d89cb342dc1131faf624dcc2b2dd82fc3d16b2a51755cbdb52569702ad0a03b97b36730449da8562ac1bfa5420615cf61 WHIRLPOOL cffb492e02a92e500f8003d9df459783290e3550a42bb580b67f2e28c1f84e69fd3cddf031e3ccef04d9d20f0be4e749867d93aad62a0dd9cb1e6cb6f376a8db
-EBUILD PyQt4-4.9.6-r2.ebuild 5323 SHA256 a873d3aab44913ffdfe752c731b2e850ae7ee6081d62d8646ab96574294ba0c4 SHA512 ef330c7a271556572310a77e0952f5f4ef34465f53e204676683b98ab042ab2e0b53bfc8820cbb34082ef04bd6def8745febdbc91675928e2eeb2f3aaeaaa5ae WHIRLPOOL ee247b17932d42884f0dba0f9b41bfa1498505a58e9862c51d0c53e8e73c8db12640495a7006dff052ad43f4de5a12e3b4084b9a6d0d9a67d316088daed33ae4
-EBUILD PyQt4-4.9.6.ebuild 5777 SHA256 83d708e29360ace76838a47a7c6c65e2bf52d580a485974d04f64c5dd4368ac8 SHA512 fc32778b2fdd722c49a95c61f8c0e4450f8953b9beba8d7fe5862d4b4ae56624dde4ce486e0e3790c002c5e9b4b99345c65658f26a088940d159886b65c5316f WHIRLPOOL 5bb620c8d34a813a0a5cc525715e0837e5bbb7fbd489c48bcf8d16948116c5fbd22d6bc1424ec6b269126f0b7f8ac8f34720c08b955c4f4301bf3bde13d737e2
-MISC ChangeLog 29113 SHA256 3b781c46994b43b87ca2a9927e44199b29a3f4ebd4884aedf498fa8a8b965cf7 SHA512 1d200c4e0482b786c7f6e6aed4785a3cf0a4401699b5a32d4f70b8de1d067b7b877ce6c3e43408c294c1104abe46a4e314df6603fa63c0d5ce8d045fb9f57faa WHIRLPOOL 35c0d103df0b4c1c081af31bcbdeead11bbc2ecc410e380660d5572b03a87d46ec95d33f42be481347d2ea03510a2c820014b0197bfd0598c59d944edbb71bf7
+EBUILD PyQt4-4.9.6-r2.ebuild 5307 SHA256 6694d98487b33c69d321f9e4d84d0af9c4c75ae5ec7c13de9fe8140233a39eb7 SHA512 bfd7dc343a4c8c0440c4b33935e907f52415e86ca62661e50835761b59a7cf246fc0feaa2e974e902b0fe0f939de4e0ebbd73ade8cb2c5850e1496aee4b695fe WHIRLPOOL 47cdd4b62c8ed0cfb4c21830ba81b65f505b5c8987492e86e9f6b0173a38182ad2e4b7e478fe2eaf0280911435a271e12b39f7f465d769e01c1a30f871fb4a66
+MISC ChangeLog 29261 SHA256 f4207ce25d05f3babc8a819e291242d1f6ef5bc083633046c0a4d89c24d3cf47 SHA512 acf7b86af45dceede9667d10622a97b24f27dac82988c0e9014422ebb39052ed66fb983997a8afe4cb51783c01ee2d848d0349856dcaff0116156b5d0b8bf9b2 WHIRLPOOL 06e24da9d60966e46cee8222872cb37fdc3ee81601ca01cf341dbe7862ffbc9a0adc143bfe35c6e4c3e28c027737f17d56929c54c0728e8621e6a0adef8ebc14
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRD+BLAAoJEMbwO6tnXQ0scV0H/1H4hJA+uzwQ/wDCR+1Z7Osy
-TspoTUMpM8DuJiEyNZE2p5Eg8mPAABvDHZRKfvjJo0b1lEoOnJIKxUOs7WTde03q
-lkj9GVbvuRGvezgJ0mLnWtIkE/7WGS7DYO78NKFhMu4QGZ1r+Pr/1TGF2SXBFfWJ
-x25gZQum+W2aiOT/RgBysKgBAPiZ+jFSwGv2ZNrlHi0vFhcFiZWRDoAI1ixldLXq
-OKaiDF674ygJYfm9hCy5/q+tHX711hnODUCCXKJ4EsTws7oB1Rf4CDCFiysZRfSb
-KY06u/py9pSRDE54rZ1gU7DRwihSYtwXPJgdqNB02LOTnX5yEjX4yMl6Cx9rk8M=
-=RN2H
+iQIcBAEBCAAGBQJRG1RdAAoJENXLsxwXqFxylPsQAL7RWCsJMqrEFE38ubGU/lvo
+3Qtp+1/53IMyvPUQ09+gR7c++JEIZvNOG1GFpPjv5mwIqRFlKJDb7KWBCS2Yisis
+TOqpxwGdPItXuxJkIOIXb4/nqTFNTDujHaUcfpFSs2VGEJ85N0PvQYZNAVPbIHqE
+z/MknRCmE0aVDqM2jzLDm4cjS/qqoEtQvmUIdZi4LHOmhdRIH2g9EvMcnGmuznG4
+TdH3RLJ8aLoPo0G2KJAixof+22Zq6mzcbodvePlKQvw9y0ziryerZ+3y44qALYz/
+NfwimVrKVdMCbV0Y3J+vXploTrv6AaDeXKRO2Z0po1+Vj2EMJS3JCzHgI2OftkRM
+0WdV3HdN5NUceJrIu8pUWWM2yjc8sB/blVfd+T6D9hvO/w9qSAQhZ4fRoQ8/Zzu8
+zJqdBOQZDV+ofGEwnKKHwBJOTf5Tvpw84XJSejY3vV7Y2xTJWsEscrfosO+g0fPu
+e1YFZixZxWZ1Srfg3fw2WbbUaoNGUL7kaqmBK6yVTQxCKrB0AnpsIZSnuexSni/1
+obvhHXiiC9WlSo94o8I4bcgjiacLgQ87jz+EYDuICCWeRVDrLzQBs3UMYh9URWPZ
+6Lz4pONS2Vv4nXcSVq8KGWkVun6NTrugRV4tFY9Wn2y0xoJtliWJaKyBan/0tvr1
+6jCSUz8f7BtCZp7FCjvn
+=Ppa2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
deleted file mode 100644
index cd8356e55fc7..000000000000
--- a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.2 2012/12/27 04:20:42 pesa Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit eutils qt4-r2 python toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
-REQUIRED_USE="
-	declarative? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.0:4"
-
-RDEPEND="
-	>=dev-python/sip-4.14.2:=
-	>=x11-libs/qt-core-${QT_PV}
-	X? (
-		>=x11-libs/qt-gui-${QT_PV}[dbus?]
-		>=x11-libs/qt-test-${QT_PV}
-	)
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_PV}
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
-	help? ( >=x11-libs/qt-assistant-${QT_PV} )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
-	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
-	phonon? (
-		kde? ( media-libs/phonon )
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
-	)
-	script? ( >=x11-libs/qt-script-${QT_PV} )
-	sql? ( >=x11-libs/qt-sql-${QT_PV} )
-	svg? ( >=x11-libs/qt-svg-${QT_PV} )
-	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Use proper include directory for phonon.
-	sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
-		configure.py || die
-
-	if ! use dbus; then
-		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
-	fi
-
-	python_copy_sources
-
-	preparation() {
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"$(PYTHON)" configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtTest)
-			$(pyqt4_use_enable dbus QtDBus)
-			$(pyqt4_use_enable declarative)
-			$(pyqt4_use_enable help)
-			$(pyqt4_use_enable multimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon phonon)
-			$(pyqt4_use_enable script)
-			$(pyqt4_use_enable scripttools QtScriptTools)
-			$(pyqt4_use_enable sql)
-			$(pyqt4_use_enable svg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		local mod
-		for mod in QtCore \
-				$(use X && echo QtDesigner QtGui) \
-				$(use dbus && echo QtDBus) \
-				$(use declarative && echo QtDeclarative) \
-				$(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect
-			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return
-
-			# Fix insecure runpaths.
-			sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "Failed to fix rpath for ${mod}"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return
-			eqmake4 python.pro
-			popd > /dev/null || return
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
-	}
-	python_execute_function -s installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
index b16f765f4aee..05598ee17672 100644
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.2 2013/02/04 16:22:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.3 2013/02/13 08:52:33 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -106,7 +106,7 @@ src_configure() {
 			"${PYTHON}" configure.py
 			--confirm-license
 			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
+			--destdir="$(python_get_sitedir)"
 			--sipdir="${EPREFIX}/usr/share/sip"
 			--assume-shared
 			--no-timestamp
diff --git a/dev-python/PyQt4/PyQt4-4.9.6.ebuild b/dev-python/PyQt4/PyQt4-4.9.6.ebuild
deleted file mode 100644
index 50e4bdebca02..000000000000
--- a/dev-python/PyQt4/PyQt4-4.9.6.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6.ebuild,v 1.1 2012/12/10 11:20:38 pesa Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit eutils toolchain-funcs qt4-r2 python
-
-# Minimal supported version of Qt.
-QT_VER="4.7.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${PN}/PyQt-${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-REQUIRED_USE="
-	assistant? ( X )
-	declarative? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-RDEPEND="
-	>=dev-python/sip-4.14.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	X? (
-		>=x11-libs/qt-gui-${QT_VER}:4[dbus?]
-		>=x11-libs/qt-test-${QT_VER}:4
-	)
-	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_VER}:4
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? (
-		>=x11-libs/qt-opengl-${QT_VER}:4
-		|| ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] )
-	)
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
-		kde? ( media-libs/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Use proper include directory for phonon.
-	sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
-		configure.py || die
-
-	if ! use dbus; then
-		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
-	fi
-
-	python_copy_sources
-
-	preparation() {
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo "--enable=${2:-$1}"
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"$(PYTHON)" configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
-			$(pyqt4_use_enable X QtScriptTools)
-			$(pyqt4_use_enable X QtTest)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(pyqt4_use_enable dbus QtDBus)
-			$(pyqt4_use_enable declarative QtDeclarative)
-			$(pyqt4_use_enable multimedia QtMultimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon)
-			$(pyqt4_use_enable sql QtSql)
-			$(pyqt4_use_enable svg QtSvg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		local mod
-		for mod in QtCore \
-				$(use X && echo QtDesigner QtGui) \
-				$(use dbus && echo QtDBus) \
-				$(use declarative && echo QtDeclarative) \
-				$(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect
-			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				-i ${mod}/Makefile || die "Failed to fix rpath for ${mod}"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return
-			eqmake4 python.pro
-			popd > /dev/null || return
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
-	}
-	python_execute_function -s installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages that depend on it,"
-	ewarn "such as dev-python/qscintilla-python and kde-base/pykde4. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`."
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}