public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbearer/, dev-qt/linguist-tools/, dev-qt/qtnetwork/, dev-qt/qdbusviewer/, ...
@ 2017-10-30 23:33 Andreas Sturmlechner
  0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2017-10-30 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     8981c67d9d80acc30c10c36c7b432c07937e3b78
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 21:41:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 23:31:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8981c67d

dev-qt: Drop Qt 5.6.2, de-stabilise hppa

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

 dev-qt/assistant/Manifest                          |   1 -
 dev-qt/assistant/assistant-5.6.2.ebuild            |  37 -----
 dev-qt/designer/Manifest                           |   1 -
 dev-qt/designer/designer-5.6.2.ebuild              |  40 -----
 dev-qt/linguist-tools/Manifest                     |   1 -
 dev-qt/linguist-tools/linguist-tools-5.6.2.ebuild  |  35 -----
 dev-qt/linguist/Manifest                           |   1 -
 dev-qt/linguist/linguist-5.6.2.ebuild              |  28 ----
 dev-qt/pixeltool/Manifest                          |   1 -
 dev-qt/pixeltool/pixeltool-5.6.2.ebuild            |  26 ---
 dev-qt/qdbus/Manifest                              |   1 -
 dev-qt/qdbus/qdbus-5.6.2.ebuild                    |  25 ---
 dev-qt/qdbusviewer/Manifest                        |   1 -
 dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild        |   2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild        |  27 ----
 dev-qt/qdoc/Manifest                               |   1 -
 dev-qt/qdoc/qdoc-5.6.2.ebuild                      |  24 ---
 dev-qt/qt-docs/Manifest                            |   1 -
 dev-qt/qt-docs/qt-docs-5.6.2_p0-r1.ebuild          |  33 ----
 dev-qt/qt3support/qt3support-4.8.7.ebuild          |   2 +-
 dev-qt/qtbearer/qtbearer-4.8.7.ebuild              |   2 +-
 dev-qt/qtbluetooth/Manifest                        |   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.6.2.ebuild        |  33 ----
 dev-qt/qtchooser/qtchooser-0_p20151008.ebuild      |   2 +-
 dev-qt/qtconcurrent/Manifest                       |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.6.2.ebuild      |  23 ---
 dev-qt/qtcore/Manifest                             |   1 -
 dev-qt/qtcore/qtcore-4.8.7-r2.ebuild               |   2 +-
 dev-qt/qtcore/qtcore-5.6.2-r1.ebuild               |  42 -----
 dev-qt/qtdbus/Manifest                             |   1 -
 dev-qt/qtdbus/qtdbus-4.8.7.ebuild                  |   2 +-
 dev-qt/qtdbus/qtdbus-5.6.2.ebuild                  |  38 -----
 dev-qt/qtdeclarative/Manifest                      |   1 -
 dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild    |   2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild    |  53 -------
 dev-qt/qtdiag/Manifest                             |   1 -
 dev-qt/qtdiag/qtdiag-5.6.2.ebuild                  |  25 ---
 dev-qt/qtgraphicaleffects/Manifest                 |   1 -
 .../qtgraphicaleffects-5.6.2.ebuild                |  21 ---
 dev-qt/qtgui/Manifest                              |   1 -
 dev-qt/qtgui/qtgui-4.8.7.ebuild                    |   2 +-
 dev-qt/qtgui/qtgui-5.6.2.ebuild                    | 174 ---------------------
 dev-qt/qthelp/Manifest                             |   1 -
 dev-qt/qthelp/qthelp-5.6.2.ebuild                  |  31 ----
 dev-qt/qtimageformats/Manifest                     |   1 -
 dev-qt/qtimageformats/qtimageformats-5.6.2.ebuild  |  23 ---
 dev-qt/qtlocation/Manifest                         |   1 -
 dev-qt/qtlocation/qtlocation-5.6.2.ebuild          |  29 ----
 .../qtlockedfile-2.4.1_p20150629.ebuild            |   2 +-
 dev-qt/qtmultimedia/Manifest                       |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild      |  68 --------
 dev-qt/qtnetwork/Manifest                          |   1 -
 dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild            |  53 -------
 dev-qt/qtopengl/Manifest                           |   1 -
 dev-qt/qtopengl/qtopengl-4.8.7.ebuild              |   2 +-
 dev-qt/qtopengl/qtopengl-5.6.2.ebuild              |  34 ----
 dev-qt/qtpaths/Manifest                            |   1 -
 dev-qt/qtpaths/qtpaths-5.6.2.ebuild                |  23 ---
 dev-qt/qtplugininfo/Manifest                       |   1 -
 dev-qt/qtplugininfo/qtplugininfo-5.6.2.ebuild      |  23 ---
 dev-qt/qtpositioning/Manifest                      |   1 -
 dev-qt/qtpositioning/qtpositioning-5.6.2.ebuild    |  34 ----
 dev-qt/qtprintsupport/Manifest                     |   1 -
 dev-qt/qtprintsupport/qtprintsupport-5.6.2.ebuild  |  42 -----
 dev-qt/qtquickcontrols/Manifest                    |   1 -
 .../qtquickcontrols/qtquickcontrols-5.6.2.ebuild   |  32 ----
 dev-qt/qtscript/Manifest                           |   1 -
 dev-qt/qtscript/qtscript-4.8.7.ebuild              |   2 +-
 dev-qt/qtscript/qtscript-5.6.2.ebuild              |  36 -----
 dev-qt/qtsensors/Manifest                          |   1 -
 dev-qt/qtsensors/qtsensors-5.6.2.ebuild            |  26 ---
 dev-qt/qtserialport/Manifest                       |   1 -
 dev-qt/qtserialport/qtserialport-5.6.2.ebuild      |  27 ----
 .../qtsingleapplication-2.6.1_p20150629.ebuild     |   4 +-
 dev-qt/qtsql/Manifest                              |   1 -
 dev-qt/qtsql/qtsql-4.8.7-r1.ebuild                 |   2 +-
 dev-qt/qtsql/qtsql-5.6.2.ebuild                    |  53 -------
 dev-qt/qtsvg/Manifest                              |   1 -
 dev-qt/qtsvg/qtsvg-4.8.7.ebuild                    |   2 +-
 dev-qt/qtsvg/qtsvg-5.6.2.ebuild                    |  23 ---
 dev-qt/qttest/Manifest                             |   1 -
 dev-qt/qttest/qttest-4.8.7.ebuild                  |   2 +-
 dev-qt/qttest/qttest-5.6.2.ebuild                  |  29 ----
 dev-qt/qttranslations/Manifest                     |   1 -
 dev-qt/qttranslations/qttranslations-4.8.7.ebuild  |   2 +-
 dev-qt/qttranslations/qttranslations-5.6.2.ebuild  |  19 ---
 dev-qt/qtwayland/Manifest                          |   1 -
 dev-qt/qtwayland/metadata.xml                      |   2 -
 dev-qt/qtwayland/qtwayland-5.6.2.ebuild            |  40 -----
 dev-qt/qtwebchannel/Manifest                       |   1 -
 dev-qt/qtwebchannel/qtwebchannel-5.6.2.ebuild      |  26 ---
 dev-qt/qtwebengine/Manifest                        |   1 -
 dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild     | 105 -------------
 dev-qt/qtwebkit/Manifest                           |   1 -
 dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild              | 109 -------------
 dev-qt/qtwebsockets/Manifest                       |   1 -
 dev-qt/qtwebsockets/qtwebsockets-5.6.2.ebuild      |  27 ----
 dev-qt/qtwidgets/Manifest                          |   1 -
 dev-qt/qtwidgets/metadata.xml                      |   2 -
 dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild            |  42 -----
 dev-qt/qtx11extras/Manifest                        |   1 -
 dev-qt/qtx11extras/qtx11extras-5.6.2.ebuild        |  21 ---
 dev-qt/qtxml/Manifest                              |   1 -
 dev-qt/qtxml/qtxml-5.6.2.ebuild                    |  25 ---
 dev-qt/qtxmlpatterns/Manifest                      |   1 -
 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild    |   2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.2.ebuild    |  19 ---
 107 files changed, 18 insertions(+), 1769 deletions(-)

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index bd9b15d8696..3adc94f1805 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/assistant/assistant-5.6.2.ebuild b/dev-qt/assistant/assistant-5.6.2.ebuild
deleted file mode 100644
index bce9b243bcd..00000000000
--- a/dev-qt/assistant/assistant-5.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( ~dev-qt/qtwebkit-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index bd9b15d8696..3adc94f1805 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/designer/designer-5.6.2.ebuild b/dev-qt/designer/designer-5.6.2.ebuild
deleted file mode 100644
index b53dae3874c..00000000000
--- a/dev-qt/designer/designer-5.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( ~dev-qt/qtwebkit-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/linguist-tools/linguist-tools-5.6.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.6.2.ebuild
deleted file mode 100644
index 3bb4a706ec0..00000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index bd9b15d8696..3adc94f1805 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/linguist/linguist-5.6.2.ebuild b/dev-qt/linguist/linguist-5.6.2.ebuild
deleted file mode 100644
index 5d0a245275e..00000000000
--- a/dev-qt/linguist/linguist-5.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)

diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index bd9b15d8696..3adc94f1805 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/pixeltool/pixeltool-5.6.2.ebuild b/dev-qt/pixeltool/pixeltool-5.6.2.ebuild
deleted file mode 100644
index 850d216dc4e..00000000000
--- a/dev-qt/pixeltool/pixeltool-5.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)

diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qdbus/qdbus-5.6.2.ebuild b/dev-qt/qdbus/qdbus-5.6.2.ebuild
deleted file mode 100644
index 0f286db0212..00000000000
--- a/dev-qt/qdbus/qdbus-5.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)

diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index bd9b15d8696..3adc94f1805 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
index 5a0ad0e6e7b..bf0dafdd0b9 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild
deleted file mode 100644
index b11f62f376d..00000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)

diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qdoc/qdoc-5.6.2.ebuild b/dev-qt/qdoc/qdoc-5.6.2.ebuild
deleted file mode 100644
index 6858ea5b4bb..00000000000
--- a/dev-qt/qdoc/qdoc-5.6.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)

diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 260beac7c33..890a92bbbe1 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,3 +1,2 @@
-DIST 5.6.2-0qt-everywhere-documentation-5.6.2.7z 125390155 SHA256 3421b5a2fba1f6e134137e4c9f747303bc2218c46b314dae858499aab850931c SHA512 40026c69e6b2de8f84fc974bc307519016982cafe4006ef3663839c9bcf74f7c28679cf8f4ca5a82bfafc3cb455433fe3360c11a60192d8c6b75a8b1b56e7141 WHIRLPOOL edd591be964208467700c91a02eb345f73f4104820b3f605b8e2d4c2704faccc681320bcfef5bfa70cc084b10cf2ada09d5771b0ac578193fd7eaafe0ee86477
 DIST 5.7.1-0qt-everywhere-documentation-5.7.1.7z 173336041 SHA256 44eb231b5f961a9f11d05648431121bbdaa32ac65e6b563543d147c3b88eec41 SHA512 4fcbfcd29aa48937229d01d47569a5fcd81459b9444058c725bdbac14dd2b9c67c9e04944c74d351f4bca7d972e23c3832ba2dd8e979cc4e9fe677e2d51561e0 WHIRLPOOL 8a6e1857866e43f7f40ed4382e0d5b4f27520404a77f3a014834045117f207bb40a0a81aaa00afa39a4684584499f6957bf739a1f25d06c04019ef21dac1adfd
 DIST 5.9.2-0-201710050733qt-everywhere-documentation.7z 200249125 SHA256 eb6c5ad1cc12c6a921acb458725ae06f0b078857ec72b10c498833ea59f2fac0 SHA512 3cc73bec1a1310923206cbecfe95fe80d28195ae38251d04f07881dbd42ff1223f1353ac34787065ac3e09c4aceca76d2be407558204b8920fba65c04ee0594e WHIRLPOOL 4e1f4c7d0cee30e339aca5795e15af33762850b06bfa7a4da0259bac0425bf631bf622fba6557a77741db160b268f89a18c998020b4c9b4a720e879f5cc9ab7b

