Add <upstream> tag to metadata. Cleanup old ebuilds and patches.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

11 files changed, 27 insertions, 1296 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 84f8c0c52dae..1cb5114ebd3f 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.166 2012/02/20 14:24:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.167 2012/02/20 23:55:07 pesa Exp $
+
+  20 Feb 2012; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.7.7-r1.ebuild,
+  -PyQt4-4.8.1-r1.ebuild, -PyQt4-4.8.2.ebuild, -PyQt4-4.8.3.ebuild,
+  -PyQt4-4.8.5.ebuild, -PyQt4-4.8.6.ebuild, -PyQt4-4.9.ebuild,
+  -files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff,
+  -files/PyQt4-4.8.3-configure-multilib.patch, metadata.xml:
+  Add <upstream> tag to metadata. Cleanup old ebuilds and patches.
 
   20 Feb 2012; Patrick Lauer <patrick@gentoo.org> PyQt4-4.7.3.ebuild,
   PyQt4-4.7.7-r1.ebuild, PyQt4-4.8.1-r1.ebuild, PyQt4-4.8.1.ebuild,
diff --git a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
deleted file mode 100644
index 67c7cb9d1b67..000000000000
--- a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
+++ /dev/null
@@ -1,170 +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.7.7-r1.ebuild,v 1.5 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit qt4-r2 python toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-QTVER="4.6.2" # minimal Qt version this is supposed to work with
-
-DESCRIPTION="A set of Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.11
-	>=x11-libs/qt-core-${QTVER}:4
-	>=x11-libs/qt-script-${QTVER}:4
-	>=x11-libs/qt-test-${QTVER}:4
-	X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
-	assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QTVER}:4
-	)
-	multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-libs/phonon ) )
-		kde? ( media-libs/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-	"${FILESDIR}/${P}-fix-scpk-and-flag-issue.diff"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
-			"${S}"/configure.py || die
-	fi
-
-	# Patch to support qreal for arm architecture
-	# wrt bug #322349
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include dir
-	sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \
-		-i configure.py
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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
-				--qsci-api
-				$(use debug && echo '--debug')
-				--enable=QtCore
-				--enable=QtNetwork
-				--enable=QtScript
-				--enable=QtTest
-				--enable=QtXml
-				$(pyqt4_use_enable X QtGui)
-				$(pyqt4_use_enable X QtDesigner)
-				$(pyqt4_use_enable X QtScriptTools)
-				$(pyqt4_use_enable assistant QtAssistant)
-				$(pyqt4_use_enable assistant QtHelp)
-				$(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)
-				CC=$(tc-getCC) CXX=$(tc-getCXX)
-				LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
-				CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
-		echo ${myconf}
-		eval ${myconf} || return 1
-
-		for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
-			# Run eqmake4 inside the qpy subdirs to prevent
-			# stripping and many other QA issues
-			pushd qpy/${mod} > /dev/null || die
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || die
-
-			# Fix insecure runpaths
-			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "failed to fix rpath issues"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}"/designer
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module,
-		# the other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc doc/pyqt4ref.txt NEWS THANKS || die
-
-	if use doc; then
-		dohtml -r doc/* || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
deleted file mode 100644
index 7e03fe5e0eb3..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,174 +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.8.1-r1.ebuild,v 1.4 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.11.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui); do
-			# Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}/designer"
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.2.ebuild b/dev-python/PyQt4/PyQt4-4.8.2.ebuild
deleted file mode 100644
index bbd17ae26e0e..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.2.ebuild
+++ /dev/null
@@ -1,174 +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.8.2.ebuild,v 1.5 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.12
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui); do
-			# Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}/designer"
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.3.ebuild b/dev-python/PyQt4/PyQt4-4.8.3.ebuild
deleted file mode 100644
index 9cd3bbeaeb1d..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.3.ebuild
+++ /dev/null
@@ -1,175 +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.8.3.ebuild,v 1.8 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.12.1
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.3-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative); do
-			# Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return 1
-			eqmake4 python.pro
-			popd > /dev/null || return 1
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.5.ebuild b/dev-python/PyQt4/PyQt4-4.8.5.ebuild
deleted file mode 100644
index 4bc052ff2787..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.5.ebuild
+++ /dev/null
@@ -1,178 +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.8.5.ebuild,v 1.3 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.12.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return 1
-			eqmake4 python.pro
-			popd > /dev/null || return 1
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on"
-	ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. 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
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.6.ebuild b/dev-python/PyQt4/PyQt4-4.8.6.ebuild
deleted file mode 100644
index c64c04a32157..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.6.ebuild
+++ /dev/null
@@ -1,178 +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.8.6.ebuild,v 1.2 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.12.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return 1
-			eqmake4 python.pro
-			popd > /dev/null || return 1
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on"
-	ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. 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
-}
diff --git a/dev-python/PyQt4/PyQt4-4.9.ebuild b/dev-python/PyQt4/PyQt4-4.9.ebuild
deleted file mode 100644
index 1eeb5eedf4cc..000000000000
--- a/dev-python/PyQt4/PyQt4-4.9.ebuild
+++ /dev/null
@@ -1,182 +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.ebuild,v 1.4 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.13.1
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	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.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
-	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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
-
-	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"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtScriptTools)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(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)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		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 and LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return 1
-			eqmake4 python.pro
-			popd > /dev/null || return 1
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-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 || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on"
-	ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. 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
-}
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
deleted file mode 100644
index 38083e76e523..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py
-+++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-@@ -1,3 +1,5 @@
-+import os.path
-+
- from PyQt4 import QtGui, QtCore
- from PyQt4.uic.uiparser import UIParser
- from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy
-@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser):
-     def loadUi(self, filename, toplevelInst=None):
-         self.toplevelInst = toplevelInst
- 
--        # By using QFileInfo.path() rather than os.path.dirname() we allow
--        # QString file names.
--        return self.parse(filename, QtCore.QFileInfo(filename).path())
-+        # Allow the filename to be a QString.
-+        filename = str(filename)
-+
-+        return self.parse(filename, os.path.dirname(filename))
-Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip
-+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-@@ -312,12 +312,12 @@ public:
-     // Qt.Alignment class.
-     QFlags operator|(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 | (ENUM(a1)));
-+        sipRes = new QFlags(*a0 | a1);
- %End
- 
-     QFlags operator^(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+        sipRes = new QFlags(*a0 ^ a1);
- %End
- 
-     // These are necessary to prevent Python comparing object IDs.
diff --git a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch b/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch
deleted file mode 100644
index 2a463dcbd602..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.py
-+++ configure.py
-@@ -941,8 +941,8 @@
-                     # version.
-                     link = "-framework Python"
-                 elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
--                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
--                    lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
-+                      glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor))):
-+                    lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
-                     link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-                 else:
-                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 569523904e3d..be414dcdc307 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -4,16 +4,24 @@
 	<herd>python</herd>
 	<herd>qt</herd>
 	<use>
-		<flag name="X">Build the QtGui and QtDesigner modules</flag>
-		<flag name="assistant">Build the QtHelp and QtAssistant modules</flag>
-		<flag name="declarative">Build the QtDeclarative module</flag>
-		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as Phonon variant needed for KDE</flag>
-		<flag name="multimedia">Build the QtMultimedia module</flag>
-		<flag name="opengl">Build the QtOpenGL module</flag>
-		<flag name="phonon">Build the phonon module</flag>
-		<flag name="sql">Build the QtSql module</flag>
-		<flag name="svg">Build the QtSvg module</flag>
-		<flag name="webkit">Build the QtWebKit module</flag>
-		<flag name="xmlpatterns">Build the QtXmlPatterns module</flag>
+		<flag name="X">Build QtGui, QtDesigner and QtScriptTools modules</flag>
+		<flag name="assistant">Build QtHelp and QtAssistant modules</flag>
+		<flag name="declarative">Build QtDeclarative module</flag>
+		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant, needed for KDE4</flag>
+		<flag name="multimedia">Build QtMultimedia module</flag>
+		<flag name="opengl">Build QtOpenGL module</flag>
+		<flag name="phonon">Build phonon module</flag>
+		<flag name="sql">Build QtSql module</flag>
+		<flag name="svg">Build QtSvg module</flag>
+		<flag name="webkit">Build QtWebKit module</flag>
+		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<remote-id type="pypi">PyQt</remote-id>
+	</upstream>
 </pkgmetadata>