[gentoo-commits] proj/qt:master commit in: dev-qt/linguist/, dev-qt/designer/, dev-qt/qtxml/, dev-qt/qthelp/, ...

[Davide Pesavento]

commit:     f940e7e0efdbe7a1592613e70d8120c7d92ebafd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 01:15:52 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 01:15:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f940e7e0

dev-qt: remove 5.6.9999

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-qt/assistant/assistant-5.6.9999.ebuild         |  37 -----
 dev-qt/designer/designer-5.6.9999.ebuild           |  40 -----
 .../linguist-tools/linguist-tools-5.6.9999.ebuild  |  35 -----
 dev-qt/linguist/linguist-5.6.9999.ebuild           |  28 ----
 dev-qt/pixeltool/pixeltool-5.6.9999.ebuild         |  25 ---
 dev-qt/qdbus/qdbus-5.6.9999.ebuild                 |  25 ---
 dev-qt/qdbusviewer/qdbusviewer-5.6.9999.ebuild     |  27 ----
 dev-qt/qdoc/qdoc-5.6.9999.ebuild                   |  23 ---
 dev-qt/qtbluetooth/qtbluetooth-5.6.9999.ebuild     |  33 ----
 dev-qt/qtconcurrent/qtconcurrent-5.6.9999.ebuild   |  23 ---
 dev-qt/qtcore/qtcore-5.6.9999.ebuild               |  41 -----
 dev-qt/qtdbus/qtdbus-5.6.9999.ebuild               |  38 -----
 dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild |  53 -------
 dev-qt/qtdiag/qtdiag-5.6.9999.ebuild               |  25 ---
 .../qtgraphicaleffects-5.6.9999.ebuild             |  21 ---
 dev-qt/qtgui/metadata.xml                          |   1 -
 dev-qt/qtgui/qtgui-5.6.9999.ebuild                 | 174 ---------------------
 dev-qt/qthelp/qthelp-5.6.9999.ebuild               |  31 ----
 .../qtimageformats/qtimageformats-5.6.9999.ebuild  |  23 ---
 dev-qt/qtlocation/qtlocation-5.6.9999.ebuild       |  29 ----
 dev-qt/qtmultimedia/metadata.xml                   |   3 +-
 dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild   |  76 ---------
 dev-qt/qtnetwork/qtnetwork-5.6.9999.ebuild         |  53 -------
 dev-qt/qtopengl/qtopengl-5.6.9999.ebuild           |  34 ----
 dev-qt/qtpaths/qtpaths-5.6.9999.ebuild             |  23 ---
 dev-qt/qtplugininfo/qtplugininfo-5.6.9999.ebuild   |  23 ---
 dev-qt/qtpositioning/qtpositioning-5.6.9999.ebuild |  34 ----
 .../qtprintsupport/qtprintsupport-5.6.9999.ebuild  |  42 -----
 .../qtquickcontrols-5.6.9999.ebuild                |  32 ----
 dev-qt/qtscript/qtscript-5.6.9999.ebuild           |  36 -----
 dev-qt/qtsensors/qtsensors-5.6.9999.ebuild         |  26 ---
 dev-qt/qtserialport/qtserialport-5.6.9999.ebuild   |  27 ----
 dev-qt/qtsql/qtsql-5.6.9999.ebuild                 |  53 -------
 dev-qt/qtsvg/qtsvg-5.6.9999.ebuild                 |  23 ---
 dev-qt/qttest/qttest-5.6.9999.ebuild               |  29 ----
 .../qttranslations/qttranslations-5.6.9999.ebuild  |  19 ---
 dev-qt/qtwayland/metadata.xml                      |   2 -
 dev-qt/qtwayland/qtwayland-5.6.9999.ebuild         |  40 -----
 dev-qt/qtwebchannel/qtwebchannel-5.6.9999.ebuild   |  26 ---
 .../files/qtwebengine-paxmark-mksnapshot.patch     |  46 ------
 dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild     | 112 -------------
 .../files/qtwebkit-5.2.1-disable-gstreamer.patch   |  15 --
 .../files/qtwebkit-5.3.2-use-gstreamer010.patch    |  18 ---
 dev-qt/qtwebkit/metadata.xml                       |   3 +-
 dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild           | 117 --------------
 dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild   |  27 ----
 dev-qt/qtwidgets/metadata.xml                      |   2 -
 dev-qt/qtwidgets/qtwidgets-5.6.9999.ebuild         |  42 -----
 dev-qt/qtx11extras/qtx11extras-5.6.9999.ebuild     |  21 ---
 dev-qt/qtxml/qtxml-5.6.9999.ebuild                 |  25 ---
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.9999.ebuild |  19 ---
 51 files changed, 2 insertions(+), 1778 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.6.9999.ebuild b/dev-qt/assistant/assistant-5.6.9999.ebuild