diff --git a/dev-qt/qt-docs/qt-docs-5.6.2_p0-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.6.2_p0-r1.ebuild
deleted file mode 100644
index 1a8267444c9..00000000000
--- a/dev-qt/qt-docs/qt-docs-5.6.2_p0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1)$(get_version_component_range 2)
-MY_P=${PV/_p/-}qt-everywhere-documentation-${PV%%_p*}
-
-DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
-HOMEPAGE="https://www.qt.io/"
-SRC_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${MY_P}.7z"
-
-LICENSE="FDL-1.3"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
-
-src_install() {
-	# ${PV} instead of ${PF} is intentional
-	local dest=/usr/share/doc/qt-${PV%%_p*}
-	insinto "${dest}"
-	doins -r *
-	docompress -x "${dest}"
-
-	# these files are not shipped in any other version of qt-docs and collide with qtcore
-	# bug 597026
-	rm -rf "${ED}${dest}"/global || die
-}

diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
index 6dc258487e9..d6794af6893 100644
--- a/dev-qt/qt3support/qt3support-4.8.7.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Qt3Support module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"

diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
index bde97360a22..515b3ccc88c 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The network bearer plugins for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="connman networkmanager"

diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index b34980f63fd..1da68587f59 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,3 +1,2 @@
-DIST qtconnectivity-opensource-src-5.6.2.tar.xz 2639772 SHA256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 SHA512 4cef0afa38679ca11550693ae9bb9ca70835ed129ba7aa3db868a06743d406cdf473173cc55bda7b1171499b58bdc860bc64838ae8d1f2a171c85a2b64756ff1 WHIRLPOOL 62b97e947af738ff80aa62ae1eb954968b520073e126dc8b33d84a105bf3d51397fc8e7f1d4ca3a4c1efa7f090d1105d1fe6abbd4e8a85c0382ef8bda0c4c310
 DIST qtconnectivity-opensource-src-5.7.1.tar.xz 2690688 SHA256 b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 SHA512 3550be2ce365c7eea2adb41b6db63d0867ff1eaae15d6f4d22345bfdd8e4ac9c2f3983e5d3e897d5c4d7d32e466929c2cfdfac0921c0927c3955f021d37d9e61 WHIRLPOOL 18776531aa22a060c73f6b3534060e38a6d5b7acb14834d7a531a22a246389753ce44e8de3dc3be476a21e2ddd6ca38746eee8a7e1e96c6a817f339fe9966051
 DIST qtconnectivity-opensource-src-5.9.2.tar.xz 2723028 SHA256 2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc SHA512 c7a32ca45464670bb461139e48721c80859d2ef2eb5e30b61062578c07dfe1cf9cceb0bfe01304f4661a6b80cc7c2769399e0745a165596440a896bd1e1d0893 WHIRLPOOL 85d1f7313f2721796c2afbc96d185fcbd051ac71edc686bde34feed1c24da8c785958c56bb651f01bd168cf5da6ee7b0a781c637b26bf449043f4369e3e28e87

diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.6.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.6.2.ebuild
deleted file mode 100644
index b4f231364ba..00000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
index d7a5bc9f9af..3dab7213812 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? (

diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 3f9b168e930..c3c337c21f4 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.6.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.6.2.ebuild
deleted file mode 100644
index bce5d29743b..00000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 90ba6110935..d69010f6ecb 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
index 19f8832d310..f5fbbe0bce7 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+glib iconv icu libressl qt3support ssl"

diff --git a/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
deleted file mode 100644
index 8993a7d4bbf..00000000000
--- a/dev-qt/qtcore/qtcore-5.6.2-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=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libpcre-8.38[pcre16,unicode]
-	>=sys-libs/zlib-1.2.5
-	virtual/libiconv
-	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-plugins.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 90ba6110935..d69010f6ecb 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
index 1272e6a85ac..144c5dd6cad 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The DBus module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtdbus/qtdbus-5.6.2.ebuild b/dev-qt/qtdbus/qtdbus-5.6.2.ebuild
deleted file mode 100644
index cf4d351f398..00000000000
--- a/dev-qt/qtdbus/qtdbus-5.6.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 32d2ab2f7fe..b317267943e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtdeclarative-opensource-src-5.9.2.tar.xz 21435732 SHA256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 SHA512 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90 WHIRLPOOL 64b9f7d8c1c7930c3695d7cf24c2f6d61556fd9fb69347e04b5c47c8542fbefce385a436e7c68b0a3ee355c301ea8f5c9316256fbc0ac540a4c2e46acdd9012c

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
index 98bdbce906d..267b79b445b 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Declarative module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility qt3support webkit"

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild
deleted file mode 100644
index 7850c893d8b..00000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="gles2 +jit localstorage +widgets xml"
-
-# qtgui[gles2=] is needed because of bug 504322
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
-	xml? (
-		~dev-qt/qtnetwork-${PV}
-		~dev-qt/qtxmlpatterns-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	use localstorage || sed -i -e '/localstorage/d' \
-		src/imports/imports.pro || die
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt_use_disable_mod xml xmlpatterns \
-		src/imports/imports.pro \
-		tests/auto/quick/quick.pro \
-		tests/auto/quick/examples/examples.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qtdiag/qtdiag-5.6.2.ebuild b/dev-qt/qtdiag/qtdiag-5.6.2.ebuild
deleted file mode 100644
index b1d4835c325..00000000000
--- a/dev-qt/qtdiag/qtdiag-5.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="+ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)

diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 38347000460..ded2c58e708 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,3 +1,2 @@
-DIST qtgraphicaleffects-opensource-src-5.6.2.tar.xz 14751100 SHA256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e SHA512 2d2e9e9c4895bed92d3751038371fe653f40878388956585d058e5a87a32f88a4a41f8cc696d11a661cc845c3224b6f1ffa93adabc5a3d8758acc7297cf09e96 WHIRLPOOL 5056c59c3459fae131e73a545be61544690b847fa6804da6b6885c0bf9dcd564c8bfd696a0dddcb3f6cf4f433123834444f4c88d43a3f6d732874e8ad3fd988a
 DIST qtgraphicaleffects-opensource-src-5.7.1.tar.xz 14486948 SHA256 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 SHA512 2eb5fa078be65fbf1b57aca7106cd77c840aea3f13671445552ea4a5e0c6ff1625e30f58ca4919ea6dd76229931a307a77f172b604a55fc115569c4e446b5a3d WHIRLPOOL 33d2579a11da46a6564f6859f36681aead50ec7b4515f73834076e9c830126025de82f12942854272006de99bd3a5ab57528e363ed5b3ee7d01dc81c39d7bb5c
 DIST qtgraphicaleffects-opensource-src-5.9.2.tar.xz 14480256 SHA256 14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76 SHA512 66464c26c9cc78763fda18898cd9c424bc4c0a5cbffc83d68d388e53327aeb77ae0e3c2c4cea947c3b6b7ec5af7bf5124492fc9642ff3c4ba75b06b9fa3883a4 WHIRLPOOL 065c257cbf7ff22735b365bf53d102bf6437a48aeb3301d9af57dd8ba5e1d9b8bc3051b51b53775c55272d171e6f0ea44f8bcfde1a347245f5ccccfec9653615

diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.6.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.6.2.ebuild
deleted file mode 100644
index c871d4ef865..00000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index f5259bbe8e8..cd5573813d5 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,4 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58

diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index dda69ac8593..cb2eede7312 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -8,7 +8,7 @@ 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} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	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"

diff --git a/dev-qt/qtgui/qtgui-5.6.2.ebuild b/dev-qt/qtgui/qtgui-5.6.2.ebuild
deleted file mode 100644
index da1e04dd3df..00000000000
--- a/dev-qt/qtgui/qtgui-5.6.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
-	ibus jpeg libinput +png tslib tuio +udev +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.0.6:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gtkstyle? (
-		x11-libs/gtk+:2
-		x11-libs/pango
-		!!x11-libs/cairo[qt4]
-	)
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXrender
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	eglfs
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	gtkstyle:gtkstyle:
-	gtkstyle:gtk2:STYLE_GTK
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-	xcb:xrender
-)
-
-src_prepare() {
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-	# avoid automagic dep on qtdbus
-	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
-		src/platformsupport/platformsupport.pro || die
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	# avoid automagic dep on qtnetwork
-	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
-		src/plugins/generic/generic.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		$(qt_use gtkstyle)
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 5f0486f68e6..70dbfeedd7e 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.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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qthelp/qthelp-5.6.2.ebuild b/dev-qt/qthelp/qthelp-5.6.2.ebuild
deleted file mode 100644
index 9ea9b786073..00000000000
--- a/dev-qt/qthelp/qthelp-5.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/clucene
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpconverter
-	src/assistant/qhelpgenerator
-)

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 033da101bb3..095093956a6 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,3 +1,2 @@
-DIST qtimageformats-opensource-src-5.6.2.tar.xz 1909556 SHA256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 SHA512 ef501cb0b6fc7f1a2fb9725d48950e87e847733bb8e296a5630cfa25365307bc5ee574cb7a69cef48b2c7c5b810d6f3363021e4e18eff0951ab0fc38c7b12c96 WHIRLPOOL 8398b30c1ad48d827550cf22d3721079856c492f5a7dde7cdf37ec820c870310398408e95ce13a8ec577f391831560bd44624b07dd798cb2b62da78c00358205
 DIST qtimageformats-opensource-src-5.7.1.tar.xz 2004376 SHA256 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 SHA512 b70fe30b20da8f613f05ae68bf879956341206005d1eff3c34fc279da6b219ff7983d41c2c0c057c85500a2c5826286c63f4c209dc2db84d03848241257be553 WHIRLPOOL b9541ce413e908dea4ac70e62a53cb82b89df4feddd566f479e32ad473b7b320fad0eb8229e97a3d040f826e2513d5ee922b796d16e06b00243b9d96579b103e
 DIST qtimageformats-opensource-src-5.9.2.tar.xz 2093756 SHA256 3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3 SHA512 5f1b93c0e5fffa4c2c063d14c12ad97114a452b16814ca9ac45f00ec36308a09770b3b4d137cb5d19bd3aa3a6f576724084df5d0dad75236d49868af9243c9d2 WHIRLPOOL a1b7aa0925ab8136acdb2ba8c127a1c82b4ccb19a454b82f728099ae25704e3e564822e8fb419a0bb70b39962a271af9d27ca51974d4c33414d5526d793502b5

diff --git a/dev-qt/qtimageformats/qtimageformats-5.6.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.6.2.ebuild
deleted file mode 100644
index e5050f1a3ff..00000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
-	media-libs/libwebp:=
-	media-libs/tiff:0
-"
-RDEPEND="${DEPEND}"

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 484bfc1021d..e35fa53d63c 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,3 +1,2 @@
-DIST qtlocation-opensource-src-5.6.2.tar.xz 3148448 SHA256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a SHA512 10d87e9e546d52fc1813cbe244cb592033758460129854879b0d04600bd2285c2ae499bb131de77bf66b4989b45d14e9e656a30aaeee47628e41b026908ed97e WHIRLPOOL 4c4cb895d3cd5cf2ac6ad385374d0dce6e91a9b6f3f562bff5e2715896d108f9f1a60ff13a5d360238812b34523d50f0ede92211830e2d0eef6ccc5b28d82966
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 SHA256 f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4 WHIRLPOOL be30847a33b1bb356d6725202968e189abf4a5bcdc5c2decf9a7ffc14b2d3875dfde827b41b97bf11c9497ec584f351c567150d84bb93fedeb3cb15ce0ac0075
 DIST qtlocation-opensource-src-5.9.2.tar.xz 5369548 SHA256 c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c SHA512 da2e011d37b1c30395360987d66978c842aae41491ce3201316ebe1acf453fb31626575e3c3d65836aa6ac80e3d4324a613f0245e90598b507a89d13ea241786 WHIRLPOOL 2a2dd20d9fc5ae75e469438587dd1d57b65a5a5e642a6806bc067b0cfa914ef0309a63b37163b0fb349134bb3b6a1fb4785691c1a8d2ef681c624df29a1df67a

diff --git a/dev-qt/qtlocation/qtlocation-5.6.2.ebuild b/dev-qt/qtlocation/qtlocation-5.6.2.ebuild
deleted file mode 100644
index d7971ac3939..00000000000
--- a/dev-qt/qtlocation/qtlocation-5.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The Location module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty
-	src/location
-	src/imports/location
-	src/plugins/geoservices
-)

diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
index 1edea2b80a8..5e77183204f 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index ad4aa248a30..ced927e981d 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtmultimedia-opensource-src-5.9.2.tar.xz 3594960 SHA256 c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520 SHA512 b9fab874706440e97185475bfd0ad769c23d5ddbff5086cc0da9783777e81ed8140fb06fa0e7536ebfb67f2c9db39e1b9f3c2241834e74a9e1fb6ffd5cb7af11 WHIRLPOOL 6adf8241a45e02720167ceb6c739396a08be8e5790c64eb31e281aa83cb2c1448dcff537aa829474704594c0d9d4bd616acbebaadd824610c24ec2f56a454b94

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
deleted file mode 100644
index bcd2410201e..00000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
-"
-
-src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 3f9b168e930..c3c337c21f4 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild
deleted file mode 100644
index 524c106a267..00000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="bindist connman libproxy networkmanager +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-libs/zlib-1.2.5
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? ( dev-libs/openssl:0[bindist=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager && echo -dbus-linked)
-		$(qt_use libproxy)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 90ba6110935..d69010f6ecb 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
index 1aa3635ae83..fb17633c545 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The OpenGL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="egl qt3support"

diff --git a/dev-qt/qtopengl/qtopengl-5.6.2.ebuild b/dev-qt/qtopengl/qtopengl-5.6.2.ebuild
deleted file mode 100644
index ae37895a92a..00000000000
--- a/dev-qt/qtopengl/qtopengl-5.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qtpaths/qtpaths-5.6.2.ebuild b/dev-qt/qtpaths/qtpaths-5.6.2.ebuild
deleted file mode 100644
index 3a64cf85338..00000000000
--- a/dev-qt/qtpaths/qtpaths-5.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)

diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index f545c6287ed..6e1d695472b 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b

diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.6.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.6.2.ebuild
deleted file mode 100644
index f830ab762eb..00000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)

diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 484bfc1021d..e35fa53d63c 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,3 +1,2 @@
-DIST qtlocation-opensource-src-5.6.2.tar.xz 3148448 SHA256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a SHA512 10d87e9e546d52fc1813cbe244cb592033758460129854879b0d04600bd2285c2ae499bb131de77bf66b4989b45d14e9e656a30aaeee47628e41b026908ed97e WHIRLPOOL 4c4cb895d3cd5cf2ac6ad385374d0dce6e91a9b6f3f562bff5e2715896d108f9f1a60ff13a5d360238812b34523d50f0ede92211830e2d0eef6ccc5b28d82966
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 SHA256 f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4 WHIRLPOOL be30847a33b1bb356d6725202968e189abf4a5bcdc5c2decf9a7ffc14b2d3875dfde827b41b97bf11c9497ec584f351c567150d84bb93fedeb3cb15ce0ac0075
 DIST qtlocation-opensource-src-5.9.2.tar.xz 5369548 SHA256 c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c SHA512 da2e011d37b1c30395360987d66978c842aae41491ce3201316ebe1acf453fb31626575e3c3d65836aa6ac80e3d4324a613f0245e90598b507a89d13ea241786 WHIRLPOOL 2a2dd20d9fc5ae75e469438587dd1d57b65a5a5e642a6806bc067b0cfa914ef0309a63b37163b0fb349134bb3b6a1fb4785691c1a8d2ef681c624df29a1df67a

diff --git a/dev-qt/qtpositioning/qtpositioning-5.6.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.6.2.ebuild
deleted file mode 100644
index 56064d3fda1..00000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~hppa ppc64 x86"
-fi
-
-IUSE="geoclue qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
-	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
-}

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 3f9b168e930..c3c337c21f4 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.6.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.6.2.ebuild
deleted file mode 100644
index 6f90409fc82..00000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index dc57a4603bb..ceeac4a48ec 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,3 +1,2 @@
-DIST qtquickcontrols-opensource-src-5.6.2.tar.xz 5952696 SHA256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c SHA512 19bf092e984bc5ccbc328726f10e6c4d1980f68772b85591c7f62025552fc38bb25b71974f4e71258456c85be37cc72636c6dd035f5b57e573fdf5c99e028a7a WHIRLPOOL 17bc1be69bdf28821b2e72e4406079a2dca0d346b0aaa4c5f4642ba37a99326142ebbd5f89fac219b6b9c452622b6a3ce33c2fa68012d6fcce8bdefcf614e400
 DIST qtquickcontrols-opensource-src-5.7.1.tar.xz 5943024 SHA256 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d SHA512 7f5d3a2fcb1da3ba5299f57935156e34dd61d019b29892794927148c7bda99e8e298522f1a7d807f2c2b9746efcc9418a9f89c6322257749036b046e03471368 WHIRLPOOL f0863a5b88057ffbbd5059b3a61d7ae98b8291a96383936e8acf70b64ad91b8da3a7d2837377141041ea2f3051638dad530ad83b089a9aa18a8e11ee54b6d289
 DIST qtquickcontrols-opensource-src-5.9.2.tar.xz 5945332 SHA256 5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f SHA512 fd5833bd3823e3a53b54ac542857af5bb109952035869ad0a151e807abc9d304ef5d3fa04b75df3b59faf0b95412f593d86b56198f96734f3a75b1620688ba4f WHIRLPOOL 79d373dcdbbb176d966b7c0c5a207384325680e766d71c49af008da6f33373b4ea0b8c0c0b51b6ac1493c7046bec0b829f703d5a29b72e996b6642897cb3703a

diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.6.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.6.2.ebuild
deleted file mode 100644
index 388b187d9e3..00000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.6.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ~ppc ppc64 x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 859671bdca2..aa346a61247 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtscript-opensource-src-5.9.2.tar.xz 2611900 SHA256 47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1 SHA512 3ce2e57a0a6b2382614f689edca0deed87afe944c1c41decb3b9f420449fa59f2b79e6330e78e01a950761a95903113eaa7fbf261886361114acf5015d93254c WHIRLPOOL 6c7c1d4eb25a3bc8e4c4a47512788d1e7183eb7c3928ab2c892f8cfe7b7ed9e7ef1bc7f93e5e3be1ecd23635e6b118ae008270e6b8877e5746980e5492bfd9c3

diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index e5acb744882..ce3c8d0893c 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtScript module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+jit"

