[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtopengl/, dev-qt/designer/, dev-qt/assistant/, ...

[Andreas Sturmlechner]

commit:     fa139691716add1df0233bf3980a0f0dd32ea9d4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 18:19:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 23:31:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa139691

dev-qt: remove Qt 4.8.6

Closes: https://github.com/gentoo/gentoo/pull/6073
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-qt/assistant/Manifest                          |   1 -
 dev-qt/assistant/assistant-4.8.6-r1.ebuild         |  56 ---
 dev-qt/designer/Manifest                           |   1 -
 dev-qt/designer/designer-4.8.6-r1.ebuild           |  59 ---
 dev-qt/linguist/Manifest                           |   1 -
 dev-qt/linguist/linguist-4.8.6-r1.ebuild           |  42 --
 dev-qt/pixeltool/Manifest                          |   1 -
 dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild         |  35 --
 dev-qt/qdbusviewer/Manifest                        |   1 -
 dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild     |  42 --
 dev-qt/qt3support/Manifest                         |   1 -
 dev-qt/qt3support/qt3support-4.8.6-r1.ebuild       |  36 --
 dev-qt/qtbearer/Manifest                           |   1 -
 dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild           |  46 ---
 dev-qt/qtcore/Manifest                             |   1 -
 .../files/qtcore-4.8.6-QNAM-corruptions-fix.patch  | 431 ---------------------
 dev-qt/qtcore/qtcore-4.8.6-r2.ebuild               |  86 ----
 dev-qt/qtdbus/Manifest                             |   1 -
 dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild               |  43 --
 dev-qt/qtdeclarative/Manifest                      |   1 -
 dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild |  54 ---
 dev-qt/qtdemo/Manifest                             |   1 -
 dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild               |  91 -----
 dev-qt/qtgui/Manifest                              |   1 -
 dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch |  40 --
 ...4.8.5-cleanlooks-floating-point-exception.patch |  38 --
 ...gui-4.8.5-dont-crash-on-broken-GIF-images.patch |  43 --
 dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch |  63 ---
 dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch |  31 --
 dev-qt/qtgui/qtgui-4.8.6-r4.ebuild                 | 174 ---------
 dev-qt/qthelp/Manifest                             |   1 -
 dev-qt/qthelp/qthelp-4.8.6-r3.ebuild               | 114 ------
 dev-qt/qtmultimedia/Manifest                       |   1 -
 dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild   |  47 ---
 dev-qt/qtopengl/Manifest                           |   1 -
 dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild           |  48 ---
 dev-qt/qtscript/Manifest                           |   1 -
 dev-qt/qtscript/qtscript-4.8.6-r2.ebuild           |  41 --
 dev-qt/qtsql/Manifest                              |   1 -
 dev-qt/qtsql/qtsql-4.8.6-r1.ebuild                 |  62 ---
 dev-qt/qtsvg/Manifest                              |   1 -
 dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild                 |  45 ---
 dev-qt/qttest/Manifest                             |   1 -
 dev-qt/qttest/qttest-4.8.6-r1.ebuild               |  35 --
 dev-qt/qttranslations/Manifest                     |   1 -
 .../qttranslations/qttranslations-4.8.6-r1.ebuild  |  43 --
 dev-qt/qtwebkit/Manifest                           |   1 -
 dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild           |  72 ----
 dev-qt/qtxmlpatterns/Manifest                      |   1 -
 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild |  36 --
 50 files changed, 1975 deletions(-)

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 0611be6f664..bd9b15d8696 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/assistant/assistant-4.8.6-r1.ebuild b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
deleted file mode 100644
index 2984aecba11..00000000000
--- a/dev-qt/assistant/assistant-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-
-src_prepare() {
-	# bug 401173
-	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
-
-	qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
-		$(qt_use webkit)
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	doicon tools/assistant/tools/assistant/images/assistant.png
-	make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
-}

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 0611be6f664..bd9b15d8696 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/designer/designer-4.8.6-r1.ebuild b/dev-qt/designer/designer-4.8.6-r1.ebuild
deleted file mode 100644
index 9ae4d7cec21..00000000000
--- a/dev-qt/designer/designer-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
-
-QT4_TARGET_DIRECTORIES="tools/designer"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	local plugin
-	for plugin in ${DESIGNER_PLUGINS}; do
-		if ! use ${plugin} || [[ ${plugin} == phonon ]]; then
-			sed -i -e "/\<${plugin}\>/d" \
-				tools/designer/src/plugins/plugins.pro || die
-		fi
-	done
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	doicon tools/designer/src/designer/images/designer.png
-	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-}

diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 0611be6f664..bd9b15d8696 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/linguist/linguist-4.8.6-r1.ebuild b/dev-qt/linguist/linguist-4.8.6-r1.ebuild
deleted file mode 100644
index b62996ad1ad..00000000000
--- a/dev-qt/linguist/linguist-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
-	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
-}

diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 0611be6f664..bd9b15d8696 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
deleted file mode 100644
index 24667775402..00000000000
--- a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	!<dev-qt/qthelp-4.8.5:4
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/pixeltool"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 0611be6f664..bd9b15d8696 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
deleted file mode 100644
index f4df9d2bf65..00000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}

diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
index 1bd4b07babd..0dfe1cd5b56 100644
--- a/dev-qt/qt3support/Manifest
+++ b/dev-qt/qt3support/Manifest
@@ -1,2 +1 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2

diff --git a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild b/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
deleted file mode 100644
index f3881522d17..00000000000
--- a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Qt3Support module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/qt3support
-	src/tools/uic3
-	tools/porting"
-
-multilib_src_configure() {
-	local myconf=(
-		-qt3support
-		$(qt_use accessibility)
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
index 1bd4b07babd..0dfe1cd5b56 100644
--- a/dev-qt/qtbearer/Manifest
+++ b/dev-qt/qtbearer/Manifest
@@ -1,2 +1 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2

diff --git a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
deleted file mode 100644
index 785995366ca..00000000000
--- a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="connman networkmanager"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/plugins/bearer/generic
-		$(use connman && echo src/plugins/bearer/connman)
-		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager || echo -no-dbus)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a897f1af9c2..90ba6110935 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qtcore/files/qtcore-4.8.6-QNAM-corruptions-fix.patch b/dev-qt/qtcore/files/qtcore-4.8.6-QNAM-corruptions-fix.patch
deleted file mode 100644
index 1d83caa3a26..00000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.6-QNAM-corruptions-fix.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-From fa81aa6d027049e855b76f5408586a288f160575 Mon Sep 17 00:00:00 2001
-From: Markus Goetz <markus@×××××.com>
-Date: Tue, 28 Apr 2015 11:57:36 +0200
-Subject: QNAM: Fix upload corruptions when server closes connection
-
-This patch fixes several upload corruptions if the server closes the connection
-while/before we send data into it. They happen inside multiple places in the HTTP
-layer and are explained in the comments.
-Corruptions are:
-* The upload byte device has an in-flight signal with pending upload data, if
-it gets reset (because server closes the connection) then the re-send of the
-request was sometimes taking this stale in-flight pending upload data.
-* Because some signals were DirectConnection and some were QueuedConnection, there
-was a chance that a direct signal overtakes a queued signal. The state machine
-then sent data down the socket which was buffered there (and sent later) although
-it did not match the current state of the state machine when it was actually sent.
-* A socket was seen as being able to have requests sent even though it was not
-encrypted yet. This relates to the previous corruption where data is stored inside
-the socket's buffer and then sent later.
-
-The included auto test produces all fixed corruptions, I detected no regressions
-via the other tests.
-This code also adds a bit of sanity checking to protect from possible further
-problems.
-
-[ChangeLog][QtNetwork] Fix HTTP(s) upload corruption when server closes connection
-
-(cherry picked from commit qtbase/cff39fba10ffc10ee4dcfdc66ff6528eb26462d3)
-Change-Id: I9793297be6cf3edfb75b65ba03b65f7a133ef194
-Reviewed-by: Richard J. Moore <rich@×××.org>
----
- src/corelib/io/qnoncontiguousbytedevice.cpp        |  19 +++
- src/corelib/io/qnoncontiguousbytedevice_p.h        |   4 +
- .../access/qhttpnetworkconnectionchannel.cpp       |  47 +++++-
- src/network/access/qhttpthreaddelegate_p.h         |  36 ++++-
- src/network/access/qnetworkaccesshttpbackend.cpp   |  24 ++-
- src/network/access/qnetworkaccesshttpbackend_p.h   |   5 +-
- tests/auto/qnetworkreply/tst_qnetworkreply.cpp     | 174 ++++++++++++++++++++-
- 7 files changed, 280 insertions(+), 29 deletions(-)
-
-diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
-index bf58eee..1a0591e 100644
---- a/src/corelib/io/qnoncontiguousbytedevice.cpp
-+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
-@@ -245,6 +245,12 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
-     return byteArray->size();
- }
-
-+qint64 QNonContiguousByteDeviceByteArrayImpl::pos()
-+{
-+    return currentPosition;
-+}
-+
-+
- QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb)
-     : QNonContiguousByteDevice(), currentPosition(0)
- {
-@@ -296,6 +302,11 @@ qint64 QNonContiguousByteDeviceRingBufferImpl::size()
-     return ringBuffer->size();
- }
-
-+qint64 QNonContiguousByteDeviceRingBufferImpl::pos()
-+{
-+    return currentPosition;
-+}
-+
- QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d)
-     : QNonContiguousByteDevice(),
-     currentReadBuffer(0), currentReadBufferSize(16*1024),
-@@ -415,6 +426,14 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::size()
-     return device->size() - initialPosition;
- }
-
-+qint64 QNonContiguousByteDeviceIoDeviceImpl::pos()
-+{
-+    if (device->isSequential())
-+        return -1;
-+
-+    return device->pos();
-+}
-+
- QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)0)
- {
-     byteDevice = bd;
-diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
-index b6966eb..d1a99a1 100644
---- a/src/corelib/io/qnoncontiguousbytedevice_p.h
-+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
-@@ -69,6 +69,7 @@ public:
-     virtual const char* readPointer(qint64 maximumLength, qint64 &len) = 0;
-     virtual bool advanceReadPointer(qint64 amount) = 0;
-     virtual bool atEnd() = 0;
-+    virtual qint64 pos() { return -1; }
-     virtual bool reset() = 0;
-     void disableReset();
-     bool isResetDisabled() { return resetDisabled; }
-@@ -108,6 +109,7 @@ public:
-     bool atEnd();
-     bool reset();
-     qint64 size();
-+    qint64 pos();
- protected:
-     QByteArray* byteArray;
-     qint64 currentPosition;
-@@ -123,6 +125,7 @@ public:
-     bool atEnd();
-     bool reset();
-     qint64 size();
-+    qint64 pos();
- protected:
-     QSharedPointer<QRingBuffer> ringBuffer;
-     qint64 currentPosition;
-@@ -140,6 +143,7 @@ public:
-     bool atEnd();
-     bool reset();
-     qint64 size();
-+    qint64 pos();
- protected:
-     QIODevice* device;
-     QByteArray* currentReadBuffer;
-diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
-index 550e090..db2f712 100644
---- a/src/network/access/qhttpnetworkconnectionchannel.cpp
-+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
-@@ -107,15 +107,19 @@ void QHttpNetworkConnectionChannel::init()
-     socket->setProxy(QNetworkProxy::NoProxy);
- #endif
-
-+    // We want all signals (except the interactive ones) be connected as QueuedConnection
-+    // because else we're falling into cases where we recurse back into the socket code
-+    // and mess up the state. Always going to the event loop (and expecting that when reading/writing)
-+    // is safer.
-     QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
-                      this, SLOT(_q_bytesWritten(qint64)),
--                     Qt::DirectConnection);
-+                     Qt::QueuedConnection);
-     QObject::connect(socket, SIGNAL(connected()),
-                      this, SLOT(_q_connected()),
--                     Qt::DirectConnection);
-+                     Qt::QueuedConnection);
-     QObject::connect(socket, SIGNAL(readyRead()),
-                      this, SLOT(_q_readyRead()),
--                     Qt::DirectConnection);
-+                     Qt::QueuedConnection);
-
-     // The disconnected() and error() signals may already come
-     // while calling connectToHost().
-@@ -144,13 +148,13 @@ void QHttpNetworkConnectionChannel::init()
-         // won't be a sslSocket if encrypt is false
-         QObject::connect(sslSocket, SIGNAL(encrypted()),
-                          this, SLOT(_q_encrypted()),
--                         Qt::DirectConnection);
-+                         Qt::QueuedConnection);
-         QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
-                          this, SLOT(_q_sslErrors(QList<QSslError>)),
-                          Qt::DirectConnection);
-         QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
-                          this, SLOT(_q_encryptedBytesWritten(qint64)),
--                         Qt::DirectConnection);
-+                         Qt::QueuedConnection);
-     }
- #endif
- }
-@@ -163,7 +167,8 @@ void QHttpNetworkConnectionChannel::close()
-     else
-         state = QHttpNetworkConnectionChannel::ClosingState;
-
--    socket->close();
-+    if (socket)
-+        socket->close();
- }
-
-
-@@ -280,6 +285,14 @@ bool QHttpNetworkConnectionChannel::sendRequest()
-                 // nothing to read currently, break the loop
-                 break;
-             } else {
-+                if (written != uploadByteDevice->pos()) {
-+                    // Sanity check. This was useful in tracking down an upload corruption.
-+                    qWarning() << "QHttpProtocolHandler: Internal error in sendRequest. Expected to write at position" << written << "but read device is at" << uploadByteDevice->pos();
-+                    Q_ASSERT(written == uploadByteDevice->pos());
-+                    connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
-+                    return false;
-+                }
-+
-                 qint64 currentWriteSize = socket->write(readPointer, currentReadSize);
-                 if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
-                     // socket broke down
-@@ -639,6 +652,14 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
-         }
-         return false;
-     }
-+
-+    // This code path for ConnectedState
-+    if (pendingEncrypt) {
-+        // Let's only be really connected when we have received the encrypted() signal. Else the state machine seems to mess up
-+        // and corrupt the things sent to the server.
-+        return false;
-+    }
-+
-     return true;
- }
-
-@@ -980,6 +1001,13 @@ void QHttpNetworkConnectionChannel::_q_readyRead()
- void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
- {
-     Q_UNUSED(bytes);
-+
-+    if (ssl) {
-+        // In the SSL case we want to send data from encryptedBytesWritten signal since that one
-+        // is the one going down to the actual network, not only into some SSL buffer.
-+        return;
-+    }
-+
-     // bytes have been written to the socket. write even more of them :)
-     if (isSocketWriting())
-         sendRequest();
-@@ -1029,7 +1057,7 @@ void QHttpNetworkConnectionChannel::_q_connected()
-
-     // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
-     //channels[i].reconnectAttempts = 2;
--    if (!pendingEncrypt) {
-+    if (!pendingEncrypt && !ssl) { // FIXME: Didn't work properly with pendingEncrypt only, we should refactor this into an EncrypingState
-         state = QHttpNetworkConnectionChannel::IdleState;
-         if (!reply)
-             connection->d_func()->dequeueRequest(socket);
-@@ -1157,7 +1185,10 @@ void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetwor
-
- void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
- {
--    sendRequest();
-+    if (reply && state == QHttpNetworkConnectionChannel::WritingState) {
-+        // There might be timing issues, make sure to only send upload data if really in that state
-+        sendRequest();
-+    }
- }
-
- #ifndef QT_NO_OPENSSL
-diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
-index 7648325..9dd0deb 100644
---- a/src/network/access/qhttpthreaddelegate_p.h
-+++ b/src/network/access/qhttpthreaddelegate_p.h
-@@ -190,6 +190,7 @@ protected:
-     QByteArray m_dataArray;
-     bool m_atEnd;
-     qint64 m_size;
-+    qint64 m_pos; // to match calls of haveDataSlot with the expected position
- public:
-     QNonContiguousByteDeviceThreadForwardImpl(bool aE, qint64 s)
-         : QNonContiguousByteDevice(),
-@@ -197,7 +198,8 @@ public:
-           m_amount(0),
-           m_data(0),
-           m_atEnd(aE),
--          m_size(s)
-+          m_size(s),
-+          m_pos(0)
-     {
-     }
-
-@@ -205,6 +207,11 @@ public:
-     {
-     }
-
-+    qint64 pos()
-+    {
-+        return m_pos;
-+    }
-+
-     const char* readPointer(qint64 maximumLength, qint64 &len)
-     {
-         if (m_amount > 0) {
-@@ -232,11 +239,10 @@ public:
-
-         m_amount -= a;
-         m_data += a;
-+        m_pos += a;
-
--        // To main thread to inform about our state
--        emit processedData(a);
--
--        // FIXME possible optimization, already ask user thread for some data
-+        // To main thread to inform about our state. The m_pos will be sent as a sanity check.
-+        emit processedData(m_pos, a);
-
-         return true;
-     }
-@@ -253,10 +259,21 @@ public:
-     {
-         m_amount = 0;
-         m_data = 0;
-+        m_dataArray.clear();
-+
-+        if (wantDataPending) {
-+            // had requested the user thread to send some data (only 1 in-flight at any moment)
-+            wantDataPending = false;
-+        }
-
-         // Communicate as BlockingQueuedConnection
-         bool b = false;
-         emit resetData(&b);
-+        if (b) {
-+            // the reset succeeded, we're at pos 0 again
-+            m_pos = 0;
-+            // the HTTP code will anyway abort the request if !b.
-+        }
-         return b;
-     }
-
-@@ -267,8 +284,13 @@ public:
-
- public slots:
-     // From user thread:
--    void haveDataSlot(QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
-+    void haveDataSlot(qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
-     {
-+        if (pos != m_pos) {
-+            // Sometimes when re-sending a request in the qhttpnetwork* layer there is a pending haveData from the
-+            // user thread on the way to us. We need to ignore it since it is the data for the wrong(later) chunk.
-+            return;
-+        }
-         wantDataPending = false;
-
-         m_dataArray = dataArray;
-@@ -288,7 +310,7 @@ signals:
-
-     // to main thread:
-     void wantData(qint64);
--    void processedData(qint64);
-+    void processedData(qint64 pos, qint64 amount);
-     void resetData(bool *b);
- };
-
-diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
-index cc67258..fe2f627 100644
---- a/src/network/access/qnetworkaccesshttpbackend.cpp
-+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
-@@ -193,6 +193,7 @@ QNetworkAccessHttpBackendFactory::create(QNetworkAccessManager::Operation op,
- QNetworkAccessHttpBackend::QNetworkAccessHttpBackend()
-     : QNetworkAccessBackend()
-     , statusCode(0)
-+    , uploadByteDevicePosition(false)
-     , pendingDownloadDataEmissions(new QAtomicInt())
-     , pendingDownloadProgressEmissions(new QAtomicInt())
-     , loadingFromCache(false)
-@@ -610,9 +611,9 @@ void QNetworkAccessHttpBackend::postRequest()
-             forwardUploadDevice->setParent(delegate); // needed to make sure it is moved on moveToThread()
-             delegate->httpRequest.setUploadByteDevice(forwardUploadDevice);
-
--            // From main thread to user thread:
--            QObject::connect(this, SIGNAL(haveUploadData(QByteArray, bool, qint64)),
--                             forwardUploadDevice, SLOT(haveDataSlot(QByteArray, bool, qint64)), Qt::QueuedConnection);
-+            // From user thread to http thread:
-+            QObject::connect(this, SIGNAL(haveUploadData(qint64,QByteArray,bool,qint64)),
-+                forwardUploadDevice, SLOT(haveDataSlot(qint64,QByteArray,bool,qint64)), Qt::QueuedConnection);
-             QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()),
-                              forwardUploadDevice, SIGNAL(readyRead()),
-                              Qt::QueuedConnection);
-@@ -620,8 +621,8 @@ void QNetworkAccessHttpBackend::postRequest()
-             // From http thread to user thread:
-             QObject::connect(forwardUploadDevice, SIGNAL(wantData(qint64)),
-                              this, SLOT(wantUploadDataSlot(qint64)));
--            QObject::connect(forwardUploadDevice, SIGNAL(processedData(qint64)),
--                             this, SLOT(sentUploadDataSlot(qint64)));
-+            QObject::connect(forwardUploadDevice,SIGNAL(processedData(qint64, qint64)),
-+                             this, SLOT(sentUploadDataSlot(qint64,qint64)));
-             connect(forwardUploadDevice, SIGNAL(resetData(bool*)),
-                     this, SLOT(resetUploadDataSlot(bool*)),
-                     Qt::BlockingQueuedConnection); // this is the only one with BlockingQueued!
-@@ -915,12 +916,21 @@ void QNetworkAccessHttpBackend::replySslConfigurationChanged(const QSslConfigura
- void QNetworkAccessHttpBackend::resetUploadDataSlot(bool *r)
- {
-     *r = uploadByteDevice->reset();
-+    if (*r) {
-+        // reset our own position which is used for the inter-thread communication
-+        uploadByteDevicePosition = 0;
-+    }
- }
-
- // Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
--void QNetworkAccessHttpBackend::sentUploadDataSlot(qint64 amount)
-+void QNetworkAccessHttpBackend::sentUploadDataSlot(qint64 pos, qint64 amount)
- {
-+    if (uploadByteDevicePosition + amount != pos) {
-+        // Sanity check, should not happen.
-+        error(QNetworkReply::UnknownNetworkError, "");
-+    }
-     uploadByteDevice->advanceReadPointer(amount);
-+    uploadByteDevicePosition += amount;
- }
-
- // Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
-@@ -933,7 +943,7 @@ void QNetworkAccessHttpBackend::wantUploadDataSlot(qint64 maxSize)
-     QByteArray dataArray(data, currentUploadDataLength);
-
-     // Communicate back to HTTP thread
--    emit haveUploadData(dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
-+    emit haveUploadData(uploadByteDevicePosition, dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
- }
-
- /*
-diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
-index 13519c6..b4ed67c 100644
---- a/src/network/access/qnetworkaccesshttpbackend_p.h
-+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
-@@ -112,7 +112,7 @@ signals:
-
-     void startHttpRequestSynchronously();
-
--    void haveUploadData(QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
-+    void haveUploadData(const qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
- private slots:
-     // From HTTP thread:
-     void replyDownloadData(QByteArray);
-@@ -129,13 +129,14 @@ private slots:
-     // From QNonContiguousByteDeviceThreadForwardImpl in HTTP thread:
-     void resetUploadDataSlot(bool *r);
-     void wantUploadDataSlot(qint64);
--    void sentUploadDataSlot(qint64);
-+    void sentUploadDataSlot(qint64, qint64);
-
-     bool sendCacheContents(const QNetworkCacheMetaData &metaData);
-
- private:
-     QHttpNetworkRequest httpRequest; // There is also a copy in the HTTP thread
-     int statusCode;
-+    qint64 uploadByteDevicePosition;
-     QString reasonPhrase;
-     // Will be increased by HTTP thread:
-     QSharedPointer<QAtomicInt> pendingDownloadDataEmissions;
-

diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
deleted file mode 100644
index c9a3c5e433b..00000000000
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	~dev-qt/qttranslations-${PV}
-	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/qt4/Qt/qconfig.h
-	/usr/include/qt4/QtCore/qconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.6-QNAM-corruptions-fix.patch" # bug 548622
-	"${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/uic
-	src/corelib
-	src/network
-	src/xml
-	src/plugins/codecs/cn
-	src/plugins/codecs/jp
-	src/plugins/codecs/kr
-	src/plugins/codecs/tw
-	tools/linguist/lconvert
-	tools/linguist/lrelease
-	tools/linguist/lupdate"
-
-QCONFIG_DEFINE="QT_ZLIB"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
-
-	# bug 427782
-	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
-	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
-		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
-		configure || die "sed configure setBootstrapVariable failed"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use icu)
-		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		$(qt_use qt3support)
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index a897f1af9c2..90ba6110935 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
deleted file mode 100644
index 9118a50333c..00000000000
--- a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/dbus
-	tools/qdbus/qdbus
-	tools/qdbus/qdbusxml2cpp
-	tools/qdbus/qdbuscpp2xml"
-
-QCONFIG_ADD="dbus dbus-linked"
-QCONFIG_DEFINE="QT_DBUS"
-
-multilib_src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index bb1af78bcad..32d2ab2f7fe 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtdeclarative-opensource-src-5.6.2.tar.xz 18813016 SHA256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da SHA512 30870f6c40b8c8ecd3b960ece8175f98a42aebc3f4fcada06b4dcc0f844c4acfd955d550d7014fb441f65d7010ced8a6ef394ec3887dc543306b5ef15570c88d WHIRLPOOL ef4ae3f6cebd44528917bd571b1eaa55d07b96f3b005e25eb201ef52477a6dff742fe85b30f491793ea8256489349780adb79a93ccb7d64e1787a7d5d388041e
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 SHA256 fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab WHIRLPOOL 36fdf7de44aaef1b5f6a6b7719705422cc4593da1a79e156a797bc86389f96b0bd5658b00ebc7177ecb2e5e17c3beead4205ccb7fb0d0eb2ec8679c5a58ae6fa

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
deleted file mode 100644
index fcc4f19abff..00000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/declarative
-	src/imports
-	src/plugins/qmltooling
-	tools/qml
-	tools/qmlplugindump"
-
-QCONFIG_ADD="declarative"
-QCONFIG_DEFINE="QT_DECLARATIVE"
-
-pkg_setup() {
-	use webkit && QT4_TARGET_DIRECTORIES+="
-		src/3rdparty/webkit/Source/WebKit/qt/declarative"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-declarative -no-gtkstyle
-		$(qt_use accessibility)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index 1bd4b07babd..0dfe1cd5b56 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -1,2 +1 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
deleted file mode 100644
index a49456b792d..00000000000
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="arm ppc ppc64"
-else
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	phonon? ( media-libs/phonon[qt4] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	demos
-	examples"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'phonon:mediaplayer'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	# Remove bogus dependency on qt3support (bug 510042)
-	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
-		examples/graphicsview/graphicsview.pro || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia) -no-audio-backend
-		$(qt_use opengl)
-		-no-openvg
-		$(qt_native_use phonon) -no-phonon-backend
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index ca99b2dc670..f5259bbe8e8 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
deleted file mode 100644
index 3ac87d8dc36..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore" <rich@×××.org>
-Date: Tue, 24 Feb 2015 19:02:35 +0000
-Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
-
-This fixes a division by 0 when processing a maliciously crafted BMP
-file. No impact beyond DoS.
-
-Backport of 661f6bfd032dacc62841037732816a583640e187
-
-Task-number: QTBUG-44547
-Change-Id: I43f06e752b11cb50669101460902a82b885ae618
-Reviewed-by: Thiago Macieira <thiago.macieira@×××××.com>
----
- src/gui/image/qbmphandler.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index b22e842..30fa9e0 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
--- 
-2.0.5
\ No newline at end of file

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch b/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
deleted file mode 100644
index a54efef0d78..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0db65e148dcb4d5e5b98475f207d41a287c401a1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-Date: Wed, 28 May 2014 00:22:55 -0400
-Subject: [PATCH] Cleanlooks style: Fix floating point exception
-
-In QCleanlooksStyle::drawControl, if indeterminate == true and
-rect.width() == 4, we will end up with slideWidth of zero, and
-take a mod by zero when calculating the value of step.
-
-This causes a crash in Quassel 0.10; see
-https://bugs.gentoo.org/show_bug.cgi?id=507124
-
-Instead, calculate slideWidth based on max(width, minWidth) where
-minWidth was already set as 4, ensuring that slideWidth >= 2.
-
-Change-Id: I6678789105e359fa26c99409f449cad0ba3bd0ae
-(cherry picked from qtstyleplugins/8ff2ac6035fb1d01f5c0054ba14afb949410e3a7)
-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@××××.com>
----
- src/gui/styles/qcleanlooksstyle.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
-index 504734a..3f665ca 100644
---- a/src/gui/styles/qcleanlooksstyle.cpp
-+++ b/src/gui/styles/qcleanlooksstyle.cpp
-@@ -1773,7 +1773,7 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o
-                 }
-             } else {
-                 Q_D(const QCleanlooksStyle);
--                int slideWidth = ((rect.width() - 4) * 2) / 3;
-+                int slideWidth = (qMax(rect.width() - 4, minWidth) * 2) / 3;
-                 int step = ((d->animateStep * slideWidth) / d->animationFps) % slideWidth;
-                 if ((((d->animateStep * slideWidth) / d->animationFps) % (2 * slideWidth)) >= slideWidth)
-                     step = slideWidth - step;
--- 
-2.0.0
-

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch b/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
deleted file mode 100644
index d800caf9742..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
-From: Lars Knoll <lars.knoll@×××××.com>
-Date: Thu, 24 Apr 2014 15:33:27 +0200
-Subject: Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-Reviewed-by: Richard J. Moore <rich@×××.org>
----
- src/gui/image/qgifhandler.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 3324f04..5199dd3 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
-                     memset(bits, 0, image->byteCount());
-                 }
- 
-+                // Check if the previous attempt to create the image failed. If it
-+                // did then the image is broken and we should give up.
-+                if (image->isNull()) {
-+                    state = Error;
-+                    return -1;
-+                }
-+
-                 disposePrevious(image);
-                 disposed = false;
- 
--- 
-1.9.3
-

diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch b/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch
deleted file mode 100644
index c1aac444a64..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3e55cd6dc467303a3c35312e9fcb255c2c048b32 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@××××××××××××.com>
-Date: Wed, 11 Mar 2015 13:34:01 +0100
-Subject: Fixes crash in bmp and ico image decoding
-
-Fuzzing test revealed that for certain malformed bmp and ico files,
-the handler would segfault.
-
-Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
-(cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078)
-Reviewed-by: Richard J. Moore <rich@×××.org>
----
- src/gui/image/qbmphandler.cpp                | 13 +++++++------
- src/plugins/imageformats/ico/qicohandler.cpp |  2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index 30fa9e0..17a880b 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                             p = data + (h-y-1)*bpl;
-                             break;
-                         case 2:                        // delta (jump)
--                            // Protection
--                            if ((uint)x >= (uint)w)
--                                x = w-1;
--                            if ((uint)y >= (uint)h)
--                                y = h-1;
--
-                             {
-                                 quint8 tmp;
-                                 d->getChar((char *)&tmp);
-@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                                 d->getChar((char *)&tmp);
-                                 y += tmp;
-                             }
-+
-+                            // Protection
-+                            if ((uint)x >= (uint)w)
-+                                x = w-1;
-+                            if ((uint)y >= (uint)h)
-+                                y = h-1;
-+
-                             p = data + (h-y-1)*bpl + x;
-                             break;
-                         default:                // absolute mode
-diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
-index 1a88605..3c34765 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index)
-                 QImage::Format format = QImage::Format_ARGB32;
-                 if (icoAttrib.nbits == 24)
-                     format = QImage::Format_RGB32;
--                else if (icoAttrib.ncolors == 2)
-+                else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
-                     format = QImage::Format_Mono;
-                 else if (icoAttrib.ncolors > 0)
-                     format = QImage::Format_Indexed8;
--- 
-cgit v0.11.0
-

diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch
deleted file mode 100644
index d881db8d5b8..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a1cf194c54be57d6ab55dfd26b9562a60532208e Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@××××××××××××.com>
-Date: Wed, 11 Mar 2015 09:00:41 +0100
-Subject: Fixes crash in gif image decoder
-
-Fuzzing test revealed that for certain malformed gif files,
-qgifhandler would segfault.
-
-Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
-(cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6)
-Reviewed-by: Richard J. Moore <rich@×××.org>
----
- src/gui/image/qgifhandler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 5199dd3..49aa2a6 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -944,6 +944,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
- 
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+    if (out_of_bounds)
-+        return;
-     int my;
-     switch (interlace) {
-     case 0: // Non-interlaced
--- 
-cgit v0.11.0
-

diff --git a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
deleted file mode 100644
index 2eccb9dcdeb..00000000000
--- a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
-	gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
-	app-eselect/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-	!aqua? (
-		>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	gtkstyle? (
-		>=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
-	)
-	mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? (
-		>=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
-	)
-"
-PDEPEND="
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
-	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
-	"${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
-	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
-	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
-	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
-	"${FILESDIR}/${PN}-4.8.6-CVE-2015-1858.patch" # bug 546174 - also covers CVE-2015-1859
-	"${FILESDIR}/${PN}-4.8.6-CVE-2015-1860.patch" # bug 546174
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/gui
-	src/scripttools
-	src/plugins/imageformats/gif
-	src/plugins/imageformats/ico
-	src/plugins/imageformats/jpeg
-	src/plugins/imageformats/tga
-	src/plugins/inputmethods"
-
-pkg_setup() {
-	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
-	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	QCONFIG_ADD="
-		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
-		fontconfig system-freetype gif png system-png jpeg system-jpeg
-		$(usev accessibility)
-		$(usev cups)
-		$(use mng && echo system-mng)
-		$(usev nas)
-		$(usev nis)
-		$(use tiff && echo system-tiff)
-		$(usev xinerama)
-		$(use xv && echo xvideo)"
-	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS)
-			$(use egl && echo QT_EGL)
-			QT_FONTCONFIG QT_FREETYPE
-			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS)
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
-			$(use xinerama && echo QT_XINERAMA)
-			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
-			$(use xv && echo QT_XVIDEO)"
-}
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nas nas-sound system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)
-		$(qt_use xv xvideo)
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
-		newicon tools/qtconfig/images/appicon.png qtconfig.png
-		make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-	fi
-}
-
-pkg_postinst() {
-	qt4-build-multilib_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 70b69cd2f15..5f0486f68e6 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,6 +1,5 @@
 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2

diff --git a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
deleted file mode 100644
index 57df24957a0..00000000000
--- a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
-	compat? (
-		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-		https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
-	)"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
-	compat? (
-		~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	tools/assistant/lib/fulltextsearch
-	tools/assistant/lib
-	tools/assistant/tools/qhelpgenerator
-	tools/assistant/tools/qcollectiongenerator
-	tools/assistant/tools/qhelpconverter
-	tools/qdoc3"
-
-pkg_setup() {
-	use compat && QT4_TARGET_DIRECTORIES+="
-		tools/assistant/compat
-		tools/assistant/compat/lib"
-}
-
-src_unpack() {
-	qt4-build-multilib_src_unpack
-
-	# compat version
-	# http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-	if use compat; then
-		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
-		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
-		find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die
-	fi
-}
-
-src_prepare() {
-	use compat && PATCHES+=(
-		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
-		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
-	)
-
-	qt4-build-multilib_src_prepare
-
-	# prevent rebuild of QtCore and QtXml (bug 348034)
-	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-cups -no-nis -fontconfig
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_compile() {
-	qt4_multilib_src_compile
-
-	# release tarballs are shipped with prebuilt docs
-	if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
-		# qhelpgenerator needs libQtHelp.so.4
-		export LD_LIBRARY_PATH=${BUILD_DIR}/lib
-		export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
-		emake docs
-	fi
-}
-
-multilib_src_install() {
-	qt4_multilib_src_install
-
-	if multilib_is_native_abi; then
-		emake INSTALL_ROOT="${D}" install_qchdocs
-		use doc && emake INSTALL_ROOT="${D}" install_htmldocs
-
-		# do not compress .qch files
-		docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
-	fi
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	if use compat; then
-		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
-		doins tools/assistant/compat/features/assistant.prf
-	fi
-}

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 9533dbc8620..ad4aa248a30 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtmultimedia-opensource-src-5.6.2.tar.xz 3492628 SHA256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf SHA512 e4750b1033f4ffbc139c14475fa07019bbb51a373d72a608035da583e88979fc7cc8694be90661c3977f6a1e0be2c27a98b348a632f62b2d40c224af927f9ccc WHIRLPOOL 1a9872996146371e4bf7d877c18a829986db63fca3ce57b250d9282d884a1479a7309b981c29c7bfedd4d965c5b76e94cafd11ea9c0e3c1d07852ebabb58365d
 DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 SHA256 a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f WHIRLPOOL 6d37e06443b6e6d3d55e35ccebe08bc2a7a4423afe3728db5b297f15e682af31f6085ab2ebf92f63d4bff4ec69b772b6e545149b260245d3d076d4c619b8d46f

diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
deleted file mode 100644
index 8edcfefe89b..00000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
-fi
-
-IUSE="alsa"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
-	"${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426
-)
-
-QT4_TARGET_DIRECTORIES="src/multimedia"
-
-QCONFIG_ADD="multimedia"
-QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-multilib_src_configure() {
-	local myconf=(
-		-multimedia -audio-backend
-		$(qt_use alsa)
-		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
-		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index a897f1af9c2..90ba6110935 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
deleted file mode 100644
index c0e3a77f51b..00000000000
--- a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="egl qt3support"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/opengl
-	src/plugins/graphicssystems/opengl"
-
-QCONFIG_ADD="opengl"
-QCONFIG_DEFINE="QT_OPENGL"
-
-multilib_src_configure() {
-	local myconf=(
-		-opengl
-		$(qt_use qt3support)
-		$(qt_use egl)
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir /usr/share/qt4/graphicssystems
-	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}

diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 951fd36eaf6..859671bdca2 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtscript-opensource-src-5.6.2.tar.xz 2587484 SHA256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e SHA512 3636b214f0573e471a1e44cf33097adcd104df7b74e5abedbc75fd9c44e804bb47172b6ab4c41513e8162e27850bf64067ca11196396b60c3bd2c968e15d3113 WHIRLPOOL 1375ddaac79ef2a99a0193696a64f3c16d03c404231ed641a45692e4be8cf26d65b9c199cf73fb8b2152486355ca8279b64d723b94dbb504fc585011c969c795
 DIST qtscript-opensource-src-5.7.1.tar.xz 2608180 SHA256 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 SHA512 6bde4add16745475d42c0fda0d3451a77717b14dca12b40a4e3cebc9e2b6edb04da23ebf9af46010135066524dd8ea0453a07420cf42228fd7ed5249b633a95c WHIRLPOOL 971db46b5f469a123e2727318017f42726db53251d5637e0804ce35905d1006322681362fe0f1d8f92f15f2f5f88e9a85862374a97256fe797223d2cabc55636

diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
deleted file mode 100644
index 4521eb08bb4..00000000000
--- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtScript module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+jit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script"
-
-QCONFIG_ADD="script"
-QCONFIG_DEFINE="QT_SCRIPT"
-
-PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use jit javascript-jit)
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
-		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
-		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-		-no-gtkstyle
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index a897f1af9c2..90ba6110935 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
deleted file mode 100644
index 6df25c2d59c..00000000000
--- a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib qt4-build-multilib
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	freetds? ( dev-db/freetds )
-	mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
-	odbc? ( || (
-		>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
-		>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
-	) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/sql
-	src/plugins/sqldrivers"
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_native_use freetds  sql-tds    plugin)
-		$(qt_use        mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-		$(qt_use        oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-		$(qt_use        odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(qt_native_use postgres sql-psql   plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
-		$(qt_use        sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
-		-no-sql-db2
-		-no-sql-ibase
-		-no-sql-sqlite2
-		-no-sql-symsql
-		$(qt_use qt3support)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		-no-glib
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 4904408ed46..4928652a827 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtsvg-opensource-src-5.6.2.tar.xz 1723056 SHA256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e SHA512 ff78a75d0452de56dfe5b33f64d611c9e75e1a46c2ca168f9d3467ef3bb32f17ef256b45df275ed45bc2215d31dbf321d9cacb3f428096354041481276683958 WHIRLPOOL 12079ed91289cd8096b3119de8d936e3be4f5997754c4274791b0325874db837ea8427503e5d39d9ed68a63bf12ac3ad64d81aaea5a82312013fc062346c2f1e
 DIST qtsvg-opensource-src-5.7.1.tar.xz 1751536 SHA256 b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 SHA512 b4ba18a81ddf381f635c608f2ca6f339859b964aedf310fea9b4845d50154b5256759583abe14126e6bb86a9daad8a6e597910ce2036af26ae221b925817e260 WHIRLPOOL 34c018be5a8c8e9d3bec46a1e3680cc8c4d094f0a99336b6245be146feb8a4f76aeb2c752d9af4c597965e25b92f254c9f12709f688eee7b77e2e3785ed5a480

diff --git a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
deleted file mode 100644
index 37af17f620d..00000000000
--- a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/svg
-	src/plugins/imageformats/svg
-	src/plugins/iconengines/svgiconengine"
-
-QCONFIG_ADD="svg"
-QCONFIG_DEFINE="QT_SVG"
-
-multilib_src_configure() {
-	local myconf=(
-		-svg
-		$(qt_use accessibility)
-		-no-xkb  -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-fontconfig -no-glib -no-gtkstyle
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index a897f1af9c2..90ba6110935 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

diff --git a/dev-qt/qttest/qttest-4.8.6-r1.ebuild b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
deleted file mode 100644
index 4d831d92e2b..00000000000
--- a/dev-qt/qttest/qttest-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/testlib"
-
-multilib_src_configure() {
-	local myconf=(
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-		-no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-svg
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 6002d3a0fe5..7bbde784cb1 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttranslations-opensource-src-5.6.2.tar.xz 1204148 SHA256 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421 SHA512 7b2cf7cc1560866a8172ca6478f94b3f737e5b71d60afe1b4dbe302c7f589a42a4156bb886bedc1d9339de7d70e71a28ab96785ba597d050161aac28d16e40a8 WHIRLPOOL e35729644293235e22c1607651ae46e0840d380737a7bba43d958f85ee1e8d8f82842b8124108a64240ecdf5271c9bed2f8ef7d1543ab74457b506316eb015b0
 DIST qttranslations-opensource-src-5.7.1.tar.xz 1206116 SHA256 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 SHA512 8d7705d1fb2569f90bb7fbb9bdfe7ffdbf7a8746ee4da634f66fb7f70c14b91f7257165b6ac041cbe4918b88e6ec344c8e554f1e7339257e7e1b9a06e78ba837 WHIRLPOOL 61486e72f2ff43649e61cda6f8ab98f8c85636f4e96ea6c648dc204fdb998f0a60114faa2a75e7f6b2e5bc45a8ef2205923a62436b11616fb8fe2d2693104d30

diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
deleted file mode 100644
index 2567a4f77fa..00000000000
--- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Translation files for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ~arm64 hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
-
-QT4_TARGET_DIRECTORIES="translations"
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		qt4_prepare_env
-		qt4_symlink_tools_to_build_dir
-		qt4_foreach_target_subdir qt4_qmake
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && qt4_multilib_src_compile
-}
-
-multilib_src_test() {
-	:
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && qt4_multilib_src_install
-}

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 547c7cbac1c..3ddd63c84df 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542
 DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
deleted file mode 100644
index eb73229ec7d..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="arm ia64 ppc ppc64"
-else
-	KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
-	>=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/3rdparty/webkit/Source/JavaScriptCore
-	src/3rdparty/webkit/Source/WebCore
-	src/3rdparty/webkit/Source/WebKit/qt"
-
-QCONFIG_ADD="webkit"
-QCONFIG_DEFINE="QT_WEBKIT"
-
-src_prepare() {
-	# Remove -Werror from CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
-		src/3rdparty/webkit/Source/WebKit.pri || die
-
-	# Fix version number in generated pkgconfig file (bug 406443)
-	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
-		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
-	# Prevent automagic dependency on qt-mobility (bug 547350)
-	sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \
-		src/3rdparty/webkit/Source/WebCore/features.pri || die
-
-	if use icu; then
-		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
-			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-	fi
-
-	qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-webkit
-		-system-sqlite
-		$(qt_use icu)
-		$(qt_use jit javascript-jit)
-		-DENABLE_VIDEO=0
-	)
-	qt4_multilib_src_configure
-}

diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index d83a4ca1c89..cbd89872d04 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,4 +1,3 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtxmlpatterns-opensource-src-5.6.2.tar.xz 1323576 SHA256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc SHA512 780864b839f312143975973b0a63f3d4ad105e8b87f5c71d8fb120c3e249578846e855693cea070510767c6680c2249589f7ad1bcc63488da979f4d8da8910ae WHIRLPOOL fb60edab215e053abd54b978c13e232167782d170db1528c234ccc83882a9bf6690769d037f159b7bdc8c315396a1c91bb2becaa3b329099dd2ea93903cbaf9f
 DIST qtxmlpatterns-opensource-src-5.7.1.tar.xz 1352472 SHA256 a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 SHA512 2acdee1e49a154dd111be6afcb7f765d98fc17c49f79cf08c5fc03cda7e0cab7537e2dd57d976ee13b72c46a577bad2ac8466444ec46b3f14130f71756ac63a2 WHIRLPOOL 9d240d03ecbc1a68803e60cff49680bbac31054fca9a283b0f54aebae551bff7420ca6b648b6904d96b4315994232fbfe1a819b14f3a8d8a402dddecc762cbcd

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
deleted file mode 100644
index ebe8fba7a3f..00000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/xmlpatterns
-	tools/xmlpatterns
-	tools/xmlpatternsvalidator"
-
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-multilib_src_configure() {
-	local myconf=(
-		-xmlpatterns
-	)
-	qt4_multilib_src_configure
-}