deleted file mode 100644
index 44fa4993..00000000
--- a/dev-qt/assistant/assistant-5.6.9999.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/designer-5.6.9999.ebuild b/dev-qt/designer/designer-5.6.9999.ebuild
deleted file mode 100644
index 881db449..00000000
--- a/dev-qt/designer/designer-5.6.9999.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 ~arm64 ~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/linguist-tools-5.6.9999.ebuild b/dev-qt/linguist-tools/linguist-tools-5.6.9999.ebuild
deleted file mode 100644
index b22c78fd..00000000
--- a/dev-qt/linguist-tools/linguist-tools-5.6.9999.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/linguist-5.6.9999.ebuild b/dev-qt/linguist/linguist-5.6.9999.ebuild
deleted file mode 100644
index 163c6cf6..00000000
--- a/dev-qt/linguist/linguist-5.6.9999.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/pixeltool-5.6.9999.ebuild b/dev-qt/pixeltool/pixeltool-5.6.9999.ebuild
deleted file mode 100644
index 84c30915..00000000
--- a/dev-qt/pixeltool/pixeltool-5.6.9999.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="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/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)

diff --git a/dev-qt/qdbus/qdbus-5.6.9999.ebuild b/dev-qt/qdbus/qdbus-5.6.9999.ebuild
deleted file mode 100644
index cc1037ec..00000000
--- a/dev-qt/qdbus/qdbus-5.6.9999.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/qdbusviewer-5.6.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.6.9999.ebuild
deleted file mode 100644
index d1f5a5ed..00000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.6.9999.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/qdoc-5.6.9999.ebuild b/dev-qt/qdoc/qdoc-5.6.9999.ebuild
deleted file mode 100644
index 37172d0a..00000000
--- a/dev-qt/qdoc/qdoc-5.6.9999.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="Qt documentation generator"
-
-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/qdoc
-)

diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.6.9999.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.6.9999.ebuild
deleted file mode 100644
index ca5687bd..00000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.6.9999.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/qtconcurrent/qtconcurrent-5.6.9999.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.6.9999.ebuild
deleted file mode 100644
index 2886524b..00000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.6.9999.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/qtcore-5.6.9999.ebuild b/dev-qt/qtcore/qtcore-5.6.9999.ebuild
deleted file mode 100644
index 50e1f664..00000000
--- a/dev-qt/qtcore/qtcore-5.6.9999.ebuild
+++ /dev/null
@@ -1,41 +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}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtdbus/qtdbus-5.6.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.6.9999.ebuild
deleted file mode 100644
index d7d8945c..00000000
--- a/dev-qt/qtdbus/qtdbus-5.6.9999.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/qtdeclarative-5.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
deleted file mode 100644
index 0ee1bc48..00000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.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/qtdiag-5.6.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.6.9999.ebuild
deleted file mode 100644
index bdd36844..00000000
--- a/dev-qt/qtdiag/qtdiag-5.6.9999.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="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/qtgraphicaleffects-5.6.9999.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.6.9999.ebuild
deleted file mode 100644
index f1f5e53f..00000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.6.9999.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/metadata.xml b/dev-qt/qtgui/metadata.xml
index a18a5dcb..bb8d780f 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
 		<flag name="evdev">Enable support for input devices via evdev</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag>
 		<flag name="ibus">Build the IBus input method plugin</flag>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>

diff --git a/dev-qt/qtgui/qtgui-5.6.9999.ebuild b/dev-qt/qtgui/qtgui-5.6.9999.ebuild
deleted file mode 100644
index da5134e3..00000000
--- a/dev-qt/qtgui/qtgui-5.6.9999.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/qthelp-5.6.9999.ebuild b/dev-qt/qthelp/qthelp-5.6.9999.ebuild
deleted file mode 100644
index ae741896..00000000
--- a/dev-qt/qthelp/qthelp-5.6.9999.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/qtimageformats-5.6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.6.9999.ebuild
deleted file mode 100644
index 3285265e..00000000
--- a/dev-qt/qtimageformats/qtimageformats-5.6.9999.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/qtlocation-5.6.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.6.9999.ebuild
deleted file mode 100644
index 3b8070ce..00000000
--- a/dev-qt/qtlocation/qtlocation-5.6.9999.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/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 9e80384a..3e53741f 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -7,8 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
-		<flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
+		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="widgets">Build the QtMultimediaWidgets module</flag>
 	</use>

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
deleted file mode 100644
index 5c309a38..00000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
+++ /dev/null
@@ -1,76 +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 gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
-
-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
-	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-bad:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	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' '')
-		$(usex gstreamer010 'GST_VERSION=0.10' '')
-	)
-	qt5-build_src_configure
-}

diff --git a/dev-qt/qtnetwork/qtnetwork-5.6.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.6.9999.ebuild
deleted file mode 100644
index 48c13b15..00000000
--- a/dev-qt/qtnetwork/qtnetwork-5.6.9999.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/qtopengl-5.6.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.6.9999.ebuild
deleted file mode 100644
index 7e85dc2c..00000000
--- a/dev-qt/qtopengl/qtopengl-5.6.9999.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/qtpaths-5.6.9999.ebuild b/dev-qt/qtpaths/qtpaths-5.6.9999.ebuild
deleted file mode 100644
index e19eed5f..00000000
--- a/dev-qt/qtpaths/qtpaths-5.6.9999.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/qtplugininfo-5.6.9999.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.6.9999.ebuild
deleted file mode 100644
index f411fc0c..00000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.6.9999.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="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/qtpositioning-5.6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-5.6.9999.ebuild
deleted file mode 100644
index 407ac256..00000000
--- a/dev-qt/qtpositioning/qtpositioning-5.6.9999.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/qtprintsupport-5.6.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.6.9999.ebuild
deleted file mode 100644
index 71b61e38..00000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.6.9999.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/qtquickcontrols-5.6.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.6.9999.ebuild
deleted file mode 100644
index ac6ab02e..00000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.6.9999.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/qtscript-5.6.9999.ebuild b/dev-qt/qtscript/qtscript-5.6.9999.ebuild
deleted file mode 100644
index 018e8b0d..00000000
--- a/dev-qt/qtscript/qtscript-5.6.9999.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/qtsensors-5.6.9999.ebuild b/dev-qt/qtsensors/qtsensors-5.6.9999.ebuild
deleted file mode 100644
index 72762d03..00000000
--- a/dev-qt/qtsensors/qtsensors-5.6.9999.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/qtserialport-5.6.9999.ebuild b/dev-qt/qtserialport/qtserialport-5.6.9999.ebuild
deleted file mode 100644
index 28ed3530..00000000
--- a/dev-qt/qtserialport/qtserialport-5.6.9999.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/qtsql/qtsql-5.6.9999.ebuild b/dev-qt/qtsql/qtsql-5.6.9999.ebuild
deleted file mode 100644
index 0560c4a2..00000000
--- a/dev-qt/qtsql/qtsql-5.6.9999.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/qtsvg-5.6.9999.ebuild b/dev-qt/qtsvg/qtsvg-5.6.9999.ebuild
deleted file mode 100644
index 2667ef7e..00000000
--- a/dev-qt/qtsvg/qtsvg-5.6.9999.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/qttest-5.6.9999.ebuild b/dev-qt/qttest/qttest-5.6.9999.ebuild
deleted file mode 100644
index 1db02743..00000000
--- a/dev-qt/qttest/qttest-5.6.9999.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/qttranslations-5.6.9999.ebuild b/dev-qt/qttranslations/qttranslations-5.6.9999.ebuild
deleted file mode 100644
index 2cd29666..00000000
--- a/dev-qt/qttranslations/qttranslations-5.6.9999.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/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 9bd59538..4fb03e67 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.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild
deleted file mode 100644
index e706826a..00000000
--- a/dev-qt/qtwayland/qtwayland-5.6.9999.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/qtwebchannel-5.6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.6.9999.ebuild
deleted file mode 100644
index dd22a806..00000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.6.9999.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/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
deleted file mode 100644
index c71cedc2..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-03-04 01:48:36.000000000 +1100
-+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-05-01 19:15:44.052770543 +1000
-@@ -33,6 +33,7 @@
-     'embed_script%': "",
-     'v8_extra_library_files%': [],
-     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'remove_v8base_debug_symbols%': 0,
-   },
-   'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
-@@ -1913,7 +1914,7 @@
-         ]
-     },
-     {
--      'target_name': 'mksnapshot',
-+      'target_name': 'mksnapshot_u',
-       'type': 'executable',
-       'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
-       'include_dirs+': [
-@@ -1936,5 +1937,26 @@
-         }],
-       ],
-     },
-+    {
-+      'target_name': 'mksnapshot',
-+      'type': 'executable',
-+      'dependencies': ['mksnapshot_u'],
-+      'actions': [
-+        {
-+          'action_name': 'paxmark_m_mksnapshot',
-+          'inputs': [
-+            '<(mksnapshot_u_exec)',
-+          ],
-+          'outputs': [
-+            '<(mksnapshot_exec)',
-+          ],
-+          'action': [
-+            'sh',
-+            '-c',
-+            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
-+          ],
-+        },
-+      ],
-+    },
-   ],
- }

diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
deleted file mode 100644
index a2c25a9b..00000000
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ /dev/null
@@ -1,112 +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 multiprocessing 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]
-	virtual/libudev
-	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
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	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
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
deleted file mode 100644
index 2309570e..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -99,12 +99,6 @@
- 
-     # HTML5 Media Support for builds with GStreamer
-     unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
--        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
--            WEBKIT_CONFIG += video use_gstreamer
--        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--        }
--        use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
-     }
- 
-     !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
deleted file mode 100644
index 8c9220b9..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -96,14 +96,8 @@
-     use?(3d_graphics): WEBKIT_CONFIG += webgl
- 
-     # HTML5 Media Support for builds with GStreamer
--    unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
--        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
--            WEBKIT_CONFIG += video use_gstreamer
--        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--        }
-+        WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-         use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
--    }
- 
-     !enable?(video):qtHaveModule(multimediawidgets) {
-         WEBKIT_CONFIG += video use_qt_multimedia

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 87f1ed33..a0aa5e42 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -8,8 +8,7 @@
 	<use>
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
-		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
deleted file mode 100644
index 47ab9ce5..00000000
--- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
+++ /dev/null
@@ -1,117 +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)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~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"
-)
-
-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
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 572056
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
deleted file mode 100644
index 0e59435a..00000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.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/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index b22e8849..910cf075 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -8,8 +8,6 @@
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gtk">Build the GTK platform theme plugin</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.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.6.9999.ebuild
deleted file mode 100644
index 0c0c729a..00000000
--- a/dev-qt/qtwidgets/qtwidgets-5.6.9999.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/qtx11extras-5.6.9999.ebuild b/dev-qt/qtx11extras/qtx11extras-5.6.9999.ebuild
deleted file mode 100644
index 54540902..00000000
--- a/dev-qt/qtx11extras/qtx11extras-5.6.9999.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/qtxml-5.6.9999.ebuild b/dev-qt/qtxml/qtxml-5.6.9999.ebuild
deleted file mode 100644
index d19aa52b..00000000
--- a/dev-qt/qtxml/qtxml-5.6.9999.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/qtxmlpatterns-5.6.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.9999.ebuild
deleted file mode 100644
index 4cd0f931..00000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.6.9999.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}"