diff --git a/dev-qt/qtscript/qtscript-5.6.2.ebuild b/dev-qt/qtscript/qtscript-5.6.2.ebuild
deleted file mode 100644
index f605ec022dd..00000000000
--- a/dev-qt/qtscript/qtscript-5.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex jit '' JAVASCRIPTCORE_JIT=no)
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 2e55c1d208d..2afc7e18763 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,3 +1,2 @@
-DIST qtsensors-opensource-src-5.6.2.tar.xz 1973888 SHA256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 SHA512 18cbf232e157942e9a3452921761c45f96334d8f628e2c5331b2670dfeb46eb018819f586e126404dc0426687bbfa1fdc4cd4557ee8bca1e74a21037383c73db WHIRLPOOL 8fe8d7f52df6d95ef0d9dac76cecebf98e95d26c83056192265ea3ccb128ce2a610f936519b73abca407f685dfcdb89bb36208e83189c3f395c882311db1343c
 DIST qtsensors-opensource-src-5.7.1.tar.xz 1987144 SHA256 ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 SHA512 5dff126e59f0bae4e5a8b1d3b971dc1c7318169f82dcb05907bad5dd460f2edadb317ffd111047af5a2d1db3a2c3adc204e5f8ec2b792c912a8e7e987f596914 WHIRLPOOL ccefbcebf8bad0df76f00aafc23fe119664fd253e96e07784d7977192651b36a1143afcbf9d069a908f79c259ee0325d1fa272dd1673d9458328171f90d10b6d
 DIST qtsensors-opensource-src-5.9.2.tar.xz 1994772 SHA256 79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3 SHA512 c03c7d531c3a17a51ac41cd1623ffbbb24e8b2bef739d44db3115a70fe75ce831f50de037752a09bccd069416c4c939e31b663bf405c7cc8bf642e88399771a7 WHIRLPOOL 418ffd97a6a8ac4a273bc56242d84541a7562135b51197b9844b30e93cfb4dd2ee335e73efed678cacc596931b1cad54d8922679829ac03c9a04c5264833e3c7

diff --git a/dev-qt/qtsensors/qtsensors-5.6.2.ebuild b/dev-qt/qtsensors/qtsensors-5.6.2.ebuild
deleted file mode 100644
index 0f193917ad3..00000000000
--- a/dev-qt/qtsensors/qtsensors-5.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 33708f5327e..32522f47bcb 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,3 +1,2 @@
-DIST qtserialport-opensource-src-5.6.2.tar.xz 256852 SHA256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 SHA512 fb4544ce295c771216a5dad6f7800c85554c67852c42b965a2139cffd00241f7d4f86ab9db2a88c62a76561db74829f5c6b291cfc847d5d290373edd420dc42f WHIRLPOOL e93d799fdac0474b8106e3948120f4d8db30da9ab1a97d282be594d07e04fa4f48a2ff83f24fa3deaea26d6b94cfdf61f182233eb1607282cb604a1e6354d8ad
 DIST qtserialport-opensource-src-5.7.1.tar.xz 265616 SHA256 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 SHA512 090015dc2652399bee7c7d30c9f127be695e4c002b18dba1089d4bec555513774a587864989f33ad4059ff7b9b2bf24c387394c03a4024e2640b3642bc89ccbf WHIRLPOOL 08709c502758081faad0bf12bf34c16d216ef2cb3ac8e7c6c438d1f429249c3388ed264817f921f83deae1817c58458b38d0cbe7e70b556a22cc74a57fce4007
 DIST qtserialport-opensource-src-5.9.2.tar.xz 272996 SHA256 50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42 SHA512 cc8899c1ae2ed9fd8cf1c213ab7efaec12b3b16836006fdbf74cb7ea457705505a13e82c2f2873ee9426ae66473ec42259f4e728de64576ee44420f116cc433d WHIRLPOOL 6d73738131cc7a32931b4050a96309a5b86d6e32a28d5b598b29b15aface8e41be57eb3fb9b0d62f1c846b8b7403c7de41392f524b146e0b1e8e745cecae2101

diff --git a/dev-qt/qtserialport/qtserialport-5.6.2.ebuild b/dev-qt/qtserialport/qtserialport-5.6.2.ebuild
deleted file mode 100644
index 52495844896..00000000000
--- a/dev-qt/qtserialport/qtserialport-5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:contains(QT_CONFIG,\s*libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
index 7f5bb4a43bd..fb850dfd0ec 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5 X"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 90ba6110935..d69010f6ecb 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
index ccc0ded8d9c..e5b47beeca3 100644
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib qt4-build-multilib
 DESCRIPTION="The SQL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	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"

diff --git a/dev-qt/qtsql/qtsql-5.6.2.ebuild b/dev-qt/qtsql/qtsql-5.6.2.ebuild
deleted file mode 100644
index 4dfa0cbee52..00000000000
--- a/dev-qt/qtsql/qtsql-5.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 4928652a827..2fcfb5aea05 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtsvg-opensource-src-5.9.2.tar.xz 1777392 SHA256 ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108 SHA512 c21c5a12fa10ff9f91deda88c99c995ee2138bdffa21c793b0c42f25155f01f87ede5206624b9d82713649f8cf1cfdb95f1d5b7e792de62f3848d3a9ec665fdd WHIRLPOOL 1682dbf75852c15517e6f4101d87d553fa6667243a59a0c5eff8a28367d2f971f66294d1cfe88f7061e397220b59b337b08a98f805305f3b3732623f4788025c

diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
index 4f0a92da6a8..e93289484ea 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The SVG module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"

diff --git a/dev-qt/qtsvg/qtsvg-5.6.2.ebuild b/dev-qt/qtsvg/qtsvg-5.6.2.ebuild
deleted file mode 100644
index 1279d49b6b0..00000000000
--- a/dev-qt/qtsvg/qtsvg-5.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	>=sys-libs/zlib-1.2.5
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"

diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 90ba6110935..d69010f6ecb 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
index 2562d388b38..c9adac525eb 100644
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/qttest/qttest-5.6.2.ebuild b/dev-qt/qttest/qttest-5.6.2.ebuild
deleted file mode 100644
index aaf977397d0..00000000000
--- a/dev-qt/qttest/qttest-5.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)

diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 7bbde784cb1..40ec0b3af64 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qttranslations-opensource-src-5.9.2.tar.xz 1412128 SHA256 5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f SHA512 e84e9741cc6f938556c4fd423fef4852b039ebe4afc12db8570a6540717297541f632a07d750ee25c46eea9ae858a78fba18be49597c47cb8c9165b961e0ee94 WHIRLPOOL 1ccf4921c795053aaf86d89dda9f995a3708de8344250256d5557dcc471a5083540b0166fdf4f3f900c10fe2b38031b79011711fe7b9b871d853632c44f704e0

diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
index 10a44027822..11907196f69 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Translation files for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/qttranslations/qttranslations-5.6.2.ebuild b/dev-qt/qttranslations/qttranslations-5.6.2.ebuild
deleted file mode 100644
index 97090e26986..00000000000
--- a/dev-qt/qttranslations/qttranslations-5.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index edd2e48aa50..edf30079964 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,3 +1,2 @@
-DIST qtwayland-opensource-src-5.6.2.tar.xz 267028 SHA256 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86 SHA512 193c1ef58282bf9597303996d8e03853d95c2e4f79a62bdcfc6ad48f397dbb71f8f2e94f8ab334c7fae0a6a0e5b79e8f762468be6a3b66eb3636c465fabff51d WHIRLPOOL e870e8be2ef393b8f5ba248e0f51e30297aa6bb0864c821c217c79e727d778751f89067913f0b7db0e0075d12843653529ce2c8cce37f429cf24265639db1e55
 DIST qtwayland-opensource-src-5.7.1.tar.xz 291776 SHA256 f23fc5e180c8af5b38419d84e44f1f342904a197c2382a7b03f83de2136201c7 SHA512 41a6699b9048a859bb0cb1e37cd0a3977f52a5a223d4f6a4ce5e1402c5b829cc907593ce2b70f4ec24dfad147251bb2f20e889eae26072cf53e774b4585f2921 WHIRLPOOL 959fb40ce79d9d09ee3c3ec436d3be229b614da15712494d943dd2cded12f0e29f9750b6e103307bb4e27e00a28f5b2ac508a29dff4f25e1b677f2f2519de98d
 DIST qtwayland-opensource-src-5.9.2.tar.xz 311052 SHA256 f6434d03f933867dfb219abec2cf19e2c1d1ef23d46d12cb9333c8066027f6c6 SHA512 28b6f77be5289cb9eba0e3e6b220d2c99d2ab4dbae8e02caecd7651b5ae33c09f117545664b01649ca52b27025cc15853806ece8dc10713c3d90832416c7def6 WHIRLPOOL 2d0c1ea872dbe4bd48dd1564062310eb2933e44dafe9c4547137f3b63aaddfe9a70aca806e48120abdbfa0de4eef9424258012afe2debe4c01012f3a94bcd932

diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 9bd59538a9f..4fb03e67901 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
-		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="wayland-compositor">Build Qt compositor for wayland</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>

diff --git a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
deleted file mode 100644
index d427008009c..00000000000
--- a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-fi
-
-IUSE="qml wayland-compositor xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.4.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[egl]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	wayland-compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV} )
-	)
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use wayland-compositor; then
-		echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache
-	fi
-
-	qt_use_compile_test xcomposite
-	qt_use_disable_mod qml quick src/compositor/compositor_api/compositor_api.pri
-
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index b1ca4ad2c45..56d42a1cff8 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,3 +1,2 @@
-DIST qtwebchannel-opensource-src-5.6.2.tar.xz 119792 SHA256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 SHA512 76963aea9a287b360110086ffa146f0b93eac963e6a4adcd6ff6fec83fc5416aee1e374d50a4a47dd86edf25eb486f6f8ef23becdba46d891f5484ec5f336de4 WHIRLPOOL 62076abdec83d872abde159b923ab0a403ac659346824b0e7637cc2c6400fca8a97f1652df25faf0b08ce4cd89e801a5e2fdfda67c3555cdb04e44fbf8262b09
 DIST qtwebchannel-opensource-src-5.7.1.tar.xz 122436 SHA256 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b SHA512 643ca738e07c9a719d1d17ee23faf0d7bb3a62e6ee03e5b4f78e1cdf8d1b13ed71416b86bbb40c93d121a6569dc55d0373f1cb0961c8db07762c93592ca49af8 WHIRLPOOL acc3fe032452a35a765799995e9318f280cd67dd9d72ad9580254a8f645461d835ad0e6b4b9c95fe92581daee5ab298c6d195f75abd231cff8f0cab71f511b7a
 DIST qtwebchannel-opensource-src-5.9.2.tar.xz 147388 SHA256 9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26 SHA512 cab160532483928d18278be9430147090fcc12ffc2b7f9c4529a9e33bcafe939b0b6bfd8e46a6467709043cd54aabc697166f74927b24f1e654b522edb6231db WHIRLPOOL 548eb5b7410e17a045566c25c88beabb2e1e52babcfaf0ca8a707893138d55a41da91361ffd66fdf85fd1cd50cda3f83c45731191587ec98f44cbf0216bb4075

diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.6.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.6.2.ebuild
deleted file mode 100644
index 34cd2a0ca08..00000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1667ff30498..de80ca12b36 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,2 @@
-DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
 DIST qtwebengine-opensource-src-5.9.2.tar.xz 217353592 SHA256 cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108 SHA512 9139533b8b384519cb49a909ed678344c94cdeeed40048d0cf8482506defaea0ea8f06396576fae9f51e4b073a04ee63d1b1b42b8cd82a6d4592bc0db983c715 WHIRLPOOL 5435e594dc304305b8ca2b9b61a06b0477d8539df818a5fc1faefd1b6a95f11cf385391c6e3ea8e41d8e75149d1bc5b37f7ca49f14203fe2213a4f0de55a547b

diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
deleted file mode 100644
index c2d123d0085..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libevent:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa
-	media-libs/opus
-	media-libs/speex
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( dev-libs/icu:= )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
-
-	if use system-icu; then
-		# ensure build against system headers - bug #601264
-		rm -r src/3rdparty/chromium/third_party/icu/source || die
-	fi
-
-	qt_use_disable_mod geolocation positioning \
-		src/core/core_common.pri \
-		src/core/core_gyp_generator.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-
-	local myqmakeargs=(
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
-		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 3ddd63c84df..740b40ec3cc 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,5 +1,4 @@
 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
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 SHA256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 WHIRLPOOL 85bb21fb4ed3895c8d78d86a0725d650179b6d2bfea418cf8a54b98d8dac91f98a1423c78058feed54349ebb25fc934ecd82122413f22338b6d49083e21d41b9

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
deleted file mode 100644
index a944be9499b..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ppc64 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	~dev-qt/qtcore-${PV}[icu]
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}
-	~dev-qt/qtwidgets-${PV}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-	opengl? ( ~dev-qt/qtopengl-${PV} )
-	orientation? ( ~dev-qt/qtsensors-${PV} )
-	printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	webchannel? ( ~dev-qt/qtwebchannel-${PV} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-	"${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
-	elif ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index c10a3bf2945..acc27ed0dd1 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,3 +1,2 @@
-DIST qtwebsockets-opensource-src-5.6.2.tar.xz 171004 SHA256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 SHA512 6b4adc5a2ba3403b6a733b84bb9bb7a696db50c264b26841f67b6cc20bff44bf9743d3fd2d95f94b3e68127be6f411c3398ed7e910480658c3065549302b1958 WHIRLPOOL cb26a843312bffc75cbf1f7742e96ba78ab1363970e692e78daedd165a525dc96d1ee1d898f762c7bb5d1bccb3c09011d8f1d569ef4a7255e0f18fd0649d71d5
 DIST qtwebsockets-opensource-src-5.7.1.tar.xz 193204 SHA256 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 SHA512 3cca317d71513a0b11d5b46d6caee44d77a7f65eff09dbd6c180ad682a0271924e05efc28e6d31c9e982b6ab0b3fe1370606eea372e2fefd4525237496d2c7c9 WHIRLPOOL 036bbe99c69e4ec71198b2691583c240f3255c27408413e0962dea6addd70a1f1a4d132eda05e7ec3c9350c796137c764fc7b5742d0a0817c63be2dde7ffb8b7
 DIST qtwebsockets-opensource-src-5.9.2.tar.xz 199312 SHA256 afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674 SHA512 9330d6806251bc77d4c2a497a31b1b0e42a1e6bfe3ea7c00cee123052e9e1f9080e33cf4dfcd6ee6e4732c62f41257a77ec25ad607528f4e8ebe61ccaee3e159 WHIRLPOOL 64a2ff34b6798a7d64c2f12d5925a18cf9c95079c931060a3d906fc33ce9bd7efa208fffdfba9f3399c8198df51ac303412811acca90a74ea9231c1251f89598

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.2.ebuild
deleted file mode 100644
index 8d0adecf080..00000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 3f9b168e930..c3c337c21f4 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index afb05fc2840..17b1d11ac71 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
-			GTK+ theme</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>

diff --git a/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild
deleted file mode 100644
index afe6ca1a7ba..00000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-)
-
-QT5_GENTOO_CONFIG=(
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use gtkstyle)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 7ac13cde054..131c0fdda38 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,3 +1,2 @@
-DIST qtx11extras-opensource-src-5.6.2.tar.xz 33640 SHA256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced SHA512 52158b0de2d30ad629e066b34dff0665a70cb9ab895773f3bc129c15ca8072b82ec6759f4d7b9f5d893355e28f1a916a015c6726db289845d1854f9544336f31 WHIRLPOOL 2f0b09992a9a477eb4a40ea04ba05dbf1db08c2df745662c7d05d7abc3886aa51eb2cf7fec79a4dac6f1055fa636839a064cff7479835c5218e9d40574ef16cb
 DIST qtx11extras-opensource-src-5.7.1.tar.xz 59656 SHA256 5f5a0c2cc66ec01c2f2f31eff32fea26bd0bc03741a5dfd803b13870aa4ce427 SHA512 04359d85fad3dd51d6364c5218d5f76a384ec0d2082cefc7c67c5a8899cb19df3c9ce750b6707acfecf0a5ea57fb8cb737e5a8d2af3c63345f167f24712aaaee WHIRLPOOL 1f8bbb1583b2919a10f0684d09c420165b1919409aee662cff0037827e1231df2edac3d0f9f51e6dc7e57d028c8dc8e967c2bb4883d85668b9a7b29686b03593
 DIST qtx11extras-opensource-src-5.9.2.tar.xz 76624 SHA256 db85450ad4851816a4fade1ffc10d078d28f2cca174cffa6cbd6d1220b395ac5 SHA512 eb41aa76186e6ecea4caafc4c318c58d0f173331895c4e76e0eed8d7654b575c64dd35ed924b7c4d6a3c4e0d4d998c78aef1c484888e44b6fe87cbdd8aaf4181 WHIRLPOOL 10f6423ea20c5faa40818cb8c8bbcb55d6e6154f588718e143a8f345d3adec40c15f4ee5b9e4e8dc50d34e6d6105545b1707c92d15fc2fa044a25a59fbf9dde6

diff --git a/dev-qt/qtx11extras/qtx11extras-5.6.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.6.2.ebuild
deleted file mode 100644
index 9178ff9b8b4..00000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"

diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 3f9b168e930..c3c337c21f4 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,3 +1,2 @@
-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
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

diff --git a/dev-qt/qtxml/qtxml-5.6.2.ebuild b/dev-qt/qtxml/qtxml-5.6.2.ebuild
deleted file mode 100644
index 2c0cdd51d79..00000000000
--- a/dev-qt/qtxml/qtxml-5.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)

diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index cbd89872d04..b1f3977fc67 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,4 +1,3 @@
 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
 DIST qtxmlpatterns-opensource-src-5.9.2.tar.xz 1360696 SHA256 0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e SHA512 c14dbd97988473ba73b4e21352c5560278aa4dbfdf2be1d12e9119c0b5dbe8a0e4eff9a682052024a01bb21dcf52d40ba00da98947901fb91518af92a225da83 WHIRLPOOL 98102620b664d4b9469fc40b642f628e0733cc32e2799bc0090e358c4ef01eca0f0d62d05769c77bf024877038a8aacda29a4bc454b082ba0745c3ceeb8790d8

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
index 20cd5a7736b..c5ab5f0e709 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.2.ebuild
deleted file mode 100644
index f5bae222f80..00000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-10-30 23:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-30 23:33 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbearer/, dev-qt/linguist-tools/, dev-qt/qtnetwork/, dev-qt/qdbusviewer/, Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox