gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-qt
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
551 files changed, 12600 insertions, 2642 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index a5c820284ba5..5c546fc700f2 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant-4.8.7 b/dev-qt/assistant-4.8.7
deleted file mode 100644
index 550bb2060e25..000000000000
--- a/dev-qt/assistant-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b300d5278454dfe97f22a39d245f369
diff --git a/dev-qt/assistant-5.11.1 b/dev-qt/assistant-5.11.1
deleted file mode 100644
index ead2e8112495..000000000000
--- a/dev-qt/assistant-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qthelp-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qthelp-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a806569a20446ff23f59a051b2aaec37
diff --git a/dev-qt/assistant-5.9.4 b/dev-qt/assistant-5.9.4
deleted file mode 100644
index dc81f60fc7f7..000000000000
--- a/dev-qt/assistant-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qthelp-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit debug test
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qthelp-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03de0ad856dfb96645b0c2f49e535fe1
diff --git a/dev-qt/assistant-5.9.6 b/dev-qt/assistant-5.9.6
deleted file mode 100644
index 20d07eb72723..000000000000
--- a/dev-qt/assistant-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qthelp-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtsql-5.9.6[sqlite] ~dev-qt/qtwidgets-5.9.6 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qthelp-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtsql-5.9.6[sqlite] ~dev-qt/qtwidgets-5.9.6 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d60ea828f2c48d49d6ccc9d0cc56bd2c
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
new file mode 100644
index 000000000000..3406781491c2
--- /dev/null
+++ b/dev-qt/assistant/Manifest
@@ -0,0 +1,11 @@
+AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952ab7a1d821e127e74667d7752d3393cfce95fe9cd7a7134533eb4a1d6916b8b0f96da7fa0fd3efdee63f98ceaa18c4a SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18
+AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b
+EBUILD assistant-5.11.1.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
+EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
+EBUILD assistant-5.9.6.ebuild 1197 BLAKE2B 0b82fa338518cdce23bdd4ff9a284cfc92d31b8d7185510aed4336d9ab3a04b3be842a6847ae9e4749fb785684a70297ff0120e79d56397405aa80577219d9d4 SHA512 6785780be453ddaf3fd28d1c8665905e1d60f444f33a9b6ce60ce858cc17e5dd0b0e6ea0b321a877709a6cb68b301f78e5e24667bb8bcc4c728962926a857bb6
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
new file mode 100644
index 000000000000..41eb312612bc
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+
+src_prepare() {
+	# bug 401173
+	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+	qt4-build-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+		$(qt_use webkit)
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	doicon tools/assistant/tools/assistant/images/assistant.png
+	make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
diff --git a/dev-qt/assistant/assistant-5.11.1.ebuild b/dev-qt/assistant/assistant-5.11.1.ebuild
new file mode 100644
index 000000000000..0fe2bc14566e
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.11.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/assistant-5.9.4.ebuild b/dev-qt/assistant/assistant-5.9.4.ebuild
new file mode 100644
index 000000000000..4757150b4f37
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/assistant-5.9.6.ebuild b/dev-qt/assistant/assistant-5.9.6.ebuild
new file mode 100644
index 000000000000..ba63c9276c49
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.9.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
new file mode 100644
index 000000000000..1cf70275f634
--- /dev/null
+++ b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
@@ -0,0 +1,12 @@
+--- tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:02:37.539564947 +0200
++++ tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:03:18.843561620 +0200
+@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+     if (helpEngine.usesAppFont())
+         font = helpEngine.appFont();
+ 
+-    const QWidgetList &widgets = qApp->allWidgets();
+-    foreach (QWidget* widget, widgets)
++    foreach (QWidget* widget, QApplication::allWidgets())
+         widget->setFont(font);
+ }
+ 
diff --git a/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch
new file mode 100644
index 000000000000..61bca05148e5
--- /dev/null
+++ b/dev-qt/assistant/files/disable-webkit.patch
@@ -0,0 +1,26 @@
+Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
++++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
+@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
+ TEMPLATE = app
+ LANGUAGE = C++
+ TARGET = assistant
+-contains(QT_CONFIG, webkit):QT += webkit
+ CONFIG += qt \
+     warn_on \
+     help
+@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
+     openpageswidget.cpp \
+     openpagesmanager.cpp \
+     openpagesswitcher.cpp
+-contains(QT_CONFIG, webkit) {
+-    SOURCES += helpviewer_qwv.cpp
+-} else {
+-    SOURCES += helpviewer_qtb.cpp
+-}
++
++SOURCES += helpviewer_qtb.cpp
+ 
+ FORMS += bookmarkdialog.ui \
+     bookmarkmanagerwidget.ui \
+\ No newline at end of file
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/assistant/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/designer-4.8.7 b/dev-qt/designer-4.8.7
deleted file mode 100644
index a5b414b77be2..000000000000
--- a/dev-qt/designer-4.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative phonon qt3support webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=phonon? ( media-libs/phonon[designer,qt4] )
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6719fa40f2cb2c29f754aaf5774e1e96
diff --git a/dev-qt/designer-5.11.1 b/dev-qt/designer-5.11.1
deleted file mode 100644
index fdc414932682..000000000000
--- a/dev-qt/designer-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 declarative? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 declarative? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e457aa12152d0587b8e92634117361b
diff --git a/dev-qt/designer-5.9.4 b/dev-qt/designer-5.9.4
deleted file mode 100644
index a9de649a8240..000000000000
--- a/dev-qt/designer-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 declarative? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 declarative? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=904a74cf2c37c853cccf983345d4ac99
diff --git a/dev-qt/designer-5.9.6 b/dev-qt/designer-5.9.6
deleted file mode 100644
index 4054eec3a765..000000000000
--- a/dev-qt/designer-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 declarative? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 declarative? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7ad388ac93e5ac315d90d543d39b2b5
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
new file mode 100644
index 000000000000..1187958a2649
--- /dev/null
+++ b/dev-qt/designer/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
+EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
+EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
+EBUILD designer-5.9.6.ebuild 1243 BLAKE2B 4af12ab1eee6d0c45ea990e45ebc982a673982fa1422a2e7fa4a981132f4c8e8cdd5314755ed19adfd51a8d8b091cc69eb1d32055a112edaef8a4314d993d4d5 SHA512 1422ff438a9ea1600cb281798e1739db2b8f7b7372cd110b8a5c4ea78f8e8a7506f8bb91a75f798b9b9bd74d080e3cae4efe5561841d77e2da1cb8c59bc80271
+MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
new file mode 100644
index 000000000000..7fbb1e9854ca
--- /dev/null
+++ b/dev-qt/designer/designer-4.8.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESIGNER_PLUGINS="declarative phonon qt3support webkit"
+IUSE="${DESIGNER_PLUGINS}"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
+
+QT4_TARGET_DIRECTORIES="tools/designer"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	local plugin
+	for plugin in ${DESIGNER_PLUGINS}; do
+		if ! use ${plugin} || [[ ${plugin} == phonon ]]; then
+			sed -i -e "/\<${plugin}\>/d" \
+				tools/designer/src/plugins/plugins.pro || die
+		fi
+	done
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	doicon tools/designer/src/designer/images/designer.png
+	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
+}
diff --git a/dev-qt/designer/designer-5.11.1.ebuild b/dev-qt/designer/designer-5.11.1.ebuild
new file mode 100644
index 000000000000..c561782d0aad
--- /dev/null
+++ b/dev-qt/designer/designer-5.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/designer/designer-5.9.4.ebuild b/dev-qt/designer/designer-5.9.4.ebuild
new file mode 100644
index 000000000000..8d195002c7d9
--- /dev/null
+++ b/dev-qt/designer/designer-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/designer/designer-5.9.6.ebuild b/dev-qt/designer/designer-5.9.6.ebuild
new file mode 100644
index 000000000000..69fb15642eea
--- /dev/null
+++ b/dev-qt/designer/designer-5.9.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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-5.9.1:5 )
+"
+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
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
new file mode 100644
index 000000000000..e72a70897a4f
--- /dev/null
+++ b/dev-qt/designer/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="declarative">Build the qdeclarativeview plugin</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="phonon">Build the phononwidgets plugin</flag>
+		<flag name="qt3support">Build the qt3supportwidgets plugin</flag>
+		<flag name="webkit">Build the qwebview plugin</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/linguist-4.8.7 b/dev-qt/linguist-4.8.7
deleted file mode 100644
index 780e7de2941f..000000000000
--- a/dev-qt/linguist-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a78e80405b82d2f789e27b20e9b2c8f9
diff --git a/dev-qt/linguist-5.11.1 b/dev-qt/linguist-5.11.1
deleted file mode 100644
index 4b37c977dff8..000000000000
--- a/dev-qt/linguist-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eab028f7652bdd056fd000f222db821
diff --git a/dev-qt/linguist-5.9.4 b/dev-qt/linguist-5.9.4
deleted file mode 100644
index ed31ed074f60..000000000000
--- a/dev-qt/linguist-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb03fa13bc4479f0720ae47b128e3b7f
diff --git a/dev-qt/linguist-5.9.6 b/dev-qt/linguist-5.9.6
deleted file mode 100644
index 239bb6906b9f..000000000000
--- a/dev-qt/linguist-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af55e6fa35652c97d88ac1a60f0ccb60
diff --git a/dev-qt/linguist-tools-5.11.1 b/dev-qt/linguist-tools-5.11.1
deleted file mode 100644
index 0b6ea9713930..000000000000
--- a/dev-qt/linguist-tools-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtxml-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtxml-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b2c6081cee5a28bad10428d856bfe6ad
diff --git a/dev-qt/linguist-tools-5.9.4 b/dev-qt/linguist-tools-5.9.4
deleted file mode 100644
index 28635e719ccf..000000000000
--- a/dev-qt/linguist-tools-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtxml-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtxml-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=3933ef071b349aa533c38b65c4e334c0
diff --git a/dev-qt/linguist-tools-5.9.6 b/dev-qt/linguist-tools-5.9.6
deleted file mode 100644
index 477b5b29b24f..000000000000
--- a/dev-qt/linguist-tools-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtxml-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtxml-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=74370083c010afa88639b162b1ebb301
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
new file mode 100644
index 000000000000..9c952aabb3c9
--- /dev/null
+++ b/dev-qt/linguist-tools/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD linguist-tools-5.11.1.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
+EBUILD linguist-tools-5.9.4.ebuild 689 BLAKE2B a9c6a757c7a558d2d29ec22f75be9be7d692706017422a5ea0020ec2b5eaf685a23d9894acbedf5ce493a094bbe5b23dfbf26bd4ba45cb669d6eb5395f61f265 SHA512 e4c747c0b392fda0a754a40832db8e7d6ee98b4caca74a07e608690497fbf5d09297ecd5a6dc1ea970a01075d064eea9cc889e57b5f4ddae6ebcafdd9019fd86
+EBUILD linguist-tools-5.9.6.ebuild 692 BLAKE2B 2cad4f536dd52c1c68ca2cc5d0a845bf9a7493b29bc73f8b6f23ab4c7c6a90298ec0b623fce159ff349969eef4f96c635d8f3de4bbd4b08eea5b45804bee7dc9 SHA512 81d6f06a6760cc4d07c9eeddced1395a46067accb589edb4bdd4e0cb1ee0ec45f819b078f6ad672f180c9c10216ab700c914378ab84a43241ee780ab2a2d01f6
+MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
new file mode 100644
index 000000000000..72c04bdc9e06
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-tools/linguist-tools-5.9.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
new file mode 100644
index 000000000000..75f3f4396c89
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-tools/linguist-tools-5.9.6.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
new file mode 100644
index 000000000000..fae128656e14
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-tools/metadata.xml b/dev-qt/linguist-tools/metadata.xml
new file mode 100644
index 000000000000..6577a64646a2
--- /dev/null
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="qml">Enable QML support in lupdate</flag>
+	</use>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
new file mode 100644
index 000000000000..e9c84d7a1588
--- /dev/null
+++ b/dev-qt/linguist/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6
+EBUILD linguist-5.11.1.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
+EBUILD linguist-5.9.4.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
+EBUILD linguist-5.9.6.ebuild 991 BLAKE2B d52d838332ab1e97b20ca6f0a6daca7524e9d09a04499ceaaa0b60b44d60c99064ceb2b416bed2c6ead19b71f75546e6d3f14306451390cbd6066795c4441d9f SHA512 e4d3800b549615d3ad0ea6b1a230471609ce9692e1cb3ae1491a294ccf215652c06ddc38e301c9cdab2f71195a91484211b70a134d0bbc6fb16ee3f265c5c34a
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild
new file mode 100644
index 000000000000..0c0cce6d0fb6
--- /dev/null
+++ b/dev-qt/linguist/linguist-4.8.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+}
diff --git a/dev-qt/linguist/linguist-5.11.1.ebuild b/dev-qt/linguist/linguist-5.11.1.ebuild
new file mode 100644
index 000000000000..38f06fe3f5d8
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/linguist/linguist-5.9.4.ebuild b/dev-qt/linguist/linguist-5.9.4.ebuild
new file mode 100644
index 000000000000..bbe1091a67dc
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.9.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/linguist/linguist-5.9.6.ebuild b/dev-qt/linguist/linguist-5.9.6.ebuild
new file mode 100644
index 000000000000..8be71e56736b
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.9.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/linguist/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/metadata.xml b/dev-qt/metadata.xml
new file mode 100644
index 000000000000..798c9b87977f
--- /dev/null
+++ b/dev-qt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+  <longdescription lang="en">
+    The dev-qt category contains packages for the Qt framework modules and
+    directly related libraries and development applications from the upstream
+    Qt Project. Do not add other packages to this category.
+  </longdescription>
+  <longdescription lang="es">
+    La categoría dev-qt contiene paquetes para los módulos del marco de trabajo
+    Qt y las librerías y aplicaciones de desarrollo directamente relacionadas
+    del proyecto Qt. No añadir otros paquetes a esta categoría.
+  </longdescription>
+</catmetadata>
diff --git a/dev-qt/pixeltool-4.8.7 b/dev-qt/pixeltool-4.8.7
deleted file mode 100644
index e6c98c27981d..000000000000
--- a/dev-qt/pixeltool-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-qt/qthelp-4.8.5:4 dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Qt screen magnifier
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-qt/qthelp-4.8.5:4 dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=954fd7eadb00d359bf282eae9ba0e051
diff --git a/dev-qt/pixeltool-5.11.1 b/dev-qt/pixeltool-5.11.1
deleted file mode 100644
index 19aa284a936f..000000000000
--- a/dev-qt/pixeltool-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt screen magnifier
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=aa9b9c5c415920bd5268209770a0eb97
diff --git a/dev-qt/pixeltool-5.9.4 b/dev-qt/pixeltool-5.9.4
deleted file mode 100644
index 4722e8e14b4d..000000000000
--- a/dev-qt/pixeltool-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt screen magnifier
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=eaced4927ea70010bff3f441b1610723
diff --git a/dev-qt/pixeltool-5.9.6 b/dev-qt/pixeltool-5.9.6
deleted file mode 100644
index 6c8f8531ce0c..000000000000
--- a/dev-qt/pixeltool-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt screen magnifier
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4cc42011793a362aa2a4d07f39e75478
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
new file mode 100644
index 000000000000..ef039a4832dc
--- /dev/null
+++ b/dev-qt/pixeltool/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8
+EBUILD pixeltool-5.11.1.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
+EBUILD pixeltool-5.9.4.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
+EBUILD pixeltool-5.9.6.ebuild 426 BLAKE2B db9dce595aab3eb4299272b37c58b93742dec893a15d11bc624e36004a82172ff2d60b0322fd0be37d32249271025368e5442613b843f6cc702f776c586fceb4 SHA512 4778455674f8ba9deefebab6f6155ebbb479fbab219655c259c013d4eb8213e917ac8bccc7f99b1d077cafbb57b46d4ffe567349543b3d4073c7d5c5972b59a3
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/pixeltool/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
new file mode 100644
index 000000000000..9cf60ffbfbaa
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	!<dev-qt/qthelp-4.8.5:4
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="tools/pixeltool"
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
new file mode 100644
index 000000000000..7bcdc97e3066
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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/pixeltool/pixeltool-5.9.4.ebuild b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
new file mode 100644
index 000000000000..76868a50145c
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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/pixeltool/pixeltool-5.9.6.ebuild b/dev-qt/pixeltool/pixeltool-5.9.6.ebuild
new file mode 100644
index 000000000000..b1dc602a7d69
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.9.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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-5.11.1 b/dev-qt/qdbus-5.11.1
deleted file mode 100644
index 50556a38a22f..000000000000
--- a/dev-qt/qdbus-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtxml-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ae627c0d21e8b38a694f94526832d4cc
diff --git a/dev-qt/qdbus-5.9.4 b/dev-qt/qdbus-5.9.4
deleted file mode 100644
index 0b229160d2a0..000000000000
--- a/dev-qt/qdbus-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtxml-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=aea566de0886e42f14458bc853be9a1b
diff --git a/dev-qt/qdbus-5.9.6 b/dev-qt/qdbus-5.9.6
deleted file mode 100644
index c7b9f2160b59..000000000000
--- a/dev-qt/qdbus-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 ~dev-qt/qtxml-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 ~dev-qt/qtxml-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b6158b0e7fbadc1adb1b436a5f57e99b
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
new file mode 100644
index 000000000000..50f607faac96
--- /dev/null
+++ b/dev-qt/qdbus/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qdbus-5.11.1.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
+EBUILD qdbus-5.9.4.ebuild 468 BLAKE2B 837861ba04ef44dfbcf8ac57956ef460c538a62706f80740ede9555afd3a668776b2da9a49ff45dffe70ef6016961ca987d0407b3f019e6d5c65ffcea8c0ea35 SHA512 371019253aaa5eec2f7b310ccd8378fb3c2516e95cfa9cfd3a39de4e7fc0251cae8b4a29f7801e9421e47bd016729f77fefe603eda385a49b655e1f8d69c9d91
+EBUILD qdbus-5.9.6.ebuild 471 BLAKE2B 5af617bce0f5842d0e29ff4c97762fa10fd7a85922e94ae123c47354c0b9ed78d65b801984998b981b3d0b67bd6efecbe69ef2e44c61f7e126619431b833a3b8 SHA512 188cd53a3187137b82a7a732b36933632aea87b9bd039ded645d2e65674bba5b48e3cb000b6bb1633d4d19f616fdd9f657baaa007a7251182b6c4a047cdcca2a
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qdbus/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qdbus/qdbus-5.11.1.ebuild b/dev-qt/qdbus/qdbus-5.11.1.ebuild
new file mode 100644
index 000000000000..4736c7cd2dee
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.11.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qdbus/qdbus-5.9.4.ebuild b/dev-qt/qdbus/qdbus-5.9.4.ebuild
new file mode 100644
index 000000000000..04705d7e8490
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.9.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qdbus/qdbus-5.9.6.ebuild b/dev-qt/qdbus/qdbus-5.9.6.ebuild
new file mode 100644
index 000000000000..b17053e32df5
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.9.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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 ~arm64 ~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-4.8.7 b/dev-qt/qdbusviewer-4.8.7
deleted file mode 100644
index 4130c5d29bb4..000000000000
--- a/dev-qt/qdbusviewer-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b8a74368c2140ede5cffe5625b4281a
diff --git a/dev-qt/qdbusviewer-5.11.1 b/dev-qt/qdbusviewer-5.11.1
deleted file mode 100644
index dce062969dc0..000000000000
--- a/dev-qt/qdbusviewer-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ~dev-qt/qtxml-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=026d648fea2e2719dd01a222f402b634
diff --git a/dev-qt/qdbusviewer-5.9.4 b/dev-qt/qdbusviewer-5.9.4
deleted file mode 100644
index aa59d1b1ef25..000000000000
--- a/dev-qt/qdbusviewer-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4053e2bc1fadb80cc38fdbf9e4b4162d
diff --git a/dev-qt/qdbusviewer-5.9.6 b/dev-qt/qdbusviewer-5.9.6
deleted file mode 100644
index b8efd98ee804..000000000000
--- a/dev-qt/qdbusviewer-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 ~dev-qt/qtxml-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=164364851ae1d678d957d2bcb8f7b82f
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
new file mode 100644
index 000000000000..c7de2f8cd4bd
--- /dev/null
+++ b/dev-qt/qdbusviewer/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc
+EBUILD qdbusviewer-5.11.1.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859
+EBUILD qdbusviewer-5.9.4.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
+EBUILD qdbusviewer-5.9.6.ebuild 972 BLAKE2B ac6d99e8ece5ea0222c3540e8c46c446d2cf7c94109d1b69c2a9825717ab08d216da05e7a10ae8b3be7f0d905c224629340fc381603c12b3ba31f4179d6c3b67 SHA512 d84069f9dec45dfeb1734c85b10af7214e9696f1a24587a31c26536737d2678ce6acbf1cc7f3efe584c475b5d4c6f350e4ee30da25fbb8a66a1fb6a3b6e76abf
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
new file mode 100644
index 000000000000..bf0dafdd0b9f
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Graphical tool 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"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
+}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
new file mode 100644
index 000000000000..ceb1e6f94f87
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
new file mode 100644
index 000000000000..72acdeb623c8
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild
new file mode 100644
index 000000000000..78fcf8b4fd51
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils 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 ~amd64-fbsd"
+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
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/qdoc-5.11.1 b/dev-qt/qdoc-5.11.1
deleted file mode 100644
index d03b92b740c1..000000000000
--- a/dev-qt/qdoc-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt documentation generator
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=db4b33b5f5ac0c0dd6253ca9ff138949
diff --git a/dev-qt/qdoc-5.9.4 b/dev-qt/qdoc-5.9.4
deleted file mode 100644
index a1ea64f8c5d6..000000000000
--- a/dev-qt/qdoc-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt documentation generator
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=73726ab6bc248b6345082114a597fd8d
diff --git a/dev-qt/qdoc-5.9.6 b/dev-qt/qdoc-5.9.6
deleted file mode 100644
index ca6589a399d2..000000000000
--- a/dev-qt/qdoc-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt documentation generator
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5d416c45c5b9f466fe449c20bffac01e
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
new file mode 100644
index 000000000000..3752f79348e4
--- /dev/null
+++ b/dev-qt/qdoc/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qdoc-5.11.1.ebuild 753 BLAKE2B a25c8f934982505e93a78e05b8772eb1476e31f4f3e3b315698aa518da2ed8dbec86867491bc5694ec1d6dd16e62869bd7d0b8abd59d39e7b8f9208053b14b4a SHA512 91546d1b9c02e16338186c56875222ac7fee28f99479f320d7cd1734908b96b9af036ea3c8dfe4a0f5d713a0731514bdeafe08e5542ca59ecc97cd51ba2036e1
+EBUILD qdoc-5.9.4.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
+EBUILD qdoc-5.9.6.ebuild 537 BLAKE2B df8a504f5d68e6929be66f338d5fc3c78c491de5857ff981e434b41788a9aa90acc0208dda01e9d1dbbd5367a07a49e8bb48fb093b623a6ee02f3d70c4f3691c SHA512 4237a1160b49c0b37ed8383fcceb2e371d53bf9913a8f2b014a3348e969543d2240fbe37c32563282112f9ed82a6c5091ec6cf8c1607f7f8ede064157767f9bb
+MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml
new file mode 100644
index 000000000000..2184bb18c0d0
--- /dev/null
+++ b/dev-qt/qdoc/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Enable QML/JS parsing support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qdoc/qdoc-5.11.1.ebuild b/dev-qt/qdoc/qdoc-5.11.1.ebuild
new file mode 100644
index 000000000000..4c656e1bf9f6
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+	# this is normally loaded in qttools.pro, so skipped by using
+	# QT_TARGET_SUBDIRS causing build to fail
+	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qdoc/qdoc-5.9.4.ebuild b/dev-qt/qdoc/qdoc-5.9.4.ebuild
new file mode 100644
index 000000000000..1b3aa1abfe23
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qdoc/qdoc-5.9.6.ebuild b/dev-qt/qdoc/qdoc-5.9.6.ebuild
new file mode 100644
index 000000000000..5a2d7eb2955b
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt-creator-4.5.2 b/dev-qt/qt-creator-4.5.2
deleted file mode 100644
index a73fab25b4c0..000000000000
--- a/dev-qt/qt-creator-4.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( =dev-util/qbs-1.10.1* ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) >=dev-qt/linguist-tools-5.6.2:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.6.2:5 ) test? ( >=dev-qt/qtdeclarative-5.6.2:5[localstorage,xml] >=dev-qt/qtquickcontrols2-5.6.2:5 >=dev-qt/qttest-5.6.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=6
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( =dev-util/qbs-1.10.1* ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.2:5 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.5/4.5.2/qt-creator-opensource-src-4.5.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d52c6eafd4fa579891c1371430bed46
diff --git a/dev-qt/qt-creator-4.6.1 b/dev-qt/qt-creator-4.6.1
deleted file mode 100644
index 9a0a2e54da23..000000000000
--- a/dev-qt/qt-creator-4.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) >=dev-qt/linguist-tools-5.6.2:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.6.2:5 ) test? ( >=dev-qt/qtdeclarative-5.6.2:5[localstorage,xml] >=dev-qt/qtquickcontrols2-5.6.2:5 >=dev-qt/qttest-5.6.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=6
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-5:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.2:5 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.6/4.6.1/qt-creator-opensource-src-4.6.1.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05a2d192956fe82d7b5b82377254a0af
diff --git a/dev-qt/qt-creator-4.6.2 b/dev-qt/qt-creator-4.6.2
deleted file mode 100644
index 9242ff8c55a5..000000000000
--- a/dev-qt/qt-creator-4.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) >=dev-qt/linguist-tools-5.6.2:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.6.2:5 ) test? ( >=dev-qt/qtdeclarative-5.6.2:5[localstorage,xml] >=dev-qt/qtquickcontrols2-5.6.2:5 >=dev-qt/qttest-5.6.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=6
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-5:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.2:5 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.6/4.6.2/qt-creator-opensource-src-4.6.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05a2d192956fe82d7b5b82377254a0af
diff --git a/dev-qt/qt-creator-9999 b/dev-qt/qt-creator-9999
deleted file mode 100644
index a2cfe8feb218..000000000000
--- a/dev-qt/qt-creator-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qthelp-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clangcodemodel? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) >=dev-qt/linguist-tools-5.9.0:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.9.0:5 ) test? ( >=dev-qt/qtdeclarative-5.9.0:5[localstorage,xml] >=dev-qt/qtquickcontrols2-5.9.0:5 >=dev-qt/qttest-5.9.0:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=6
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake cvs designer git glsl ios mercurial modeling nim perforce python qbs qnx scxml subversion valgrind winrt l10n_cs l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-LICENSE=GPL-3
-RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qthelp-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clangcodemodel? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-6:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb7e29a7e10b23c896b5bb14858c84a3
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
new file mode 100644
index 000000000000..d9ef1940e14b
--- /dev/null
+++ b/dev-qt/qt-creator/Manifest
@@ -0,0 +1,8 @@
+DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
+DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236
+DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
+EBUILD qt-creator-4.5.2.ebuild 5300 BLAKE2B 5155f92e4c4959777f25a6fafb850be8819a5d45385cecb71204f1c93a5885ed332b18503a0f9da4fc880c8ba5f547c4328155ba5c8df95b2fd767889c262966 SHA512 e7f288cf4fd0cb6fc25ef7cc877cacf2f6f9734b014b404863a31f547a4315c037d83d6017a7671874e613175fa96de6edfe94e659d26b544840fe5293317d11
+EBUILD qt-creator-4.6.1.ebuild 5404 BLAKE2B 685c6fa906981388e0ad37f8f8ded381b3a13aaec68d13d61db7236a0c44c8f5b4ccfe44347c9150842ff02ffa4c442cb663e3a58463f0f4688ad6149e87acb8 SHA512 7c9c94343615cc4df2b357da0577bfbdd68baa3c2bc7e42649dea00d31e2f1b8de85ae8e1732103af96d4e13971adb2497691a986171d5c1423fa613fe3d8976
+EBUILD qt-creator-4.6.2.ebuild 5404 BLAKE2B 685c6fa906981388e0ad37f8f8ded381b3a13aaec68d13d61db7236a0c44c8f5b4ccfe44347c9150842ff02ffa4c442cb663e3a58463f0f4688ad6149e87acb8 SHA512 7c9c94343615cc4df2b357da0577bfbdd68baa3c2bc7e42649dea00d31e2f1b8de85ae8e1732103af96d4e13971adb2497691a986171d5c1423fa613fe3d8976
+EBUILD qt-creator-9999.ebuild 5402 BLAKE2B 281495742b9e9335c50f9f0736b6e5c1a4d143edf96afcafe82752d4bdf568b1e705ca7ece4d24f618d8a10478be8e90969f41f0d1a34527b0b0eef50009097a SHA512 3fe2812134b52697b5dc18a04e4a2ff8268dc47df2d29684556cacb1db4f7dae3e6e7bd5063985e7d7965a85a00feecde294026b053ce6cd4f6b146bf82a002d
+MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
new file mode 100644
index 000000000000..5cdf568ca748
--- /dev/null
+++ b/dev-qt/qt-creator/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pesa@gentoo.org</email>
+		<name>Davide Pesavento</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="android">Build plugin for Android devices</flag>
+		<flag name="autotools">Enable autotools project manager plugin</flag>
+		<flag name="baremetal">Build plugin for bare metal devices</flag>
+		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
+		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
+		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
+		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="designer">Build widget designer plugin</flag>
+		<flag name="glsl">Enable GLSL source code editor</flag>
+		<flag name="ios">Build plugin for Apple iOS devices</flag>
+		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+		<flag name="modeling">Enable graphical model editor</flag>
+		<flag name="nim">Enable Nim source code editor</flag>
+		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
+		<flag name="python">Enable Python source code editor</flag>
+		<flag name="qbs">Enable QBS project manager plugin</flag>
+		<flag name="qnx">Build plugin for QNX devices</flag>
+		<flag name="scxml">Enable graphical SCXML editor</flag>
+		<flag name="systemd">Add support for retrieving application output from journald</flag>
+		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
+		<flag name="winrt">Build plugin for WinRT devices</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/qtcreator/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
new file mode 100644
index 000000000000..382084a382c2
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( =dev-util/qbs-1.10.1* )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-4.6.1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
new file mode 100644
index 000000000000..17290bea032b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.11.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries and tools
+	if ! use clangcodemodel; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
new file mode 100644
index 000000000000..17290bea032b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.11.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries and tools
+	if ! use clangcodemodel; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
new file mode 100644
index 000000000000..5f8021eb3f50
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.9.0:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-6:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.11.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries and tools
+	if ! use clangcodemodel; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-docs-5.11.1_p201806180847 b/dev-qt/qt-docs-5.11.1_p201806180847
deleted file mode 100644
index 1667c65ddadf..000000000000
--- a/dev-qt/qt-docs-5.11.1_p201806180847
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/p7zip
-DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
-EAPI=6
-HOMEPAGE=https://doc.qt.io/
-IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=FDL-1.3
-REQUIRED_USE=|| ( html qch )
-SLOT=5
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc/5.11.1-0-201806180847qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtcharts/5.11.1-0-201806180847qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtdatavis3d/5.11.1-0-201806180847qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtnetworkauth/5.11.1-0-201806180847qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtscript/5.11.1-0-201806180847qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtscript/5.11.1-0-201806180847qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtvirtualkeyboard/5.11.1-0-201806180847qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5111_src_doc_examples/qt.qt5.5111.doc.qtwebengine/5.11.1-0-201806180847qtwebengine-documentation.7z )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=44261e6876b5f9313772438f2053e128
diff --git a/dev-qt/qt-docs-5.9.4_p201801220610 b/dev-qt/qt-docs-5.9.4_p201801220610
deleted file mode 100644
index 090f1723727b..000000000000
--- a/dev-qt/qt-docs-5.9.4_p201801220610
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/p7zip
-DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=charts datavis networkauth script speech virtualkeyboard webengine
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=FDL-1.3
-SLOT=5
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc/5.9.4-0-201801220610qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtcharts/5.9.4-0-201801220610qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtdatavis3d/5.9.4-0-201801220610qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtnetworkauth/5.9.4-0-201801220610qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtscript/5.9.4-0-201801220610qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtscript/5.9.4-0-201801220610qtscripttools-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtspeech/5.9.4-0-201801220610qtspeech-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtvirtualkeyboard/5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_594_src_doc_examples/qt.594.doc.qtwebengine/5.9.4-0-201801220610qtwebengine-documentation.7z )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=25cb87c05ba9746210b73ae7c4813a83
diff --git a/dev-qt/qt-docs-5.9.6_p201806072055 b/dev-qt/qt-docs-5.9.6_p201806072055
deleted file mode 100644
index 31ff8c571c30..000000000000
--- a/dev-qt/qt-docs-5.9.6_p201806072055
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/p7zip
-DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
-EAPI=6
-HOMEPAGE=https://doc.qt.io/
-IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors speech virtualkeyboard webengine
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=FDL-1.3
-REQUIRED_USE=|| ( html qch )
-SLOT=5
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc/5.9.6-0-201806072055qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtcharts/5.9.6-0-201806072055qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtdatavis3d/5.9.6-0-201806072055qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtnetworkauth/5.9.6-0-201806072055qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtscript/5.9.6-0-201806072055qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtscript/5.9.6-0-201806072055qtscripttools-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtspeech/5.9.6-0-201806072055qtspeech-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtvirtualkeyboard/5.9.6-0-201806072055qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_596_src_doc_examples/qt.596.doc.qtwebengine/5.9.6-0-201806072055qtwebengine-documentation.7z )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e961a9b621aeda9274e5b7af584c6e1c
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
new file mode 100644
index 000000000000..3f0dd5ac3856
--- /dev/null
+++ b/dev-qt/qt-docs/Manifest
@@ -0,0 +1,30 @@
+DIST 5.11.1-0-201806180847qt-everywhere-documentation.7z 195754941 BLAKE2B d9a5acc81bad5653f0c645321936d1a300f3e70ced154c2b700c36cb5edd66e1006953d637e8b0ec750935cc2ddc2c93c3558e67a7edf80344ee9521bc12f120 SHA512 49b5db9ebf63ba5e607e6a667c835f6d2b90916115bbb4aababf8dd25faaa37575b4bfdb27facc8225d6c8ca73b1f6898a7680fed788189904b1588095b73fbb
+DIST 5.11.1-0-201806180847qtcharts-documentation.7z 9203418 BLAKE2B 833c14923dc3bcd3696d761e675095770b4f843168199065831638ec0f6fcd5d630c8cb79a7a9d6870b0b2a6266c97e7067f619d803cdb07a10d9335cb40140d SHA512 ccf84c9df4e6561af58738e8740a51b38a56cb512224f2cb4dbcda26e8c9fa9110835e5b4499be38ff55f8d1f13deaebb18ad468ef91d8ea5c4a3c690fa82f57
+DIST 5.11.1-0-201806180847qtdatavisualization-documentation.7z 7605605 BLAKE2B 951edc6ecbf231132fedd96cb8d711fef18fb2bd3022bfa14bf8dc56244543f7b02bbad1e1ac24e26a79b93787212df0a2a9487759126be95c2dead06bf5d369 SHA512 7cb7ad1d0a71169ff8dd7508e8a2d89477f5203820c247369d2606dc00b9cfab97ab0e4df6fc568d1e356cc9c94c71ecfcef351605f09d0c2d7961def28c9f27
+DIST 5.11.1-0-201806180847qtnetworkauth-documentation.7z 293012 BLAKE2B 58fdb896ecdcaf9b95bdcd6e300f3bfa0dfde17b91bdbc539feb85d40353a4c76cacab5e934e6a721b9d786c842633d53a444007c8e225dedd651ef6b9b24ffb SHA512 3c7793921b331a9e233da56470d1f8d70e7004525a68bf1a692bdb9127846dfb2986b8da6c277816945304abf106bc8250bc586947406b19543c6d10b0992c81
+DIST 5.11.1-0-201806180847qtscript-documentation.7z 721409 BLAKE2B c1a36f60bc5a276ad57f5483bc045bdfbc21dff8fd309c0d39bd0c0f5a22d329ca5afc1c1edf42dc9b0f210e239c8e4afa9550cafa31452d4a8bb4fcae61797e SHA512 b7a7bee2390461fae49677b2df5920a411228eee885f47f6e1cd4338cd28edc99ec76584d4e4d7df646eacb58cb45825294b66fa121b0f657d34f6dc009964c2
+DIST 5.11.1-0-201806180847qtscripttools-documentation.7z 88560 BLAKE2B 3114249410ac579ff29d91299e9c3752fc819cc8aadae8f1b8a42125aa3d3ebb5dae2557e7aef55ff8d8384877a8e47bb6c2e7d259cb6bddb97fbdc10aa6a5f1 SHA512 4941dcf96b676026b05bb0ce975c423e0d5d074a6bbdb610b03fc43093fb0cf7d699b57b4844870098b3dfbe722cabe460de7a7ff197a1113007dd73c4b05d67
+DIST 5.11.1-0-201806180847qtvirtualkeyboard-documentation.7z 1489580 BLAKE2B 43161e759ba266bcd5b5eccb42f46c9836473fa9a6f465e82604e61cc05309c9df335421cfd9cb058995c4f60728fdede199cd10476b13e6bca50350e1c06dd7 SHA512 f74740078c4a50fe01b59dda824795881943e898980d6ee74bda80743e9b3b187bbdcfec76a5c4df2fbaf7ccb36055fad9158548f34c7575b7d21d2cdbd29fea
+DIST 5.11.1-0-201806180847qtwebengine-documentation.7z 3326394 BLAKE2B 94f0231d6a78873e8720e9a456025aa7594953be9b61b6560abb8608aa946c4038471909d1ff6c29f2d762f98fd5dbe81999e6cca7fc49aadd45fec6f040491d SHA512 cc8f0d626004e31d58f7f4fbbedfc717bf0d6b64af497683a696ffb81a06938b99ac7a08d2da2d12c33b3f5dbf6cf2b8faab37da64f1b51621e494709f80dacd
+DIST 5.9.4-0-201801220610qt-everywhere-documentation.7z 213285230 BLAKE2B 9ff6df25cef33164afb515f34238bb689b85582fdca106f4d6341a5cfd179d557b9497f8092018151e67bb28d420b12bbcc9d9c395e0fcfc3132b2db6f193f09 SHA512 b843c78200dfc9c5f0ebd656267ca2d0d0efcdb589be0735137b5ba0a15ad90c9dc7daedcfa6c595ec1fcd7fc60523c5d8d504c34d642ffa1219cbeba8d0f27a
+DIST 5.9.4-0-201801220610qtcharts-documentation.7z 9070277 BLAKE2B bab608541ef8b236257bd640bfa4cdd6d3b75b867de55570ced3c1be87938a66ed4711b1c1ef8349eb6e361a1d26c93deed7e49addf56335ea9eadf614b044dc SHA512 3d2825fe9356a34abaf42aea3efa4e27d83c6acf12fb100f3c5aa4cd3faf25fbc1f2e2b3481fe95845a5c0c2b88924c8de19af9e9d5689c702f56252c2620df1
+DIST 5.9.4-0-201801220610qtdatavisualization-documentation.7z 6615754 BLAKE2B 757ed0c5c50e82bf3c8c5927306001c1226385bdd0fa343a342fe83acaf61c10255fd14684a3fe15f5a4c325c8503f74f5e6e13a17d4d7597435ae3b30671293 SHA512 75515a40880f890c5a4c725bb96a093d8af3ad03d52bd22a5f7fb0cd068e8f589eedd8c4560d5eaa8f968d599a223a438a4b447b5ed79083989d995e7c265365
+DIST 5.9.4-0-201801220610qtnetworkauth-documentation.7z 259668 BLAKE2B e9271460bd8e89a963020928c9272acc52e851b07c230207c44c926516a9bdf9fab6d5ebd7b507806002c9d4ba1c69911eade79ff20b11a59b606a6dc2c28780 SHA512 a42f526ed5d241ca7f5e0bc8ffd1e2b5289d4fdafe4c8116b69ca8da91cf1a2e4de07f8cf0b6a0d63adfbad6246b4ef8c605909166473e55e79f3d953fc1c2fc
+DIST 5.9.4-0-201801220610qtscript-documentation.7z 721873 BLAKE2B a6db56c9b4106c33803d0750538c3af70d6f7902157ff4936b6fbe0249dc9f1afc4deb4547baecdcb0d4d645dc658bc2044b39eab37bc1f15294cd4709d7dd91 SHA512 47356bf66b6abc8f7ed5f841e5655b722bfa2bec7ac09e076f3e4afb46a41c3c5eb83e4ba490c6b0ae2a0a527e5f45ec504fc3eb5513e2cc6ad2609edb20ee88
+DIST 5.9.4-0-201801220610qtscripttools-documentation.7z 76290 BLAKE2B 998230165da013b0c851a39cb3981856fac319dabd2ff8c16dd077d3acf5297797954cb895f052f01c8059c09ae383a686d7b2fd76ecf0b5b01beb2cb5e5779b SHA512 ef6a188f3e7adaa1fbbc0381f109b1cb9a8747b68abb3fcc938f68c617ac993261c81df2d5833ac1e12dcb9fad38658643f33aac3d32b1f4258aa3c3edb78a61
+DIST 5.9.4-0-201801220610qtspeech-documentation.7z 148926 BLAKE2B a1727de25d2e2ad13c2c0cc1d075d9ee28f913a5c788e55b5c25d4b976a4f9f775e4b2b2e96d71d2a51f124c4a6ee1b24762292a9f134a25fb8ae87128c80098 SHA512 437d2ce4172d823be6fbfca644ee9085c34a9e3a0abcd2783edda492647fe98e62d40abf81d519a15b7250491801bab48888de7d406c262e5444a4530df4e73d
+DIST 5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z 449521 BLAKE2B 33cd1477544a0bfe8753b7027eb97eda72687b3624267953592a6e45c5f5d7cc7601b65ca3394e418d589af8a9386cfa78afc95b177bf6f30fa2d7c5eabab30e SHA512 927f7161cbd9d400bb2077ad1342962350e0b96c09ff83cec2eb00d961372de305e1a84840993cebc7c4243379f201dcda864773654060ff021f44e20723c71e
+DIST 5.9.4-0-201801220610qtwebengine-documentation.7z 3378943 BLAKE2B f3b37fc3105a02cf8a09191b21898e4cf64d1201069832af3e24e25ef7873b6a722ec3a202183c0f7e234a53e14f3db18b9a15bcd74d5b3c68f0ab8699bf0702 SHA512 b4232c9312bfd659135a4f7895cf7b6695afd4eb71457e2bcab0fa08a281e9bf2cc44b7a775452af91ba64cc2089181fc38acd9b22f92290ce1aeb2df16e02f6
+DIST 5.9.6-0-201806072055qt-everywhere-documentation.7z 200837886 BLAKE2B 5bedc098c39a6b43c4fa25217c483072a69d760a29d585b4ad13e4891743cc44f496906ada61f413ab2850ad1cbce1195642002b1b43c1c3bd19a3d867314e5e SHA512 509e1a5f76bcae3fb96f8542c452fce1a417c12cbed9fb0e13369752f130846ddea1264ac9fb041c21c7562f4d139a0216b71644e895ffc5700be4920cd52d16
+DIST 5.9.6-0-201806072055qtcharts-documentation.7z 9071151 BLAKE2B 1533a41e4b13cc760309e7c607a464feca1a314dd36d34f941b0d3e413c0f6792bb745a05b09886061f6585e3ca8827fa6b0a957a40df62c1872a8d4390a4e44 SHA512 5f11848bee82f89269b5b45c058bc29b33fbbb52b891c3908f36cc912b00cab3605d163d5da0c9fc2ebdd610022300038f749cce07c6cd3a7982c3cc93f05dc1
+DIST 5.9.6-0-201806072055qtdatavisualization-documentation.7z 6617326 BLAKE2B d6d0951aa5712a571bed62b154672614163931965fb53aa3511dde2eede957d81a2c90a7a6c231af39f39056d32dc9d0866079f0b70d02a6f0823d55bf090ce0 SHA512 9797b355b82a06b51866bdac08101a76c4032756747b6e456141d98771ae6cf8a6a68e48b85d8de71b8dc14653238b1477f1cf86b497976928f9fe0a0bcc3bfa
+DIST 5.9.6-0-201806072055qtnetworkauth-documentation.7z 259691 BLAKE2B 55e060949594f2b6647b79c64628d6ec2a8645c0a94c64865f7f5b1fcd21493bf38eab96d586d0b3ff9ee5dc9824b6dcc0ada5ce253ea8c6186551c876fa0423 SHA512 2499150520d9994c7fb9c666f15040e6e789fc89f41cd65efb97525d7cac21bf2385197ebcde19788e85b8324fb08d04bc5ad9f60423a4dfaa6125e8a860514d
+DIST 5.9.6-0-201806072055qtscript-documentation.7z 721761 BLAKE2B 2f8c0b189580233c3e65d91538a9208c7a4b40c9b7553c83e7e5e3fe79fe5b748679986d036541bb2cb20659c6e424f52c7f635a5d2664ef1f584480a62f4158 SHA512 b42d59c9cbab2de7b2b71d4560d14130a3dd7a0ead6c086afc651ea86a11a254f48711dd7b122826cb41d8f078e5d6b7616a082489f6f3fdb058705afdf41f50
+DIST 5.9.6-0-201806072055qtscripttools-documentation.7z 76289 BLAKE2B 8335287080f72b893b8e3c9392d462b6219f82a8fd48a1dd2f2b9f7676f737c0ee70dfb875199180149c83f479526b9c06046aea4d5c22f66b9dbd2130d05559 SHA512 d2b5b30ea37731e9ba7e594e34d3d9813152fd4c361875b16a49a895fcadb400e9acfad0a2f2c43a7308b6df9537fca4649653306290ca081e795b38130f0d5e
+DIST 5.9.6-0-201806072055qtspeech-documentation.7z 148960 BLAKE2B f26ad95fbd75f001805566a0ca7ef58816be90327d6905948bc87e8d3fa2d1c01b519d9b4e3c20ad9e689a4d79cbd93f286db9cc01b7a167230ce6d2f7333699 SHA512 af64dd1a2fdb6b1b7a5049eff67576d8b5a1f1408c771ee1db1f78580325f2da71f4d2e74abe4cfb438a11fe1478e65a6366aeb585ed98769a51bf9d471d747d
+DIST 5.9.6-0-201806072055qtvirtualkeyboard-documentation.7z 449786 BLAKE2B 33a7e07d9b2cbd83bc8a6086172ba4cdbdcc4ad3d89c44b8e48df1a5400e1ae784a3e1742f0732f4dcc73a78008d0d2d9035ad412dc03152cd760a3882c4f014 SHA512 ba9d851e2100c895b6831b7a370a98cc5d43baba893a5861daf77bcb5fe490b9e15d6142315fedce89e0517a2aef90280494216175e2f39a6ac19f34d8852f01
+DIST 5.9.6-0-201806072055qtwebengine-documentation.7z 3382083 BLAKE2B dd2e40fe408a21347931e5c73059fe437ce2377018f431dabd1544828cbeb575eb36671cb0567284d6eee4623b699f8cdb9342ed5307c95edc23978235dc6a92 SHA512 394045b2ee583cd826b9aefd0c8fca94586400115f8fc31354854db3f002007c23c27c25ed19f76ce60a118600287f09d53f81a5b3a3fc07b9d6e2478319e1ca
+EBUILD qt-docs-5.11.1_p201806180847.ebuild 2029 BLAKE2B 4d48f98c7a891124c33ce0a08c1af452725282bc9a2360bd7fc9d06c667bd1b6ec26213c10e756ca329a6ae68c5f18b33b945e45014c65c06dd7f66d9870445f SHA512 9754bf952bb8f9af7b7bded2a58c390730347fa6109f10e2a07227d112e3a1e3ce7a94b7e14f1a96c2ad287ec0b5804f8e115df5e94fd8c2bc44e1f3468a3b94
+EBUILD qt-docs-5.9.4_p201801220610.ebuild 1634 BLAKE2B 3e1aca6d063fdf9859bb9e175049472c9afeea6a8e36c201428d7d6c8a84183074d2f1fe917f4dd85dd9b80d1e988d94cb1afb16c3fd577520decc7a1203d77e SHA512 95a705d2c003e01b213f912e0dd862ca10c79d6ac06e6ab3c7fea6f37c01215ef6afe4151597f1825edd111be8544dc6363943ce6043e60f70144aa024ea04a8
+EBUILD qt-docs-5.9.6_p201806072055.ebuild 2101 BLAKE2B 1ecfc546175533721c665cc19e3874e06c75c13abda64b114df06f2e0e52e8baacdd7ee4d629001b506ff4e52311e0387c7704270980eebe4887b9611dcd219a SHA512 380088c228e273f5929e3c3508ae7a62e8841f10105f987da7b4682290da5f673fdfa8a5b59ac67959b4b3b7f8b059c3a75d56587d7bbe0f96ccac26257bfaee
+MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
new file mode 100644
index 000000000000..2cf47d81e171
--- /dev/null
+++ b/dev-qt/qt-docs/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="3d">Install documentation for <pkg>dev-qt/qt3d</pkg></flag>
+		<flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
+		<flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
+		<flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
+		<flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg>,
+			<pkg>dev-qt/qtquickcontrols</pkg>, and <pkg>dev-qt/qtquickcontrols2</pkg></flag>
+		<flag name="graphicaleffects">Install documentation for <pkg>dev-qt/qtgraphicaleffects</pkg></flag>
+		<flag name="html">Install documentation in HTML format</flag>
+		<flag name="location">Install documentation for <pkg>dev-qt/qtlocation</pkg></flag>
+		<flag name="multimedia">Install documentation for <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="networkauth">Install documentation for <pkg>dev-qt/qtnetworkauth</pkg></flag>
+		<flag name="qch">Install documentation in QCH format</flag>
+		<flag name="script">Install documentation for <pkg>dev-qt/qtscript</pkg></flag>
+		<flag name="sensors">Install documentation for <pkg>dev-qt/qtsensors</pkg></flag>
+		<flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag>
+		<flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag>
+		<flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
new file mode 100644
index 000000000000..a475934e374f
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
+SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
+	multimedia networkauth +qch script sensors virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+
+	use 3d || rm -r qt3d* || die
+	use bluetooth || rm -r qtbluetooth* || die
+	use declarative || rm -r qtqml* qtquick* || die
+	use graphicaleffects || rm -r qtgraphicaleffects* || die
+	use location || rm -r qtlocation* || die
+	use multimedia || rm -r qtmultimedia* || die
+	use sensors || rm -r qtsensors* || die
+}
+
+src_install() {
+	# must be the same as QT_INSTALL_DOCS
+	local dest=/usr/share/doc/qt-${PV%_p*}
+	insinto "${dest}"
+	use html && doins -r */
+	use qch && doins *.qch
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
new file mode 100644
index 000000000000..afd30f95aa81
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://www.qt.io/"
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.${PV_NODOTS}.doc"
+SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	speech? ( ${BASE_URI}.qtspeech/${PV_FULL}qtspeech-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+IUSE="charts datavis networkauth script speech virtualkeyboard webengine"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+}
+
+src_install() {
+	# intentionally not using ${PF}
+	local dest=/usr/share/doc/qt-${PV%_p*}
+	insinto "${dest}"
+	doins -r *
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild b/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
new file mode 100644
index 000000000000..b2808a6778ef
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.${PV_NODOTS}.doc"
+SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	speech? ( ${BASE_URI}.qtspeech/${PV_FULL}qtspeech-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
+	multimedia networkauth +qch script sensors speech virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+
+	use 3d || rm -r qt3d* || die
+	use bluetooth || rm -r qtbluetooth* || die
+	use declarative || rm -r qtqml* qtquick* || die
+	use graphicaleffects || rm -r qtgraphicaleffects* || die
+	use location || rm -r qtlocation* || die
+	use multimedia || rm -r qtmultimedia* || die
+	use sensors || rm -r qtsensors* || die
+}
+
+src_install() {
+	# must be the same as QT_INSTALL_DOCS
+	local dest=/usr/share/doc/qt-${PV%_p*}
+	insinto "${dest}"
+	use html && doins -r */
+	use qch && doins *.qch
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qt-meta-4.8.6-r1 b/dev-qt/qt-meta-4.8.6-r1
deleted file mode 100644
index fe450ad01936..000000000000
--- a/dev-qt/qt-meta-4.8.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Cross-platform application development framework (metapackage)
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+dbus examples +qt3support +webkit
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=metapackage
-RDEPEND=>=dev-qt/assistant-4.8.6:4 >=dev-qt/designer-4.8.6:4 >=dev-qt/linguist-4.8.6:4 >=dev-qt/pixeltool-4.8.6:4 dbus? ( >=dev-qt/qdbusviewer-4.8.6:4 ) qt3support? ( >=dev-qt/qt3support-4.8.6:4 ) >=dev-qt/qtbearer-4.8.6:4 >=dev-qt/qtcore-4.8.6:4 dbus? ( >=dev-qt/qtdbus-4.8.6:4 ) >=dev-qt/qtdeclarative-4.8.6:4 examples? ( >=dev-qt/qtdemo-4.8.6:4 ) >=dev-qt/qtgui-4.8.6:4 >=dev-qt/qthelp-4.8.6:4 >=dev-qt/qtmultimedia-4.8.6:4 >=dev-qt/qtopengl-4.8.6:4 >=dev-qt/qtscript-4.8.6:4 >=dev-qt/qtsql-4.8.6:4 >=dev-qt/qtsvg-4.8.6:4 >=dev-qt/qttest-4.8.6:4 webkit? ( >=dev-qt/qtwebkit-4.8.6:4 ) >=dev-qt/qtxmlpatterns-4.8.6:4
-SLOT=4
-_md5_=8b1a8558a8b62ecc283c6f08a4bef823
diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest
new file mode 100644
index 000000000000..effdec0486fc
--- /dev/null
+++ b/dev-qt/qt-meta/Manifest
@@ -0,0 +1,2 @@
+EBUILD qt-meta-4.8.6-r1.ebuild 1024 BLAKE2B 7e815d073a1bb1a9a441ade5cd3733103f03e15bf75991c5e0bc4b655e1850407f4e59d58d3fd5211d425bd10f0f4d0dede2225ba39c21394b79574354adfec6 SHA512 d76df60ec4cb5332bdd61508443cba42885629c57762ae588f166f553e0b69682d9c54b98b475712ed5639abe88e06ac6557a1c3e7d590d395a4716dc7b40c56
+MISC metadata.xml 333 BLAKE2B 1b83cc14bc1e211df620ca5780d454e579529097e0deb62fa79fbab896b1db670a2d7d75b2629e42b85878e1779aad7d65c8aae95a4791899244bbe2964ef5a6 SHA512 83cc5fe637917ffcd5563c225f9fadb82e0a5bb7e105f83d7357f915fcc128a6d9b4c9bf80f65fb3cc7d69da3071cc13ec9ad48ee3d303bc1f06340a5fdf4d3d
diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
new file mode 100644
index 000000000000..202b54f3e094
--- /dev/null
+++ b/dev-qt/qt-meta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qt3support">Enable the Qt3Support library for Qt4</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..f3d4853b85fd
--- /dev/null
+++ b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Cross-platform application development framework (metapackage)"
+HOMEPAGE="https://www.qt.io/"
+
+LICENSE="metapackage"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+dbus examples +qt3support +webkit"
+
+DEPEND=""
+RDEPEND="
+	>=dev-qt/assistant-${PV}:4
+	>=dev-qt/designer-${PV}:4
+	>=dev-qt/linguist-${PV}:4
+	>=dev-qt/pixeltool-${PV}:4
+	dbus? ( >=dev-qt/qdbusviewer-${PV}:4 )
+	qt3support? ( >=dev-qt/qt3support-${PV}:4 )
+	>=dev-qt/qtbearer-${PV}:4
+	>=dev-qt/qtcore-${PV}:4
+	dbus? ( >=dev-qt/qtdbus-${PV}:4 )
+	>=dev-qt/qtdeclarative-${PV}:4
+	examples? ( >=dev-qt/qtdemo-${PV}:4 )
+	>=dev-qt/qtgui-${PV}:4
+	>=dev-qt/qthelp-${PV}:4
+	>=dev-qt/qtmultimedia-${PV}:4
+	>=dev-qt/qtopengl-${PV}:4
+	>=dev-qt/qtscript-${PV}:4
+	>=dev-qt/qtsql-${PV}:4
+	>=dev-qt/qtsvg-${PV}:4
+	>=dev-qt/qttest-${PV}:4
+	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
+	>=dev-qt/qtxmlpatterns-${PV}:4
+"
diff --git a/dev-qt/qt3d-5.11.1 b/dev-qt/qt3d-5.11.1
deleted file mode 100644
index 4195fa1653f4..000000000000
--- a/dev-qt/qt3d-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.1[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=The 3D module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.1[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/dev-qt/qt3d-5.9.4 b/dev-qt/qt3d-5.9.4
deleted file mode 100644
index a31094f174a4..000000000000
--- a/dev-qt/qt3d-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=The 3D module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/dev-qt/qt3d-5.9.6 b/dev-qt/qt3d-5.9.6
deleted file mode 100644
index 5f52585622b8..000000000000
--- a/dev-qt/qt3d-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.6[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=The 3D module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.6[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qt3d-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
new file mode 100644
index 000000000000..b6efb835c8e1
--- /dev/null
+++ b/dev-qt/qt3d/Manifest
@@ -0,0 +1,7 @@
+DIST qt3d-everywhere-src-5.11.1.tar.xz 84763568 BLAKE2B 92510ae0cbc4627a9d0517bfe3a17c4efc6538cd04787b3fcbf5b0f381558deecb96a70f488d797719852b625bb47827ad630692934aad5574865e63f77f589a SHA512 d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a
+DIST qt3d-opensource-src-5.9.4.tar.xz 28007244 BLAKE2B ea38270a01460045e7cb57ee5c750149553fc3eab5ca7773ea68104f97a12c81a8125c9375edf5f8c35e2b13ef0a56da01c0370a6acc2ff9f0a03d0cd40d20be SHA512 1887d9e4e2669b15e42ebc2db9c040e1f344f14a4cb2691821be2773c70d63bf6ec152a3dd0572748f77a09aed8067e6bff022fcd5dfc4bd5108af75e626d829
+DIST qt3d-opensource-src-5.9.6.tar.xz 83722792 BLAKE2B bd101674c83a52a9df7a0aab738cebd9500a6d4aa4b5d2c2d4ab2f049f9e643d81ccd48273f089fb04c6c5d0417f9bcdaca0948ecc73972870d8fea472f38655 SHA512 6a882e79c7e0e36f620f9ee77d5943b8b0b4d3e1ee94ab08b70fc30c0bd4774967c656d38c489d9478f8feb91fc83614f639e13933b756ada3c12d6123c907de
+EBUILD qt3d-5.11.1.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
+EBUILD qt3d-5.9.4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
+EBUILD qt3d-5.9.6.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
+MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
new file mode 100644
index 000000000000..987a6dc29cad
--- /dev/null
+++ b/dev-qt/qt3d/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="qml">Build QML/QtQuick bindings</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qt3d/qt3d-5.11.1.ebuild b/dev-qt/qt3d/qt3d-5.11.1.ebuild
new file mode 100644
index 000000000000..e65630904901
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The 3D module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: gamepad, tools
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt3d/qt3d-5.9.4.ebuild b/dev-qt/qt3d/qt3d-5.9.4.ebuild
new file mode 100644
index 000000000000..e65630904901
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The 3D module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: gamepad, tools
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt3d/qt3d-5.9.6.ebuild b/dev-qt/qt3d/qt3d-5.9.6.ebuild
new file mode 100644
index 000000000000..e65630904901
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.9.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The 3D module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: gamepad, tools
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt3support-4.8.7 b/dev-qt/qt3support-4.8.7
deleted file mode 100644
index 376f1d5efc54..000000000000
--- a/dev-qt/qt3support-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The Qt3Support module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2c75745dfd39498ce1f9cbd7a8545ce
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
new file mode 100644
index 000000000000..e09a523abc9f
--- /dev/null
+++ b/dev-qt/qt3support/Manifest
@@ -0,0 +1,3 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+EBUILD qt3support-4.8.7.ebuild 797 BLAKE2B 415d8a4b36620949187ecc95fd17b96df2e0da02cad849c6428cd7292ad52ae56862807d208e94e27886fa2ba55c4e4fa2ec7ea5a480037e8c7432008932b96c SHA512 a30f2183dd78987115510229dda4b66c746645de0406c2c93e15e164029467f8728d8646d88a298bea1ece27876258547693ee3bfec518b2f79a5062f53d5ec2
+MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
new file mode 100644
index 000000000000..b92d7448ee41
--- /dev/null
+++ b/dev-qt/qt3support/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
new file mode 100644
index 000000000000..d6794af6893d
--- /dev/null
+++ b/dev-qt/qt3support/qt3support-4.8.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Qt3Support module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+accessibility"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/qt3support
+	src/tools/uic3
+	tools/porting"
+
+multilib_src_configure() {
+	local myconf=(
+		-qt3support
+		$(qt_use accessibility)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtbearer-4.8.7 b/dev-qt/qtbearer-4.8.7
deleted file mode 100644
index e2b5707d2689..000000000000
--- a/dev-qt/qtbearer-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] connman? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The network bearer plugins for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=connman networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] connman? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2721c297d91f29730ebdf11b31e7f104
diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
new file mode 100644
index 000000000000..2fc107f7f40f
--- /dev/null
+++ b/dev-qt/qtbearer/Manifest
@@ -0,0 +1,3 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+EBUILD qtbearer-4.8.7.ebuild 1448 BLAKE2B 44d810019a05f0cf6fb7cb1162df74863dd80a33d72715022b15e08c66a72c524db7c12dfb2367930d983a12546606502b549e8f315a7533519579dac5a618ad SHA512 c3fb35eee3f74574bda39a17cc7c69b628e07c5893e7ea2890dabfeca2ba067a14fd45949018bb8b6ce4c7306318ff3010aac4d6dde246b404e6390d6a614bc3
+MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
new file mode 100644
index 000000000000..b92d7448ee41
--- /dev/null
+++ b/dev-qt/qtbearer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
new file mode 100644
index 000000000000..515b3ccc88ca
--- /dev/null
+++ b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The network bearer plugins for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="connman networkmanager"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/plugins/bearer/generic
+		$(use connman && echo src/plugins/bearer/connman)
+		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use connman || use networkmanager || echo -no-dbus)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtbluetooth-5.11.1 b/dev-qt/qtbluetooth-5.11.1
deleted file mode 100644
index 5121825d536c..000000000000
--- a/dev-qt/qtbluetooth-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) ~dev-qt/qtnetwork-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
diff --git a/dev-qt/qtbluetooth-5.9.4 b/dev-qt/qtbluetooth-5.9.4
deleted file mode 100644
index 118dac7ef6ed..000000000000
--- a/dev-qt/qtbluetooth-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.4 ) ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b1012eafafaf09562eb8d16db19cdced
diff --git a/dev-qt/qtbluetooth-5.9.6 b/dev-qt/qtbluetooth-5.9.6
deleted file mode 100644
index eeb844b6bc8e..000000000000
--- a/dev-qt/qtbluetooth-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.6 ) ~dev-qt/qtnetwork-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtconnectivity-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7ee389a5b18ddd0a25cde4e765e58b79
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
new file mode 100644
index 000000000000..fab3a8fc55c8
--- /dev/null
+++ b/dev-qt/qtbluetooth/Manifest
@@ -0,0 +1,7 @@
+DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
+DIST qtconnectivity-opensource-src-5.9.4.tar.xz 2724048 BLAKE2B c401cd0d3a5b064667f7114b2e95a6bedfcc3b686c37a9962527b4c8a5e73f194a2f07b45408756c38550e4c09f79321f698f017556a33ac2cc7af40dfafea9a SHA512 d4cb67279555872f8f0ba0a9d746774f393711727aec058ab9ee59c783a645d53fc76a8ddcd857b0beed1dfdbc16ee7b4a214b3e95e1d5ba23e66e942d041a2c
+DIST qtconnectivity-opensource-src-5.9.6.tar.xz 2712048 BLAKE2B 8eec7fcbbb90f147c28de44203e1d584f0aa3efef996a3a9ebfcafbba8bc2d2dbee8779610e44dfb293898c79666a0e82b40707802f76887f8f3f3fdc86beb2f SHA512 6503013cccea89d56ea8f31e3d1c6f8928c101cbbe0311ad8463e7c49421015a731c7f33e41bbac608d5714a8821cc82a4d6e5596db86e00e60c79ba9dac4399
+EBUILD qtbluetooth-5.11.1.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
+EBUILD qtbluetooth-5.9.4.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
+EBUILD qtbluetooth-5.9.6.ebuild 640 BLAKE2B 9f656a462815c2aa7f853a72910d8e176de48804cec90885910e43a0a9b43a3d8782c66ead63dabc7937f5b1e484997b688c1ad2595f726e455047b31bd2d291 SHA512 234fbb6a1fbcfe219b6778f7198a13be6b80e01a615b097198bc4f1135cf392ad228d1c87073c11a85403d0d5bfce082e258eac156b80d69d484ebbcfb298ee9
+MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/metadata.xml b/dev-qt/qtbluetooth/metadata.xml
new file mode 100644
index 000000000000..d437181335d4
--- /dev/null
+++ b/dev-qt/qtbluetooth/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
new file mode 100644
index 000000000000..7f4a8b1b3eb7
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qtbluetooth/qtbluetooth-5.9.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
new file mode 100644
index 000000000000..a290372bd854
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~arm64 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/qtbluetooth/qtbluetooth-5.9.6.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.6.ebuild
new file mode 100644
index 000000000000..c4f673f8eb3e
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qtcharts-5.11.1 b/dev-qt/qtcharts-5.11.1
deleted file mode 100644
index 5bcc56cad4e7..000000000000
--- a/dev-qt/qtcharts-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/dev-qt/qtcharts-5.9.4 b/dev-qt/qtcharts-5.9.4
deleted file mode 100644
index 8dc60068a811..000000000000
--- a/dev-qt/qtcharts-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/dev-qt/qtcharts-5.9.6 b/dev-qt/qtcharts-5.9.6
deleted file mode 100644
index a105a8c179de..000000000000
--- a/dev-qt/qtcharts-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtcharts-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
new file mode 100644
index 000000000000..c9594de14d34
--- /dev/null
+++ b/dev-qt/qtcharts/Manifest
@@ -0,0 +1,7 @@
+DIST qtcharts-everywhere-src-5.11.1.tar.xz 4245496 BLAKE2B 92c1d9330d2da96524505186cd39c34765fc65ba5e5947d27f0bc7e275bc044112d3cd9fcef0c5455b20d0fb931d3bf15f8961381e47a7d537e47d1dffcbe5ee SHA512 e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b
+DIST qtcharts-opensource-src-5.9.4.tar.xz 4158264 BLAKE2B 6e6ecfe3e8b7fc87f1211ef2a03fc7310cc2f4cc6b9711c9da69d8ad83e062137a371c74f6ca882143a5adf516e4caf4dfdab31a40c036fb79add2b80022156e SHA512 4d93d2f3a3c51967e0377a1fd1397109b0cc621644ca90ed587d45950b9a49971738132223a55b45d6ed45685d5bb8e77e159505bd96148ac495047178a4f35b
+DIST qtcharts-opensource-src-5.9.6.tar.xz 4155980 BLAKE2B 975ed87424954502184c0d09cfd51f19b5908e4f297b47b5cfe5e40c5818816843d5c90c4012340b8731fbb306eeeb1edd6ba94a7db755604bc8ef6e8cedb168 SHA512 6d6ed9eca5611774ec683a85164858acb9071f74a0b2ade6976edd406232f51915e5fc1d144c9ba7ec69d36a4ab4840aa6d542214cd70673b3a3b8e6a0b88d68
+EBUILD qtcharts-5.11.1.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
+EBUILD qtcharts-5.9.4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
+EBUILD qtcharts-5.9.6.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
+MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/metadata.xml b/dev-qt/qtcharts/metadata.xml
new file mode 100644
index 000000000000..d437181335d4
--- /dev/null
+++ b/dev-qt/qtcharts/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtcharts/qtcharts-5.11.1.ebuild b/dev-qt/qtcharts/qtcharts-5.11.1.ebuild
new file mode 100644
index 000000000000..ff3df69c0911
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.11.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	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/qtcharts/qtcharts-5.9.4.ebuild b/dev-qt/qtcharts/qtcharts-5.9.4.ebuild
new file mode 100644
index 000000000000..ff3df69c0911
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	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/qtcharts/qtcharts-5.9.6.ebuild b/dev-qt/qtcharts/qtcharts-5.9.6.ebuild
new file mode 100644
index 000000000000..ff3df69c0911
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	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/qtchooser-0_p20170803 b/dev-qt/qtchooser-0_p20170803
deleted file mode 100644
index 3981d08d3190..000000000000
--- a/dev-qt/qtchooser-0_p20170803
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
-DESCRIPTION=Qt4/Qt5 version chooser
-EAPI=6
-HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=!<dev-qt/assistant-4.8.6:4 !<dev-qt/designer-4.8.6:4 !<dev-qt/linguist-4.8.6:4 !<dev-qt/pixeltool-4.8.6:4 !<dev-qt/qdbusviewer-4.8.6:4 !<dev-qt/qt3support-4.8.6:4 !<dev-qt/qtbearer-4.8.6:4 !<dev-qt/qtcore-4.8.6:4 !<dev-qt/qtdbus-4.8.6:4 !<dev-qt/qtdeclarative-4.8.6:4 !<dev-qt/qtdemo-4.8.6:4 !<dev-qt/qtgui-4.8.6:4 !<dev-qt/qthelp-4.8.6:4 !<dev-qt/qtmultimedia-4.8.6:4 !<dev-qt/qtopengl-4.8.6:4 !<dev-qt/qtopenvg-4.8.6:4 !<dev-qt/qtphonon-4.8.6:4 !<dev-qt/qtscript-4.8.6:4 !<dev-qt/qtsql-4.8.6:4 !<dev-qt/qtsvg-4.8.6:4 !<dev-qt/qttest-4.8.6:4 !<dev-qt/qtwebkit-4.8.6:4 !<dev-qt/qtxmlpatterns-4.8.6:4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qtchooser-0_p20170803.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a5fc7dc283e0e68dfe2389e24c499764
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
new file mode 100644
index 000000000000..3550f31dc4a9
--- /dev/null
+++ b/dev-qt/qtchooser/Manifest
@@ -0,0 +1,3 @@
+DIST qtchooser-0_p20170803.tar.xz 32012 BLAKE2B a0363ccebfd17c2ad514afbaf7ea80456826a42b88badff3a2ff4259745721f336a1b034f4a51831832f5b2dcd042c7c010c47e0f17b77ecacc5520f0c6f8d53 SHA512 320d898617ad52392fe24834e99ace685dac84e3a7edb1f6e6358baadb6658a51b02ae1af465ef5e081485a002c787c6884b6e1637ffd0406767fe7555fc32a7
+EBUILD qtchooser-0_p20170803.ebuild 1570 BLAKE2B c386764d8072ba9066f35a1948e173e7cf87bb24cf59853bd24c8b088c050ef620e9e2d34e24ababdd0baf639af3d1e561121f3dd48565ea5f11d9da49ef0096 SHA512 4650af4d9066f9b1ceadff18a02f38634e27ae974fbaa7c1c1894561d0d589900107517c167c2e624b9b5ea51a0c01f9e09c532e6b41da01eb763101f7f57ba3
+MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/metadata.xml b/dev-qt/qtchooser/metadata.xml
new file mode 100644
index 000000000000..17237689dcfd
--- /dev/null
+++ b/dev-qt/qtchooser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild b/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild
new file mode 100644
index 000000000000..daf813fca12e
--- /dev/null
+++ b/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Qt4/Qt5 version chooser"
+HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
+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"
+IUSE="test"
+
+DEPEND="test? (
+		dev-qt/qtcore:5
+		dev-qt/qttest:5
+	)"
+RDEPEND="
+	!<dev-qt/assistant-4.8.6:4
+	!<dev-qt/designer-4.8.6:4
+	!<dev-qt/linguist-4.8.6:4
+	!<dev-qt/pixeltool-4.8.6:4
+	!<dev-qt/qdbusviewer-4.8.6:4
+	!<dev-qt/qt3support-4.8.6:4
+	!<dev-qt/qtbearer-4.8.6:4
+	!<dev-qt/qtcore-4.8.6:4
+	!<dev-qt/qtdbus-4.8.6:4
+	!<dev-qt/qtdeclarative-4.8.6:4
+	!<dev-qt/qtdemo-4.8.6:4
+	!<dev-qt/qtgui-4.8.6:4
+	!<dev-qt/qthelp-4.8.6:4
+	!<dev-qt/qtmultimedia-4.8.6:4
+	!<dev-qt/qtopengl-4.8.6:4
+	!<dev-qt/qtopenvg-4.8.6:4
+	!<dev-qt/qtphonon-4.8.6:4
+	!<dev-qt/qtscript-4.8.6:4
+	!<dev-qt/qtsql-4.8.6:4
+	!<dev-qt/qtsvg-4.8.6:4
+	!<dev-qt/qttest-4.8.6:4
+	!<dev-qt/qtwebkit-4.8.6:4
+	!<dev-qt/qtxmlpatterns-4.8.6:4
+"
+
+qtchooser_make() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		LFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	qtchooser_make
+}
+
+src_test() {
+	pushd tests/auto >/dev/null || die
+	eqmake5
+	popd >/dev/null || die
+
+	qtchooser_make check
+}
+
+src_install() {
+	qtchooser_make INSTALL_ROOT="${D}" install
+
+	keepdir /etc/xdg/qtchooser
+
+	# TODO: bash and zsh completion
+	# newbashcomp scripts/${PN}.bash ${PN}
+}
diff --git a/dev-qt/qtconcurrent-5.11.1 b/dev-qt/qtconcurrent-5.11.1
deleted file mode 100644
index 45f8ff84d6b6..000000000000
--- a/dev-qt/qtconcurrent-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e0d21e9018ebde09f1d42f3997358bc6
diff --git a/dev-qt/qtconcurrent-5.9.4 b/dev-qt/qtconcurrent-5.9.4
deleted file mode 100644
index 2beed4acdf4c..000000000000
--- a/dev-qt/qtconcurrent-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=1fc8f98b67fe42d9c91163ce2768d880
diff --git a/dev-qt/qtconcurrent-5.9.6 b/dev-qt/qtconcurrent-5.9.6
deleted file mode 100644
index 8c0683b4d7bd..000000000000
--- a/dev-qt/qtconcurrent-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=dc96a022fa80cbe468102d48412f4460
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
new file mode 100644
index 000000000000..66d4352c08cb
--- /dev/null
+++ b/dev-qt/qtconcurrent/Manifest
@@ -0,0 +1,7 @@
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtconcurrent-5.11.1.ebuild 451 BLAKE2B ac3e1c49359c08572a277b8d73f07169cc8c69e15afb2c803c3d003252080d5f27128927d43b9a385bb0369730c13dc2853110f758e1c7c1d7f2d559010740fd SHA512 7939abc860de9aaa374d737e6e849408e9e48f21228a2a3895f72a73ae1edf7e71667795f51c57c5b5d2ddf3d498fc3ff8c55e1c2ac09c35d2b8fc78cdecf560
+EBUILD qtconcurrent-5.9.4.ebuild 447 BLAKE2B a2129ce135f8fe310e72e731bfbc99e8478815b8e6f67731ff7ff92a0de439808f828fcdba17ffc192fd0e5320bd4b79b31777150280b8ab8015116b9fdff862 SHA512 8993a8af2e1e394340faf5e3d6987c690739cb76a2aeb21b3684aaeee4b000db473c507e2d3b40cc25b56f078b9ca08111f3e2b2310e66b02297711fe42c84f5
+EBUILD qtconcurrent-5.9.6.ebuild 450 BLAKE2B fa1161a3cba5c5aaa52d67b3b14a7c581089a312d265f8e1c0d4418246be40e5da3026ee0ebf9c997b2f0b337ced8f13cb4c8af2477514963d242ad6a1c6dce6 SHA512 67d5f4681a40011f9e46c8f093debf89ea2be4f1920ddd12be6727c181386751d74bf60a640ea2584ef8eddf19f4564a9cda6c2a1caaa23f184525a6763c376f
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtconcurrent/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
new file mode 100644
index 000000000000..75e304af27a0
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
new file mode 100644
index 000000000000..9c95c6791b35
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
new file mode 100644
index 000000000000..b05a40d774cc
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore-4.8.7-r4 b/dev-qt/qtcore-4.8.7-r4
deleted file mode 100644
index 55acea5f077d..000000000000
--- a/dev-qt/qtcore-4.8.7-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Cross-platform application development framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+glib iconv icu libressl qt3support ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d16d9ffe614ef9b0263f828f80276f1a
diff --git a/dev-qt/qtcore-5.11.1 b/dev-qt/qtcore-5.11.1
deleted file mode 100644
index cc6eeaf2ecb7..000000000000
--- a/dev-qt/qtcore-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=be768e528b0c0520beaa33cdd458470e
diff --git a/dev-qt/qtcore-5.9.4-r2 b/dev-qt/qtcore-5.9.4-r2
deleted file mode 100644
index 909c37ec95a9..000000000000
--- a/dev-qt/qtcore-5.9.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bfe93c76c0378f64c2de5b1db7ad9227
diff --git a/dev-qt/qtcore-5.9.6 b/dev-qt/qtcore-5.9.6
deleted file mode 100644
index 782a79be6d07..000000000000
--- a/dev-qt/qtcore-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0086067137ba4956395e950d00e6a7a0
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
new file mode 100644
index 000000000000..f938ee26e1ac
--- /dev/null
+++ b/dev-qt/qtcore/Manifest
@@ -0,0 +1,13 @@
+AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 BLAKE2B 1a067cc908c762d4e3c8af2367c0c57e6a3150a9372da27540ea5c4cffe64c87f2f2d1440a4001fe5c1c3ef5dc07b7733d6507086bcab36801f6b3510a673525 SHA512 6770959ba01756d6a3fa9e03edd5f6c1df0d8625f4add65f7fef55a93b7b52c555a0ce749984938fb7ab905c2e0875cec0cb5d07f45c1b447fbc9e2d0ec678bb
+AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a1f86a5eb50317f0c674d2612f0c39c3e46b4f24fe924f953491f1cd56991fcbd693761075500d7c86b45c70ba213e7bd5856f1833bd1fc9 SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413
+AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021
+AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875
+EBUILD qtcore-5.11.1.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f
+EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e
+EBUILD qtcore-5.9.6.ebuild 1504 BLAKE2B 196bc1d6854dbbdb8249d7d2ee537288b124b1b1b98ae51854848ac2be8c98d28fffd032c09270a757d3387c7e79790ecdc3e7b09b2359bb452e19b3f86a6655 SHA512 aeb6311c7fcbc3604d168d5409b7621cfe7c6987961e0ecaadef6449e750f4aa0c052119a1cadbae0814e318fe99588efcfd111b339facae987540e47f65def1
+MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
new file mode 100644
index 000000000000..0fcc1fa6561d
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
@@ -0,0 +1,81 @@
+From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Thu, 6 Mar 2014 18:44:43 +0100
+Subject: Honor ExcludeSocketNotifiers in glib event loop
+
+Implements QEventLoop::ExcludeSocketNotifiers in the same way
+QEventLoop::X11ExcludeTimers is already implemented for the glib
+event loop.
+
+This prevents crashes when QClipboard checks for clipboard events
+and
+  qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true );
+is set.
+
+Task-number: QTBUG-34614
+Task-number: QTBUG-37380
+
+Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d
+---
+ src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
+index 0b0e308..ba522fa 100644
+--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
++++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
+@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
+ struct GSocketNotifierSource
+ {
+     GSource source;
++    QEventLoop::ProcessEventsFlags processEventsFlags;
+     QList<GPollFDWithQSocketNotifier *> pollfds;
+ };
+ 
+@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source)
+     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
+ 
+     bool pending = false;
++    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++        return pending;
++
+     for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
+         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+ 
+@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin
+     QEvent event(QEvent::SockAct);
+ 
+     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
++    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++        return true;
++
+     for (int i = 0; i < src->pollfds.count(); ++i) {
+         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+ 
+@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
+         reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
+                                                                sizeof(GSocketNotifierSource)));
+     (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
++    socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
+     g_source_set_can_recurse(&socketNotifierSource->source, true);
+     g_source_attach(&socketNotifierSource->source, mainContext);
+ 
+@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+     // tell postEventSourcePrepare() and timerSource about any new flags
+     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
+     d->timerSource->processEventsFlags = flags;
++    d->socketNotifierSource->processEventsFlags = flags;
+ 
+     if (!(flags & QEventLoop::EventLoopExec)) {
+         // force timers to be sent at normal priority
+@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+         result = g_main_context_iteration(d->mainContext, canWait);
+ 
+     d->timerSource->processEventsFlags = savedFlags;
++    d->socketNotifierSource->processEventsFlags = savedFlags;
+ 
+     if (canWait)
+         emit awake();
+-- 
+2.0.0
+
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
new file mode 100644
index 000000000000..6d3bf2f2cde2
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
@@ -0,0 +1,94 @@
+--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav	2014-03-28 15:26:37.000000000 +0100
++++ src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-24 09:44:09.358659204 +0200
+@@ -255,22 +255,30 @@ struct GPostEventSource
+     GSource source;
+     QAtomicInt serialNumber;
+     int lastSerialNumber;
++    QEventLoop::ProcessEventsFlags processEventsFlags;
+     QEventDispatcherGlibPrivate *d;
+ };
+ 
+ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
+ {
++    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     QThreadData *data = QThreadData::current();
+     if (!data)
+         return false;
+ 
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
++        return false;
++
+     gint dummy;
+     if (!timeout)
+         timeout = &dummy;
+     const bool canWait = data->canWaitLocked();
+     *timeout = canWait ? -1 : 0;
+ 
+-    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     return (!canWait
+             || (source->serialNumber != source->lastSerialNumber));
+ }
+@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
+ {
+     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     source->lastSerialNumber = source->serialNumber;
+-    QCoreApplication::sendPostedEvents();
+-    source->d->runTimersOnceWithNormalPriority();
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
++        QCoreApplication::sendPostedEvents();
++        source->d->runTimersOnceWithNormalPriority();
++    }
+     return true; // i dunno, george...
+ }
+ 
+@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
+                                                                         sizeof(GPostEventSource)));
+     postEventSource->serialNumber = 1;
++    postEventSource->processEventsFlags = QEventLoop::AllEvents;
+     postEventSource->d = this;
+     g_source_set_can_recurse(&postEventSource->source, true);
+     g_source_attach(&postEventSource->source, mainContext);
+@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
+ 
+     // tell postEventSourcePrepare() and timerSource about any new flags
+     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
++    d->postEventSource->processEventsFlags = flags;
+     d->timerSource->processEventsFlags = flags;
+     d->socketNotifierSource->processEventsFlags = flags;
+ 
+@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
+     while (!result && canWait)
+         result = g_main_context_iteration(d->mainContext, canWait);
+ 
++    d->postEventSource->processEventsFlags = savedFlags;
+     d->timerSource->processEventsFlags = savedFlags;
+     d->socketNotifierSource->processEventsFlags = savedFlags;
+ 
+--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav	2013-06-07 07:16:52.000000000 +0200
++++ src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-24 09:43:06.927589535 +0200
+@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
+ 
+     // we are awake, broadcast it
+     emit awake();
+-    QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
++
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((flags & excludeAllFlags) == excludeAllFlags)
++        return false;
++    if(( flags & excludeAllFlags ) != excludeAllFlags )
++        QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+ 
+     int nevents = 0;
+     const bool canWait = (d->threadData->canWaitLocked()
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
new file mode 100644
index 000000000000..b838c7a687b6
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
@@ -0,0 +1,52 @@
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2015-11-25 01:38:42.103898399 -0500
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-11-25 01:40:50.146247648 -0500
+@@ -224,13 +224,17 @@
+ #ifndef OPENSSL_NO_SSL2
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ #ifndef OPENSSL_NO_SSL2
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
+ #else
+@@ -818,13 +822,17 @@
+ #ifndef OPENSSL_NO_SSL2
+     RESOLVEFUNC(SSLv2_client_method)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+     RESOLVEFUNC(SSLv3_client_method)
++#endif
+     RESOLVEFUNC(SSLv23_client_method)
+     RESOLVEFUNC(TLSv1_client_method)
+ #ifndef OPENSSL_NO_SSL2
+     RESOLVEFUNC(SSLv2_server_method)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+     RESOLVEFUNC(SSLv3_server_method)
++#endif
+     RESOLVEFUNC(SSLv23_server_method)
+     RESOLVEFUNC(TLSv1_server_method)
+     RESOLVEFUNC(X509_NAME_entry_count)
+--- src/network/ssl/qsslsocket_openssl.cpp.orig	2015-11-25 01:44:55.235087906 -0500
++++ src/network/ssl/qsslsocket_openssl.cpp	2015-11-25 01:45:45.194443818 -0500
+@@ -263,7 +263,11 @@
+ #endif
+         break;
+     case QSsl::SslV3:
++#ifndef OPENSSL_NO_SSL3
+         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
++#else
++        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
++#endif
+         break;
+     case QSsl::SecureProtocols: // SslV2 will be disabled below
+     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
new file mode 100644
index 000000000000..7660dedc1630
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
@@ -0,0 +1,17 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-03-16 13:20:43.145899869 -0500
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bug while parsing some boost headers. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
new file mode 100644
index 000000000000..668f6ab4564e
--- /dev/null
+++ b/dev-qt/qtcore/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
+		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
+			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+		<flag name="systemd">Enable native journald logging support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
new file mode 100644
index 000000000000..86ae786cc2ce
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+glib iconv icu libressl qt3support ssl"
+
+DEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
+	icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	~dev-qt/qttranslations-${PV}
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/qt4/Qt/qconfig.h
+	/usr/include/qt4/QtCore/qconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
+	"${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/uic
+	src/corelib
+	src/network
+	src/xml
+	src/plugins/codecs/cn
+	src/plugins/codecs/jp
+	src/plugins/codecs/kr
+	src/plugins/codecs/tw
+	tools/linguist/lconvert
+	tools/linguist/lrelease
+	tools/linguist/lupdate"
+
+QCONFIG_DEFINE="QT_ZLIB"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+
+	# bug 427782
+	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
+	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
+		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
+		configure || die "sed configure setBootstrapVariable failed"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		$(qt_use qt3support)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtcore/qtcore-5.11.1.ebuild b/dev-qt/qtcore/qtcore-5.11.1.ebuild
new file mode 100644
index 000000000000..489161041fcf
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.11.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
new file mode 100644
index 000000000000..b772d996b0fb
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtcore/qtcore-5.9.6.ebuild b/dev-qt/qtcore/qtcore-5.9.6.ebuild
new file mode 100644
index 000000000000..1857d93cd0e5
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.9.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtdatavis3d-5.11.1 b/dev-qt/qtdatavis3d-5.11.1
deleted file mode 100644
index 5f9358798982..000000000000
--- a/dev-qt/qtdatavis3d-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.1[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] qml? ( ~dev-qt/qtdeclarative-5.11.1[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/dev-qt/qtdatavis3d-5.9.4 b/dev-qt/qtdatavis3d-5.9.4
deleted file mode 100644
index c432bc73138c..000000000000
--- a/dev-qt/qtdatavis3d-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdatavis3d-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/dev-qt/qtdatavis3d-5.9.6 b/dev-qt/qtdatavis3d-5.9.6
deleted file mode 100644
index 68b214a212a3..000000000000
--- a/dev-qt/qtdatavis3d-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.6[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.6[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtdatavis3d-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
new file mode 100644
index 000000000000..eaf1abf9a44b
--- /dev/null
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -0,0 +1,7 @@
+DIST qtdatavis3d-everywhere-src-5.11.1.tar.xz 5206688 BLAKE2B 2d5de648a9f80085f98902a8b086d5ce59c366c445b3ab80d313a537ae6b3d19924c886e4f2f3c0a219e874e4430c9327fde266e770b6ceb1f45e62f6a67aef4 SHA512 e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd
+DIST qtdatavis3d-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
+DIST qtdatavis3d-opensource-src-5.9.6.tar.xz 5162724 BLAKE2B b6211a06b5484ddcb81fbe0f676fd4866e2e7b586ad3cd732f080c66079a2cd2b9d53eef25c536cb887686363df3ff39272272e4db621faf28c04e68ac011147 SHA512 fc209e704010e8be5fd6600f86eab5e6b45acde16472589da4945a70db320a13cf282db566182cc546191d245d258a3a227d1bdcdebbc7c7ed31ea00b929d495
+EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
+EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
+EBUILD qtdatavis3d-5.9.6.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
+MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/metadata.xml b/dev-qt/qtdatavis3d/metadata.xml
new file mode 100644
index 000000000000..16d338334284
--- /dev/null
+++ b/dev-qt/qtdatavis3d/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild
new file mode 100644
index 000000000000..647770499acf
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild
new file mode 100644
index 000000000000..647770499acf
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild
new file mode 100644
index 000000000000..647770499acf
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdbus-4.8.7 b/dev-qt/qtdbus-4.8.7
deleted file mode 100644
index b66e0a213b12..000000000000
--- a/dev-qt/qtdbus-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The DBus module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acaa67c7ce4fd63265bb722e0b4aa5f6
diff --git a/dev-qt/qtdbus-5.11.1 b/dev-qt/qtdbus-5.11.1
deleted file mode 100644
index 03654155a0ed..000000000000
--- a/dev-qt/qtdbus-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b64ca343bce4d85931415fb5adba30b
diff --git a/dev-qt/qtdbus-5.9.4 b/dev-qt/qtdbus-5.9.4
deleted file mode 100644
index d0b591f755e4..000000000000
--- a/dev-qt/qtdbus-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=86377433d34bb75b5a9fcb111550ef85
diff --git a/dev-qt/qtdbus-5.9.6 b/dev-qt/qtdbus-5.9.6
deleted file mode 100644
index 45b1ff06c7a0..000000000000
--- a/dev-qt/qtdbus-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=44574f7041b4d30d9447645d82c34145
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
new file mode 100644
index 000000000000..67e0a88cb292
--- /dev/null
+++ b/dev-qt/qtdbus/Manifest
@@ -0,0 +1,11 @@
+AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 BLAKE2B c5db96f9b2b84e8da8ce82646ea8759f8bf39d0c73e92839b9a2bc5465a6e43ecf2a3dc7c7db5c56e3a7b4925368201c214bbc9b8155b37532d7dccfc2a4703a SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f
+AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06ab26ac14d94a88ee524ee9459d62e25b5d4e5f16d95a2ded69a1d257de4af8d2f304fbb3eaf5a0aa194aaef7322cb4f65debd283865c5b2475c SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f
+EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e
+EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad
+EBUILD qtdbus-5.9.6.ebuild 694 BLAKE2B 323aae794fc78509dfc345dc856ec3a36ae02b6b4a6d1f7728b55bdda1e52e1d0a8dc89d5fb49a77688d682a30a1f15d747bc0be730caedaad854bd97894764b SHA512 8390acf763b88167b67a2c61a64e415ac484c8d96db6c7a258c337874e38414d7b22a4028a73951d11e64e5a7dbfb53fe978793c9ab897c63ac809615700127c
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
new file mode 100644
index 000000000000..086eb47a071c
--- /dev/null
+++ b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
@@ -0,0 +1,11 @@
+--- src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
++++ src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
diff --git a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
new file mode 100644
index 000000000000..dd3a5a02298e
--- /dev/null
+++ b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
@@ -0,0 +1,14 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch	2012-09-06 02:33:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp	2012-09-11 08:55:29.854026815 -0500
+@@ -1109,8 +1109,10 @@ public:
+         // make sure this connection is running on the main thread
+         QCoreApplication *instance = QCoreApplication::instance();
+         if (!instance) {
++#ifndef QT_NO_DEBUG
+             qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
+                      type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
++#endif
+         } else if (QDBusConnectionPrivate::d(*this)) {
+             QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
+         }
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/qtdbus/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
new file mode 100644
index 000000000000..144c5dd6cad8
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/dbus
+	tools/qdbus/qdbus
+	tools/qdbus/qdbusxml2cpp
+	tools/qdbus/qdbuscpp2xml"
+
+QCONFIG_ADD="dbus dbus-linked"
+QCONFIG_DEFINE="QT_DBUS"
+
+multilib_src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
new file mode 100644
index 000000000000..b31a0a2f03dc
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
new file mode 100644
index 000000000000..961e906e5c81
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
new file mode 100644
index 000000000000..6f34e5cf5c9d
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative-4.8.7 b/dev-qt/qtdeclarative-4.8.7
deleted file mode 100644
index dea8f948ecb8..000000000000
--- a/dev-qt/qtdeclarative-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsvg-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt3support? ( ~dev-qt/qt3support-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The Declarative module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility qt3support webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsvg-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt3support? ( ~dev-qt/qt3support-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=146bff8ddc26c95b394e6dc1355280b0
diff --git a/dev-qt/qtdeclarative-5.11.1 b/dev-qt/qtdeclarative-5.11.1
deleted file mode 100644
index bd7085e4f824..000000000000
--- a/dev-qt/qtdeclarative-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qttest-5.11.1 localstorage? ( ~dev-qt/qtsql-5.11.1 ) widgets? ( ~dev-qt/qtwidgets-5.11.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtxmlpatterns-5.11.1 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qttest-5.11.1 localstorage? ( ~dev-qt/qtsql-5.11.1 ) widgets? ( ~dev-qt/qtwidgets-5.11.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtxmlpatterns-5.11.1 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f7e14083a7092837d217d585263d2e0c
diff --git a/dev-qt/qtdeclarative-5.9.4 b/dev-qt/qtdeclarative-5.9.4
deleted file mode 100644
index 29b718652be8..000000000000
--- a/dev-qt/qtdeclarative-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qttest-5.9.4 localstorage? ( ~dev-qt/qtsql-5.9.4 ) widgets? ( ~dev-qt/qtwidgets-5.9.4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtxmlpatterns-5.9.4 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qttest-5.9.4 localstorage? ( ~dev-qt/qtsql-5.9.4 ) widgets? ( ~dev-qt/qtwidgets-5.9.4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtxmlpatterns-5.9.4 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=eeb759766fe03c700a43ac04fab7cd30
diff --git a/dev-qt/qtdeclarative-5.9.6 b/dev-qt/qtdeclarative-5.9.6
deleted file mode 100644
index 09b4f9154cc9..000000000000
--- a/dev-qt/qtdeclarative-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qttest-5.9.6 localstorage? ( ~dev-qt/qtsql-5.9.6 ) widgets? ( ~dev-qt/qtwidgets-5.9.6[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtxmlpatterns-5.9.6 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qttest-5.9.6 localstorage? ( ~dev-qt/qtsql-5.9.6 ) widgets? ( ~dev-qt/qtwidgets-5.9.6[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtxmlpatterns-5.9.6 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtdeclarative-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6752b42e730a2040332ada126eac5c91
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
new file mode 100644
index 000000000000..2e3315a7ae82
--- /dev/null
+++ b/dev-qt/qtdeclarative/Manifest
@@ -0,0 +1,11 @@
+AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
+AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
+DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
+DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
+EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
+EBUILD qtdeclarative-5.11.1.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
+EBUILD qtdeclarative-5.9.4.ebuild 1323 BLAKE2B ca629dea8c113c90fc4e6da40be37bcc43d89fa240cd836eb162e70268f329c6050eabbacc00575ba22084639bcf9a577648c46f5dffe6be740806dd965f19a3 SHA512 a6ecf2a3c673529b97c08fe45596dc84b5378797c14c8afc8eb7ed48bf6013c8f70aee4948a6d7b7c16cfaf070d147f70473c7dd03f1fe4de9a2006977b1c175
+EBUILD qtdeclarative-5.9.6.ebuild 1387 BLAKE2B 6788c7c8d22a4444fcdea925a2d9df96db99914dd201a10ff29541220575264cdf2f5f91a905ed52e8261edfe5d0d2b39d3a01da6e4dc69bf945b9d3c335daa8 SHA512 dcf38a0ea32d466978a97ca1a54999160f381eb9b76b09a4840b58c1fa0d7cb7a26d6a2e4676ea27a44eca032103035d978edde606cacb417067c1a2cc753e0f
+MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
new file mode 100644
index 000000000000..7799ef71b7e4
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
@@ -0,0 +1,18 @@
+diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
+index 4b08194..224ddb1 100644
+--- a/src/qml/jsruntime/qv4global_p.h
++++ b/src/qml/jsruntime/qv4global_p.h
+@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
+ #    undef V4_ENABLE_JIT
+ #endif
+ #endif
+ 
++// Gentoo note: disable the JIT due to USE="-jit"
++#ifdef V4_ENABLE_JIT
++#undef V4_ENABLE_JIT
++#endif
++
+ // Do certain things depending on whether the JIT is enabled or disabled
+ 
+ #ifdef V4_ENABLE_JIT
+ #define ENABLE_YARR_JIT 1
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
new file mode 100644
index 000000000000..c2a143ecbeda
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
@@ -0,0 +1,59 @@
+From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 28 Mar 2018 00:24:56 +0100
+Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render
+ loop
+
+Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only
+deletes textures when all windows with pending updates have finished
+rendering.
+
+renderWindow will not process any window that is not visible. This
+leaves a logic bug that we can have the updatePending flag set but
+never cleared.
+
+If we have two windows, this leaves the other window still updating
+normally, but lastDirtyWindow will always be false and we never call
+endSync.
+
+This results in an effective memory leak of all textures.
+
+This patch resets the flag on hide() a move that can be considered safe
+given the show() method will reset this flag anyway.
+
+Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c
+Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
+Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
+Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
+Reviewed-by: Aleix Pol
+Reviewed-by: Andy Nichols <andy.nichols@qt.io>
+---
+ src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
+index 60f3538662..2eaed497ef 100644
+--- a/src/quick/scenegraph/qsgrenderloop.cpp
++++ b/src/quick/scenegraph/qsgrenderloop.cpp
+@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window)
+ {
+     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
+     cd->fireAboutToStop();
++    if (m_windows.contains(window))
++        m_windows[window].updatePending = false;
+ }
+ 
+ void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
+@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window)
+ 
+ void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window)
+ {
+-    if (!m_windows.contains(window))
++    QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
++    if (!cd->isRenderable() || !m_windows.contains(window))
+         return;
+ 
+     m_windows[window].updatePending = true;
+-- 
+2.16.3
+
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
new file mode 100644
index 000000000000..9afadffbfb11
--- /dev/null
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
+		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
+			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+		<flag name="webkit">Build the WebView QML component</flag>
+		<flag name="widgets">Enable QtWidgets support</flag>
+		<flag name="xml">Build the XmlListModel import for QtQuick (requires QtXmlPatterns)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
new file mode 100644
index 000000000000..267b79b445b8
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+accessibility qt3support webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/declarative
+	src/imports
+	src/plugins/qmltooling
+	tools/qml
+	tools/qmlplugindump"
+
+QCONFIG_ADD="declarative"
+QCONFIG_DEFINE="QT_DECLARATIVE"
+
+pkg_setup() {
+	use webkit && QT4_TARGET_DIRECTORIES+="
+		src/3rdparty/webkit/Source/WebKit/qt/declarative"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
new file mode 100644
index 000000000000..3da293ee8c4e
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 ~amd64-fbsd"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+COMMON_DEPEND="
+	~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="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	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
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
new file mode 100644
index 000000000000..4d887b297f23
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 ~amd64-fbsd"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+COMMON_DEPEND="
+	~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="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	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/qtdeclarative/qtdeclarative-5.9.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
new file mode 100644
index 000000000000..358689c3a3b6
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 ~amd64-fbsd"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+COMMON_DEPEND="
+	~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="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.5-texture-memleak.patch" )
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	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/qtdemo-4.8.7 b/dev-qt/qtdemo-4.8.7
deleted file mode 100644
index bb4aafd9e6ea..000000000000
--- a/dev-qt/qtdemo-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsvg-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qttest-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,webkit?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Demonstration module and examples for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=dbus declarative multimedia opengl phonon webkit xmlpatterns abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsvg-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qttest-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,webkit?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=896c70cef2df9a7e988a389d67b47908
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
new file mode 100644
index 000000000000..37c83857041b
--- /dev/null
+++ b/dev-qt/qtdemo/Manifest
@@ -0,0 +1,4 @@
+AUX qtdemo-4.6-plugandpaint.patch 609 BLAKE2B 0ac1483945e52ce7d2019a33133fedef7e18756b017bfe54960e338771d7190a8d6616ae645bece5c095c846862b27c6046c502744cb06143b82859cd53c8163 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+EBUILD qtdemo-4.8.7.ebuild 2539 BLAKE2B 86fc59dd509a41109256c86fe586eebcaf9074dd0d6217d447001d4c876a27daef183c5f8b18057a286c91eb8bde4c4a3070fa9d17bb8b9ca86f77b81a5d10be SHA512 cd0c4c7a142189168a21a475d2333d4c95e5ef9e94777380a413d9dc289fbe0808d216307cca689653aaf95be4a4fdd3f5bc5dbdf4e1afc5fe08f7ef186bb2bb
+MISC metadata.xml 961 BLAKE2B e06d3c13099a8ede112b65295260a234f682b2c4426c16420a1fa0f44f36a82185b842cdc02228214bf4eb99de29bb8167282ac84c2067db288aa6b1dab9b3b5 SHA512 f84f3400e4b556cc7eef2c1f21c3b443fd4e7eebe2c7733cb2bdede1d4ce5bc025c9a7bc8087ee731daa02a96c5cd4e96deb9e108962b4c731338db80891210e
diff --git a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch b/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch
new file mode 100644
index 000000000000..262996aa1068
--- /dev/null
+++ b/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro
+index 9616eb8..e188bc1 100644
+--- a/examples/tools/plugandpaint/plugandpaint.pro
++++ b/examples/tools/plugandpaint/plugandpaint.pro
+@@ -10,7 +10,7 @@ SOURCES        = main.cpp \
+ symbian {
+     LIBS           = -lpnp_basictools.lib
+ } else {
+-    LIBS           = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
++    LIBS           += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
+ }
+ 
+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
new file mode 100644
index 000000000000..288f9a8bd336
--- /dev/null
+++ b/dev-qt/qtdemo/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">Build QtDBus examples and demos</flag>
+		<flag name="declarative">Build QtDeclarative examples and demos</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="multimedia">Build QtMultimedia examples and demos</flag>
+		<flag name="opengl">Build QtOpenGL examples and demos</flag>
+		<flag name="phonon">Build Phonon examples and demos</flag>
+		<flag name="webkit">Build QtWebKit examples and demos</flag>
+		<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
new file mode 100644
index 000000000000..e8c4d393d6e1
--- /dev/null
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm ppc ppc64 x86"
+fi
+
+IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
+
+DEPEND="
+	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+QT4_TARGET_DIRECTORIES="
+	demos
+	examples"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# Array mapping USE flags to subdirs
+	local flags_subdirs_map=(
+		'dbus'
+		'declarative:declarative'
+		'multimedia:spectrum'
+		'opengl:boxes|glhypnotizer'
+		'phonon:mediaplayer'
+		'webkit:browser'
+		'xmlpatterns'
+	)
+
+	# Disable unwanted examples/demos
+	for flag in "${flags_subdirs_map[@]}"; do
+		if ! use ${flag%:*}; then
+			einfo "Disabling ${flag%:*} examples"
+			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
+				examples/examples.pro || die
+
+			if [[ ${flag} == *:* ]]; then
+				einfo "Disabling ${flag%:*} demos"
+				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
+					demos/demos.pro || die
+			fi
+		fi
+	done
+
+	# Remove bogus dependency on qt3support (bug 510042)
+	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
+		examples/graphicsview/graphicsview.pro || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_use dbus)
+		$(qt_use declarative)
+		$(qt_use multimedia) -no-audio-backend
+		$(qt_use opengl)
+		-no-openvg
+		$(qt_use phonon) -no-phonon-backend
+		$(qt_use webkit)
+		$(qt_use xmlpatterns)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtdiag-5.11.1 b/dev-qt/qtdiag-5.11.1
deleted file mode 100644
index cd6eaa3bab75..000000000000
--- a/dev-qt/qtdiag-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 network? ( ~dev-qt/qtnetwork-5.11.1[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 network? ( ~dev-qt/qtnetwork-5.11.1[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/dev-qt/qtdiag-5.9.4 b/dev-qt/qtdiag-5.9.4
deleted file mode 100644
index af1e5dda96bf..000000000000
--- a/dev-qt/qtdiag-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 network? ( ~dev-qt/qtnetwork-5.9.4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 network? ( ~dev-qt/qtnetwork-5.9.4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/dev-qt/qtdiag-5.9.6 b/dev-qt/qtdiag-5.9.6
deleted file mode 100644
index 313c825474cc..000000000000
--- a/dev-qt/qtdiag-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 network? ( ~dev-qt/qtnetwork-5.9.6[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 network? ( ~dev-qt/qtnetwork-5.9.6[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
new file mode 100644
index 000000000000..0ec3113e57cf
--- /dev/null
+++ b/dev-qt/qtdiag/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qtdiag-5.11.1.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
+EBUILD qtdiag-5.9.4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
+EBUILD qtdiag-5.9.6.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
+MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
new file mode 100644
index 000000000000..ca160995c703
--- /dev/null
+++ b/dev-qt/qtdiag/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="network">Report network information</flag>
+		<flag name="widgets">Report widget style information</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtdiag/qtdiag-5.11.1.ebuild b/dev-qt/qtdiag/qtdiag-5.11.1.ebuild
new file mode 100644
index 000000000000..85c0174e71a2
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.11.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdiag/qtdiag-5.9.4.ebuild b/dev-qt/qtdiag/qtdiag-5.9.4.ebuild
new file mode 100644
index 000000000000..85c0174e71a2
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdiag/qtdiag-5.9.6.ebuild b/dev-qt/qtdiag/qtdiag-5.9.6.ebuild
new file mode 100644
index 000000000000..85c0174e71a2
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.9.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects-5.11.1 b/dev-qt/qtgraphicaleffects-5.11.1
deleted file mode 100644
index ac75867b4afa..000000000000
--- a/dev-qt/qtgraphicaleffects-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=379988901174bbbe1ecd1dae36bb81f9
diff --git a/dev-qt/qtgraphicaleffects-5.9.4 b/dev-qt/qtgraphicaleffects-5.9.4
deleted file mode 100644
index d1b3e3640e21..000000000000
--- a/dev-qt/qtgraphicaleffects-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d08d2634e123bfc3d224e861a9ef75f3
diff --git a/dev-qt/qtgraphicaleffects-5.9.6 b/dev-qt/qtgraphicaleffects-5.9.6
deleted file mode 100644
index 1a60e35c9773..000000000000
--- a/dev-qt/qtgraphicaleffects-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtgraphicaleffects-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ec1d8f86c1e15b0412b50a6353fcfc24
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
new file mode 100644
index 000000000000..ebb4fbe85a98
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -0,0 +1,7 @@
+DIST qtgraphicaleffects-everywhere-src-5.11.1.tar.xz 14272760 BLAKE2B 079c4c22d222c8aae3e16a9b818ed792652692a6dce4c56afe404ba53a777e6d32afca00b2b03fee84010714d4a94dfa3ff257ab2fbb649fde4ba4a605cd72b0 SHA512 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297
+DIST qtgraphicaleffects-opensource-src-5.9.4.tar.xz 14480512 BLAKE2B 1ec184f4b42bdd775dbeaf627844670c0f6316469f269d66845c84286b21dff94badb50e2f5a7e0f4335db0b04b12e37ae2b220cfee950e3eadbd6a2c2efffb1 SHA512 efe4d0fc022bff8e9f20b1224ed624a9499bae069576db957dd73c1da98922cc98e4c1e556180bc3512215631116581d1f76030b11ac9ece4f29a64564fdc6b7
+DIST qtgraphicaleffects-opensource-src-5.9.6.tar.xz 14226968 BLAKE2B 1200c65dff266a27178bc9f30ba7717fbdf8d7d29bd25ac7edc2c45f62bfebf5748205933266edc0b3733b382f5596f513298786fb9e8e1f36a8de67ebfb946e SHA512 a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea
+EBUILD qtgraphicaleffects-5.11.1.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
+EBUILD qtgraphicaleffects-5.9.4.ebuild 447 BLAKE2B f072e4fc5a96c5915f39f9db34a5df078ce6a7ef0aa329e7c19cf0bc27f3988e89ac44e1d9b03936c60573ccbee43ea23942d65353ace51e53ef8d9172688def SHA512 8081f61362bd69b686b3e26e26da1e9c074f3196a48171d50f72d5e31204ab05584af5f7b6074e598709efde88e05821b665d8413de9a8f9547ea14f07b72a1c
+EBUILD qtgraphicaleffects-5.9.6.ebuild 450 BLAKE2B c2792d13de170efb73085fce1005446334aa085853a69df27df64ee299657cf010bc663580efe7b6ff71f67b9a383b716321bdb44b1080d973b8307b23232ba2 SHA512 7ed1224c3052402d5b621715857169d70b7e8f8fdb2c65b7d73d9a0e1215b85cb7d262ded4b55586db234d2f45930a6030bd7f3a5bfe75ec1c20a3f9fa1770ea
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/metadata.xml b/dev-qt/qtgraphicaleffects/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
new file mode 100644
index 000000000000..51a225a5a40d
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
new file mode 100644
index 000000000000..65b80f45cdd7
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
new file mode 100644
index 000000000000..f9cb4a981910
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~arm64 ~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-4.8.7 b/dev-qt/qtgui-4.8.7
deleted file mode 100644
index 941b91530b26..000000000000
--- a/dev-qt/qtgui-4.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.7[aqua=,debug=,glib=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.4.11-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xv? ( >=x11-libs/libXv-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtkstyle? ( >=x11-libs/cairo-1.12[-qt4(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23-r1:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mng? ( >=media-libs/libmng-1.0.10-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( elibc_glibc? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tiff? ( >=media-libs/tiff-4.0.3-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<dev-qt/qthelp-4.8.5:4 !aqua? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The GUI module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.7[aqua=,debug=,glib=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.4.11-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xv? ( >=x11-libs/libXv-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtkstyle? ( >=x11-libs/cairo-1.12[-qt4(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23-r1:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mng? ( >=media-libs/libmng-1.0.10-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( elibc_glibc? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tiff? ( >=media-libs/tiff-4.0.3-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<dev-qt/qthelp-4.8.5:4 dev-qt/qtchooser
-REQUIRED_USE=gtkstyle? ( glib )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz https://dev.gentoo.org/~pesa/patches/qtgui-systemtrayicon-plugin-system.patch
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3b6e2d49f934e0e285d40b0401030f1
diff --git a/dev-qt/qtgui-5.11.1 b/dev-qt/qtgui-5.11.1
deleted file mode 100644
index da5be9c75ce5..000000000000
--- a/dev-qt/qtgui-5.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.11.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.1 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.11.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.1 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2734f4f0010dfcc331006e3462e5b096
diff --git a/dev-qt/qtgui-5.9.4-r3 b/dev-qt/qtgui-5.9.4-r3
deleted file mode 100644
index d3070303ac1f..000000000000
--- a/dev-qt/qtgui-5.9.4-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 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-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 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-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=10da6291682a03124563d528e918a575
diff --git a/dev-qt/qtgui-5.9.6 b/dev-qt/qtgui-5.9.6
deleted file mode 100644
index 801f255856f7..000000000000
--- a/dev-qt/qtgui-5.9.6
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.6 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-5.9.6 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.9.6 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.6 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.6 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-5.9.6 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) 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-5.9.6 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.6 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=da153d45d48b8e03368d482f8699dc88
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
new file mode 100644
index 000000000000..f5d72e516c2e
--- /dev/null
+++ b/dev-qt/qtgui/Manifest
@@ -0,0 +1,16 @@
+AUX qtgui-4.7.3-cups.patch 3297 BLAKE2B 45c8668ffca24a7cfe9e02ec3fb3839f436470d55fb6f03a6a5890c7598bd3ec62c0bc62ecfd87ec530c210ef1c8e4d684c72109897ffe82456aa4225ce2b6ed SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee
+AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2b91532decab28969b392ae75c49860329e30018283f5206a367216027880e914e9a7ff4e16275fd364e8e99e52bacf460ecf6a637bb SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14
+AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517
+AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
+AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582
+AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
+EBUILD qtgui-4.8.7.ebuild 5502 BLAKE2B 13e6c5954107a56b929e32402307c352d417b6a41b71d1265fd35fec5534050637ed76707e33d040d26e6d66e863337802a9b3c4b5dc82ac11f78123b561bb8a SHA512 ebb51a68680d6c89ce16aa31378c59c9c66283cac71ecd970ba3998437303a936b601bef3292dc58c24dd63e0ca6a3e1a2945175901d3757a58f05f16edfc697
+EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 1f2d3da7a365d1e07421c53bdcbc4d6d88c663ff006a159c4b919a9a169469c142c69bb9c9d6fe9493d283d4d27a8ab855332fa6f41e0de83c66497963b16c8c SHA512 50de3da979c4679dda40e83369c967db1faf0dfba8cd386d2286d13e01745cad0b0f201d487a1c3da26dad4421f54455d2ea815134eadbef3183579a37a6aa79
+EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b
+EBUILD qtgui-5.9.6.ebuild 3556 BLAKE2B 1bbc9d70df37a4ffdf005486894e471734c6da609253cacf2be39be3e71e0155e82552a1d535e7c8a24aa7a80453a9b514af1df571dc2c2579302f7cb2e697aa SHA512 2506c338a7162dfe647a32bec17b0b8d4080db39e14b0718f6b394961eb4b1bbaa779f0f70831c4dd36d77e08b6451c1cfb3f766157de0860856adf345f7f5fd
+MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530
diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
new file mode 100644
index 000000000000..e0305e11b89a
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++    if (cups) {
++        const ppd_option_t* duplex = cups->ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                options.duplexShort->setChecked(true);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                options.duplexLong->setChecked(true);
++            else
++                options.noDuplex->setChecked(true);
++        }
++
++        if (cups->currentPPD()) {
++            // set default color
++            if (cups->currentPPD()->color_device)
++                options.color->setChecked(true);
++            else
++                options.grayscale->setChecked(true);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups->ppdOption("Collate");
++        if (collate)
++            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++    }
+ }
+ #endif
+ 
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+         setOutputFormat(QPrinter::PdfFormat);
+     }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++    // fill in defaults from ppd file
++    QCUPSSupport cups;
++
++    int printernum = -1;
++    for (int i = 0; i < cups.availablePrintersCount(); i++) {
++        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++            printernum = i;
++    }
++    if (printernum >= 0) {
++        cups.setCurrentPrinter(printernum);
++
++        const ppd_option_t* duplex = cups.ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                setDuplex(DuplexShortSide);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                setDuplex(DuplexLongSide);
++            else
++                setDuplex(DuplexNone);
++        }
++
++        if (cups.currentPPD()) {
++            // set default color
++            if (cups.currentPPD()->color_device)
++                setColorMode(Color);
++            else
++                setColorMode(GrayScale);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups.ppdOption("Collate");
++        if (collate)
++            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++    }
++#endif
+ }
+ 
+ /*!
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
new file mode 100644
index 000000000000..9a9f773537e4
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
@@ -0,0 +1,22 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check	2013-06-09 16:28:22.938840346 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-06-09 17:03:01.781125479 -0500
+@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
+         return;
+     }
+ 
+-    static QString themeName;
+-    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+-        themeName = getThemeName();
+-
+-        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+-            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
+-            // we cannot support the GTK_Qt Gtk engine
+-            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
+-            return;
+-        }
+-    }
+-
+     if (QGtkStylePrivate::gtk_init) {
+         // Gtk will set the Qt error handler so we have to reset it afterwards
+         x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
new file mode 100644
index 000000000000..d46f8c541872
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
@@ -0,0 +1,33 @@
+From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Mon, 16 Jun 2014 23:52:24 +1000
+Subject: Fix delay with QClipboard and useEventLoop.
+
+This manifests when using LibreOffice with KDE integration. When KFileDialog is
+open, the clipboard is repeatedly polled causing a visible delay since using
+QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard
+fetch.
+
+Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd
+Task-number: QTBUG-38585
+---
+ src/gui/kernel/qclipboard_x11.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
+index 14bf088..5f442b9 100644
+--- a/src/gui/kernel/qclipboard_x11.cpp
++++ b/src/gui/kernel/qclipboard_x11.cpp
+@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti
+                 return false;
+ 
+             XSync(X11->display, false);
+-            usleep(50000);
++            if (!XPending(X11->display))
++                usleep(5000);
+ 
+             now.start();
+ 
+-- 
+2.0.0
+
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
new file mode 100644
index 000000000000..b9adb8b2f623
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
@@ -0,0 +1,68 @@
+From d196036024697a75868c1f1626525710495ca428 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Thu, 23 Nov 2017 14:25:04 +0100
+Subject: [PATCH] Avoid providing bad pixelDeltas on X11
+
+With libinput we now get a hardcoded resolution that is unrelated to
+the hardware. So avoid using that as a real pixel delta and document
+pixel deltas as being driver specific and unreliable on X11.
+
+Task-number: QTBUG-59261
+Change-Id: I9fe86d80e7ccd290ed2e4091d7eafa52cb537d34
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+Reviewed-by: Marco Martin <mart@kde.org>
+Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
+---
+ src/gui/kernel/qevent.cpp                        |  1 +
+ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 14 ++++++++------
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
+index 06d52aa..c68f9af 100644
+--- a/src/gui/kernel/qevent.cpp
++++ b/src/gui/kernel/qevent.cpp
+@@ -971,6 +971,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
+     \li scrolling is about to begin, but the distance did not yet change (Qt::ScrollBegin),
+     \li or scrolling has ended and the distance did not change anymore (Qt::ScrollEnd).
+     \endlist
++    \note On X11 this value is driver specific and unreliable, use angleDelta() instead
+ */
+ 
+ /*!
+diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+index d1d97af..94f543f 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -953,10 +953,12 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
+                     double delta = scrollingDevice.lastScrollPosition.y() - value;
+                     scrollingDevice.lastScrollPosition.setY(value);
+                     angleDelta.setY((delta / scrollingDevice.verticalIncrement) * 120);
+-                    // We do not set "pixel" delta if it is only measured in ticks.
+-                    if (scrollingDevice.verticalIncrement > 1)
++                    // With most drivers the increment is 1 for wheels.
++                    // For libinput it is hardcoded to a useless 15.
++                    // For a proper touchpad driver it should be in the same order of magnitude as 120
++                    if (scrollingDevice.verticalIncrement > 15)
+                         rawDelta.setY(delta);
+-                    else if (scrollingDevice.verticalIncrement < -1)
++                    else if (scrollingDevice.verticalIncrement < -15)
+                         rawDelta.setY(-delta);
+                 }
+             }
+@@ -965,10 +967,10 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
+                     double delta = scrollingDevice.lastScrollPosition.x() - value;
+                     scrollingDevice.lastScrollPosition.setX(value);
+                     angleDelta.setX((delta / scrollingDevice.horizontalIncrement) * 120);
+-                    // We do not set "pixel" delta if it is only measured in ticks.
+-                    if (scrollingDevice.horizontalIncrement > 1)
++                    // See comment under vertical
++                    if (scrollingDevice.horizontalIncrement > 15)
+                         rawDelta.setX(delta);
+-                    else if (scrollingDevice.horizontalIncrement < -1)
++                    else if (scrollingDevice.horizontalIncrement < -15)
+                         rawDelta.setX(-delta);
+                 }
+             }
+-- 
+2.7.4
+
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
new file mode 100644
index 000000000000..2a447414c215
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
@@ -0,0 +1,87 @@
+From b63aeba4a88088c7de61c1664a510c02d38ade84 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <alarrosa@suse.com>
+Date: Fri, 16 Feb 2018 13:18:42 +0100
+Subject: [PATCH] opengl: Bail if cached shader fails to load
+
+QOpenGLProgramBinaryCache::setProgramBinary() should check
+GL_LINK_STATUS after glProgramBinary(), but doesn't.
+
+In practice, this means that SDDM is a white screen, and KDE is just
+a gray task bar.
+
+So far, Qt tries to check this using its internal ::link() function.
+But in case the cached binary fails to load, Qt currently attempts to
+link the inexistent program, resulting in a zero-length, fixed
+pipeline shader.
+
+Checking this already in ::setProgramBinary() makes the call to
+::link() superfluous, so we remove that as well.
+
+Done-with: Max Staudt <mstaudt@suse.com>
+Done-with: Michal Srb <msrb@suse.com>
+Done-with: Fabian Vogt <fvogt@suse.de>
+Task-number: QTBUG-66420
+Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82
+Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf)
+---
+ src/gui/opengl/qopenglprogrambinarycache.cpp | 20 ++++++++++++++++++--
+ src/gui/opengl/qopenglshaderprogram.cpp      |  8 +-------
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
+index 06373e1..d16173d 100644
+--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
++++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
+@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
+     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
+     while (funcs->glGetError() != GL_NO_ERROR) { }
+     funcs->glProgramBinary(programId, blobFormat, p, blobSize);
+-    int err = funcs->glGetError();
++
++    GLenum err = funcs->glGetError();
++    if (err != GL_NO_ERROR) {
++        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
++                                  "format 0x%x, err = 0x%x",
++                programId, blobSize, blobFormat, err);
++        return false;
++    }
++    GLint linkStatus = 0;
++    funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
++    if (linkStatus != GL_TRUE) {
++        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
++                                  "format 0x%x, linkStatus = 0x%x, err = 0x%x",
++                programId, blobSize, blobFormat, linkStatus, err);
++        return false;
++    }
++
+     qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
+             programId, blobSize, blobFormat, err);
+-    return err == 0;
++    return true;
+ }
+ 
+ #ifdef Q_OS_UNIX
+diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
+index cc8af16..3b82bac 100644
+--- a/src/gui/opengl/qopenglshaderprogram.cpp
++++ b/src/gui/opengl/qopenglshaderprogram.cpp
+@@ -3824,13 +3824,7 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
+     bool needsCompile = true;
+     if (binCache.load(cacheKey, q->programId())) {
+         qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
+-        linkBinaryRecursion = true;
+-        bool ok = q->link();
+-        linkBinaryRecursion = false;
+-        if (ok)
+-            needsCompile = false;
+-        else
+-            qCDebug(DBG_SHADER_CACHE, "Link failed after glProgramBinary");
++        needsCompile = false;
+     }
+ 
+     bool needsSave = false;
+-- 
+2.7.4
+
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
new file mode 100644
index 000000000000..60d2ec424f47
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
@@ -0,0 +1,170 @@
+From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Sun, 7 Jan 2018 13:02:01 +0900
+Subject: [PATCH] QSimpleDrag: Fix mouse release coords for delayed event
+ transmission
+
+On platforms such as XCB, the drag cursor pixmap is shown via a window
+(a QShapedPixmapWindow) under the cursor.
+
+The mouse button release event at the end of the drag is received in
+this QXcbWindow, but intercepted by an event filter that QSimpleDrag
+installs on the QApplication. It then resends it unmodified(!) after
+the drag has ended and the drag pixmap window destroyed, causing it to
+be delivered to the new top-level window.
+
+The local coordinates in the unmodified QMouseEvent are local to the
+drag pixmap window and don't match the window it is delayed-transmitted
+to.
+
+This ends up having fatal, user-visible effects particularly in Qt
+Quick: QQuickWindow synthesizes a hover event once per frame using
+the last received mouse coordinates, here: the release posted by
+QSimpleDrag. This is done to update the hover event state for items
+under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea::
+containsMouse). The bogus event coordinates in the release event then
+usually end up causing an item near the top-left of the QQuickWindow
+to assume it is hovered (because drag pixmap windows tend to be small),
+even when the mouse cursor is actually far away from it at the end of
+the drag.
+
+This shows up e.g. in the Plasma 5 desktop, where dragging an icon
+on the desktop will cause the icon at the top-left of the screen (if
+any) to switch to hovered state, as the release coordinates on the
+drag pixmap window (showing a dragged icon) fall into the geometry
+of the top-left icon.
+
+QSimpleDrag contains a topLevelAt() function to find the top-level
+window under the global cursor coordinates that is not the drag
+pixmap window. This is used by the drop event delivery code.
+
+This patch uses this function to find the relevant top-level window,
+then asks it to map the global cusor coordinates to its local
+coordinate system, then synthesizes a new QMouseEvent with local
+coordinates computed in this fashion. As a result the window now
+gets a release event with coordinates that make sense and are
+correct.
+
+Task-number: QTBUG-66103
+Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d
+Reviewed-by: Eike Hein <hein@kde.org>
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+---
+ src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++-----
+ src/gui/kernel/qsimpledrag_p.h |  6 +++---
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
+index a1e25dc..87d3ba5 100644
+--- a/src/gui/kernel/qsimpledrag.cpp
++++ b/src/gui/kernel/qsimpledrag.cpp
+@@ -58,6 +58,7 @@
+ 
+ #include <QtCore/QEventLoop>
+ #include <QtCore/QDebug>
++#include <QtCore/QLoggingCategory>
+ 
+ #include <private/qguiapplication_p.h>
+ #include <private/qdnd_p.h>
+@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE
+ 
+ #ifndef QT_NO_DRAGANDDROP
+ 
++Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
++
+ static QWindow* topLevelAt(const QPoint &pos)
+ {
+     QWindowList list = QGuiApplication::topLevelWindows();
+@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos)
+ */
+ 
+ QBasicDrag::QBasicDrag() :
+-    m_restoreCursor(false), m_eventLoop(0),
++    m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr),
+     m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false),
+-    m_drag(0), m_drag_icon_window(0), m_useCompositing(true),
+-    m_screen(Q_NULLPTR)
++    m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true),
++    m_screen(nullptr)
+ {
+ }
+ 
+@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
+             return true; // Eat all mouse move events
+         }
+         case QEvent::MouseButtonRelease:
++        {
+             disableEventFilter();
+             if (canDrop()) {
+                 QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window);
+@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
+                 cancel();
+             }
+             exitDndEventLoop();
+-            QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e)));
++
++            // If a QShapedPixmapWindow (drag feedback) is being dragged along, the
++            // mouse event's localPos() will be relative to that, which is useless.
++            // We want a position relative to the window where the drag ends, if possible (?).
++            // If there is no such window (belonging to this Qt application),
++            // make the event relative to the window where the drag started. (QTBUG-66103)
++            const QMouseEvent *release = static_cast<QMouseEvent *>(e);
++            const QWindow *releaseWindow = topLevelAt(release->globalPos());
++            qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos();
++            if (!releaseWindow)
++                releaseWindow = m_current_window;
++            QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos());
++            QMouseEvent *newRelease = new QMouseEvent(release->type(),
++                releaseWindowPos, releaseWindowPos, release->screenPos(),
++                release->button(), release->buttons(),
++                release->modifiers(), release->source());
++            QCoreApplication::postEvent(o, newRelease);
+             return true; // defer mouse release events until drag event loop has returned
++        }
+         case QEvent::MouseButtonDblClick:
+         case QEvent::Wheel:
+             return true;
+@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
+     into account.
+ */
+ 
+-QSimpleDrag::QSimpleDrag() : m_current_window(0)
++QSimpleDrag::QSimpleDrag()
+ {
+ }
+ 
+@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag()
+         updateCursor(Qt::IgnoreAction);
+     }
+     setExecutedDropAction(Qt::IgnoreAction);
++    qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop();
+ }
+ 
+ void QSimpleDrag::cancel()
+diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
+index 0b8a0bc..bbd7f7f 100644
+--- a/src/gui/kernel/qsimpledrag_p.h
++++ b/src/gui/kernel/qsimpledrag_p.h
+@@ -105,6 +105,9 @@ protected:
+ 
+     QDrag *drag() const { return m_drag; }
+ 
++protected:
++    QWindow *m_current_window;
++
+ private:
+     void enableEventFilter();
+     void disableEventFilter();
+@@ -132,9 +135,6 @@ protected:
+     virtual void cancel() Q_DECL_OVERRIDE;
+     virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
+     virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
+-
+-private:
+-    QWindow *m_current_window;
+ };
+ 
+ #endif // QT_NO_DRAGANDDROP
+-- 
+2.7.4
+
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
new file mode 100644
index 000000000000..ef12478e668a
--- /dev/null
+++ b/dev-qt/qtgui/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="egl">Enable EGL integration</flag>
+		<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="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</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="qt3support">Enable the Qt3Support libraries for Qt4. Note that
+			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+		<flag name="trace">Build the 'trace' graphicssystem engine which allows to record
+			all drawing operations into a trace buffer. The trace can be replayed
+			later with the qttracereplay tool.</flag>
+		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
+		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
+		<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
new file mode 100644
index 000000000000..79f95bf77ea1
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+
+REQUIRED_USE="
+	gtkstyle? ( glib )
+"
+
+# cairo[-qt4] is needed because of bug 454066
+RDEPEND="
+	app-eselect/eselect-qtgraphicssystem
+	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+	!aqua? (
+		>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] )
+		xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	gtkstyle? (
+		>=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
+	)
+	mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
+	nis? ( elibc_glibc? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] ) )
+	tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
+	!<dev-qt/qthelp-4.8.5:4
+"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )
+"
+PDEPEND="
+	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
+	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
+	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
+	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/gui
+	src/scripttools
+	src/plugins/imageformats/gif
+	src/plugins/imageformats/ico
+	src/plugins/imageformats/jpeg
+	src/plugins/imageformats/tga
+	src/plugins/inputmethods"
+
+pkg_setup() {
+	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
+	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
+	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
+
+	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+	QCONFIG_ADD="
+		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig system-freetype gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
+		$(use mng && echo system-mng)
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG QT_FREETYPE
+			$(use gtkstyle && echo QT_STYLE_GTK)
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
+			$(use xinerama && echo QT_XINERAMA)
+			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+			$(use xv && echo QT_XVIDEO)"
+}
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# Add -xvideo to the list of accepted configure options
+	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	dodir /usr/share/qt4/graphicssystems
+	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+	if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
+		newicon tools/qtconfig/images/appicon.png qtconfig.png
+		make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+	fi
+}
+
+pkg_postinst() {
+	qt4-build-multilib_pkg_postinst
+
+	# raster is the default graphicssystem, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+}
diff --git a/dev-qt/qtgui/qtgui-5.11.1.ebuild b/dev-qt/qtgui/qtgui-5.11.1.ebuild
new file mode 100644
index 000000000000..c8309dc2e2d6
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.11.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +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.6.0:=
+	>=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 )
+	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:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=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/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+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
+	!: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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+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)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.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)
+		-gui
+		-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' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
new file mode 100644
index 000000000000..33dfa6703cc0
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +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 )
+	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:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103
+	"${FILESDIR}/${P}-libinput-pixeldelta.patch" # QTBUG-59261
+	"${FILESDIR}/${P}-opengl.patch" # QTBUG-66420
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+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
+	!: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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+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)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.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)
+		-gui
+		-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' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.9.6.ebuild b/dev-qt/qtgui/qtgui-5.9.6.ebuild
new file mode 100644
index 000000000000..1b9ac1d6d99e
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.9.6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +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 )
+	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:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=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
+)
+
+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
+	!: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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+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)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.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)
+		-gui
+		-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' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp-4.8.7 b/dev-qt/qthelp-4.8.7
deleted file mode 100644
index e3fe9f61dba9..000000000000
--- a/dev-qt/qthelp-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] compat? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The Help module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=compat doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] compat? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz compat? ( http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6d62e02fd1a2f7bb99e9c3205f956b5
diff --git a/dev-qt/qthelp-5.11.1 b/dev-qt/qthelp-5.11.1
deleted file mode 100644
index 8064ea7aba54..000000000000
--- a/dev-qt/qthelp-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtsql-5.11.1[sqlite] ~dev-qt/qtwidgets-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e785501ca5cabe1d612a5aeda613dbac
diff --git a/dev-qt/qthelp-5.9.4 b/dev-qt/qthelp-5.9.4
deleted file mode 100644
index 7511b590d938..000000000000
--- a/dev-qt/qthelp-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=46a44e470312fd041a87229ec533c042
diff --git a/dev-qt/qthelp-5.9.6 b/dev-qt/qthelp-5.9.6
deleted file mode 100644
index 41075ffb565d..000000000000
--- a/dev-qt/qthelp-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtsql-5.9.6[sqlite] ~dev-qt/qtwidgets-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtsql-5.9.6[sqlite] ~dev-qt/qtwidgets-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bf1f8a0b80933918983f372357df9213
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
new file mode 100644
index 000000000000..bdc4bd77f117
--- /dev/null
+++ b/dev-qt/qthelp/Manifest
@@ -0,0 +1,13 @@
+AUX qthelp-4.8.6-compat-install.patch 899 BLAKE2B c79463971979a10c05e792593b66bab186c091ed9e983c982c389ce517cda973d49a8f3d7685dc3242a3ddbab00284c1c503cd3e65aeb7e1dac9dbe7dee191a9 SHA512 dc960f735a92a8bfa7a10e2c898eeb1dbdbf273cf342af3b0924240a1f3bc15694e86679b0f6cbd28f24246bfad3a5d799a6f383503deafa5b4adeb368a69158
+AUX qthelp-4.8.6-compat-syncqt.patch 884 BLAKE2B 25cb103e5c013c262d8c99cf21218083dbee6edd56203ee61a4acf637930c72d63b6428eac45ae6cf5e74ddee9a45c5d34e635712e97e7cb33260e8cc0295c54 SHA512 ee18303ca95569a66b1680f10a65766d67caca33928eb5d4f7ae2a4ffa883caa32dcb4adf7f48536e5bf78dcc26d30521c1309e9dfb0226284322220895ec20a
+DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb
+DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
+EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
+EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b
+EBUILD qthelp-5.9.6.ebuild 651 BLAKE2B ef83842daeb168cf67c9bfe4e902d2f7760453b383341ac20838a94c825fc0c4b442813740e1835e9c6ed5b8c84083e72c23eacc0734e5d40178484da30352d3 SHA512 e1493eb2e9fd1eaa01fb9dfbc6d98d4c47fe22ddfed6d56b687c385914e36e7ddc84cfd9972cfef150335ed7ad39b3d60b6ee4ac2282efef2e287299a0003cdb
+MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
new file mode 100644
index 000000000000..e157381c8f05
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
@@ -0,0 +1,35 @@
+From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 23:21:54 +0200
+Subject: [PATCH] Install assistant_adp binary.
+
+---
+ tools/assistant/compat/compat.pro | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..a14e3f8 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+     TARGET = Assistant_adp
+ }
+ 
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+     translations/assistant_adp_ja.ts \
+     translations/assistant_adp_pl.ts \
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
new file mode 100644
index 000000000000..4ba6b6ff7417
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
@@ -0,0 +1,25 @@
+From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 22:44:57 +0200
+Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
+---
+ bin/syncqt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index dd94d4d..cc5a7bf 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
+         "ActiveQt" => "$basedir/src/activeqt",
+         "QtTest" => "$basedir/src/testlib",
+         "QtHelp" => "$basedir/tools/assistant/lib",
++        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+         "QtDesigner" => "$basedir/tools/designer/src/lib",
+         "QtUiTools" => "$basedir/tools/designer/src/uitools",
+         "QtDBus" => "$basedir/src/dbus",
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
new file mode 100644
index 000000000000..a1b560594940
--- /dev/null
+++ b/dev-qt/qthelp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="compat">Build the extra compatibility layer required by a few packages, see
+			http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
new file mode 100644
index 000000000000..0587f38e146e
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-4.8.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+		https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
+	)"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+fi
+
+IUSE="compat doc"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+	compat? (
+		~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	tools/assistant/lib/fulltextsearch
+	tools/assistant/lib
+	tools/assistant/tools/qhelpgenerator
+	tools/assistant/tools/qcollectiongenerator
+	tools/assistant/tools/qhelpconverter
+	tools/qdoc3"
+
+pkg_setup() {
+	use compat && QT4_TARGET_DIRECTORIES+="
+		tools/assistant/compat
+		tools/assistant/compat/lib"
+}
+
+src_unpack() {
+	qt4-build-multilib_src_unpack
+
+	# compat version
+	# http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	if use compat; then
+		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
+		find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die
+	fi
+}
+
+src_prepare() {
+	use compat && PATCHES+=(
+		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
+		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
+	)
+
+	qt4-build-multilib_src_prepare
+
+	# prevent rebuild of QtCore and QtXml (bug 348034)
+	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
+		-no-nas-sound -no-cups -no-nis -fontconfig
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_compile() {
+	qt4_multilib_src_compile
+
+	# release tarballs are shipped with prebuilt docs
+	if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
+		# qhelpgenerator needs libQtHelp.so.4
+		export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+		export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
+		emake docs
+	fi
+}
+
+multilib_src_install() {
+	qt4_multilib_src_install
+
+	if multilib_is_native_abi; then
+		emake INSTALL_ROOT="${D}" install_qchdocs
+		use doc && emake INSTALL_ROOT="${D}" install_htmldocs
+
+		# do not compress .qch files
+		docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
+	fi
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	if use compat; then
+		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf
+	fi
+}
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
new file mode 100644
index 000000000000..1e0ee9ab67fe
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qthelp/qthelp-5.9.4.ebuild b/dev-qt/qthelp/qthelp-5.9.4.ebuild
new file mode 100644
index 000000000000..fdda00079f8c
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+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/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qthelp/qthelp-5.9.6.ebuild b/dev-qt/qthelp/qthelp-5.9.6.ebuild
new file mode 100644
index 000000000000..76e1db65cd83
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats-5.11.1 b/dev-qt/qtimageformats-5.11.1
deleted file mode 100644
index 4e09e82c9b45..000000000000
--- a/dev-qt/qtimageformats-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=30de7f78795a3cf32bbc4e02a68add81
diff --git a/dev-qt/qtimageformats-5.9.4 b/dev-qt/qtimageformats-5.9.4
deleted file mode 100644
index fb470b6c783f..000000000000
--- a/dev-qt/qtimageformats-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f700d5e2bd993f22faea432da341deeb
diff --git a/dev-qt/qtimageformats-5.9.6 b/dev-qt/qtimageformats-5.9.6
deleted file mode 100644
index ba0e98567806..000000000000
--- a/dev-qt/qtimageformats-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtimageformats-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=406a76ddad8f596700a083701dcb092d
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
new file mode 100644
index 000000000000..afe8fb9f0fd8
--- /dev/null
+++ b/dev-qt/qtimageformats/Manifest
@@ -0,0 +1,7 @@
+DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
+DIST qtimageformats-opensource-src-5.9.4.tar.xz 2106852 BLAKE2B 31f0f5d6c545f04b2be4bd657acce63adb15a45d4b0471b249e39063ae47635a8c5338f44cc0af88ca0c960d399384a911add12f7cd2815c808ddc28d7f5e924 SHA512 91ebe0d4cc67b3d3c55da4dd5d08028f7046819fdc4034ed0ddec075443ebe3775690856a7aa7704ee3ad8893948f79bdc72467fdfea6a0a8ce6fb16b3f5ab5a
+DIST qtimageformats-opensource-src-5.9.6.tar.xz 2107828 BLAKE2B bbea8e01d7c7e4510c35a6322f72c9b531daa844745e5ea007bdc516f60bf72de48a5aa18e7209b6b25da189362b4db8be5fa3d4e8addc90f407a3879b7cc69d SHA512 c6470c1486ae9b0bc3c846c1de6ffa294810aca20ca90d9d5f40a257a7e339ff58aeafd5f76324e6939d71889044eebc48b8b001f2027dbabd15f7eeb8d8bdf8
+EBUILD qtimageformats-5.11.1.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
+EBUILD qtimageformats-5.9.4.ebuild 600 BLAKE2B 39cf7f793293f6096eceaa89c41425b4ecb88cb063e5d1c44d0e42e2f4b183cc94e6f1638961296cec7974fb2ee3b20345d3d444ec8f4ae0b7644d084c5205c4 SHA512 aadcee78707fca3ca8fc643fe48b32f0b9fda320ddaec62766ab012fc0e7b9eeb43f4dfe384b2eb302421f56d87e1b7576b52acedadde039ff3349cb8564314f
+EBUILD qtimageformats-5.9.6.ebuild 602 BLAKE2B 65170d910f59a69b0312363cbc50bf56f89be79000cf96784fb61660e755424571dff74f84f9d0e2fd8327e25311a75b7d205f04f504e712f94db0dac5e8e804 SHA512 3fef6cec3bbd6530ae8b1ad9ab4068514446e9c271113587b3ba5abf06447767adee4dde4bc4209a7b5a3da6dc13e5d3d9dd64d11bd95810cb3d9d534a4f337a
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtimageformats/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
new file mode 100644
index 000000000000..5b10805b2ac2
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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="jpeg2k mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	jpeg2k? ( media-libs/jasper:= )
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	qt_use_compile_test jpeg2k jasper
+	qt_use_compile_test mng libmng
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
new file mode 100644
index 000000000000..e1a31be8ab9c
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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="jpeg2k mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	jpeg2k? ( media-libs/jasper:= )
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	qt_use_compile_test jpeg2k jasper
+	qt_use_compile_test mng libmng
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
new file mode 100644
index 000000000000..4793e891a74b
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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="jpeg2k mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	jpeg2k? ( media-libs/jasper:= )
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	qt_use_compile_test jpeg2k jasper
+	qt_use_compile_test mng libmng
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation-5.11.1 b/dev-qt/qtlocation-5.11.1
deleted file mode 100644
index 77e3129f588f..000000000000
--- a/dev-qt/qtlocation-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtpositioning-5.11.1 ~dev-qt/qtsql-5.11.1 sys-libs/zlib ~dev-qt/qtconcurrent-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=The Location module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtpositioning-5.11.1 ~dev-qt/qtsql-5.11.1 sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c7083a2d84f0b31591195e3020bada06
diff --git a/dev-qt/qtlocation-5.9.4 b/dev-qt/qtlocation-5.9.4
deleted file mode 100644
index 167e72c7df28..000000000000
--- a/dev-qt/qtlocation-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtpositioning-5.9.4 ~dev-qt/qtsql-5.9.4 sys-libs/zlib ~dev-qt/qtconcurrent-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=The Location module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtpositioning-5.9.4 ~dev-qt/qtsql-5.9.4 sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e2b62e0dad108f42c52cee3f5e89d63f
diff --git a/dev-qt/qtlocation-5.9.6 b/dev-qt/qtlocation-5.9.6
deleted file mode 100644
index a3528f22443e..000000000000
--- a/dev-qt/qtlocation-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtpositioning-5.9.6 ~dev-qt/qtsql-5.9.6 sys-libs/zlib ~dev-qt/qtconcurrent-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=The Location module for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtpositioning-5.9.6 ~dev-qt/qtsql-5.9.6 sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtlocation-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6317e91a68707c839b1ccb46d0cdfdc3
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
new file mode 100644
index 000000000000..c53b8561558b
--- /dev/null
+++ b/dev-qt/qtlocation/Manifest
@@ -0,0 +1,7 @@
+DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
+DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
+DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
+EBUILD qtlocation-5.11.1.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
+EBUILD qtlocation-5.9.4.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
+EBUILD qtlocation-5.9.6.ebuild 923 BLAKE2B b5f50e4e0f362c1ff6bfd935bbfa6cdba6b6cde7af05aacd7032c15bdabee467843c61bdf5c541044b3ccb06b84c74e043e47df0cc11c63c691bf8a3137295bf SHA512 a06c04232e8231f0fe15212e3f937d648ed086e459979c645039b248f2ff80a9553397d555bbfbb806a7ca1c8b7bbc81a8735f8405c73387a820227b49ee6423
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtlocation/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtlocation/qtlocation-5.11.1.ebuild b/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
new file mode 100644
index 000000000000..f791b5b325e3
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~arm64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/qtlocation-5.9.4.ebuild b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
new file mode 100644
index 000000000000..f228e74b4fed
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~arm64 x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/qtlocation-5.9.6.ebuild b/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
new file mode 100644
index 000000000000..a97985c85295
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~arm64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlockedfile-2.4.1_p20171024 b/dev-qt/qtlockedfile-2.4.1_p20171024
deleted file mode 100644
index fe6c171444c9..000000000000
--- a/dev-qt/qtlockedfile-2.4.1_p20171024
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=QFile extension with advisory locking functions
-EAPI=6
-HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
-IUSE=doc
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=30e63bcb2c5eb1eafb2183a0ceffac11
diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
new file mode 100644
index 000000000000..c72657021fe5
--- /dev/null
+++ b/dev-qt/qtlockedfile/Manifest
@@ -0,0 +1,4 @@
+AUX qtlockedfile.prf 190 BLAKE2B 254ba3ddc3708c72fdefa5f3a0be26f33752c7a00edbefebc46b8e39ae967064348bcf9e0b946428421d2c232a3d612838e7003352eb489f01a2597928ed4404 SHA512 efd51aa88a40ad5615d3ae9122a360997a3d32e3f212e7d9c1c2cf9e42984a1e4b9ccff02c6ddc1e8926104527004536ad848c5ef24bc28a93eb556d99235696
+DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
+EBUILD qtlockedfile-2.4.1_p20171024.ebuild 1064 BLAKE2B 1d919d3fe4e56ce14ad719db2b8ba8836a11775123dae4d50346712dfb8a9617b52a5c6f939729c2dd0b2c55c19bdf333cb6ba2dc19e66f7dedcbe8c1a186484 SHA512 8f3bcbef0cf63dac01b434361413a47d006cc9af22459ab3c30a88a646315c3dfc4c1dc7e4c91aad881b45f695f63f05e82b9592e113a2433a80906450ec849b
+MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtlockedfile/files/qtlockedfile.prf b/dev-qt/qtlockedfile/files/qtlockedfile.prf
new file mode 100644
index 000000000000..93d656e69586
--- /dev/null
+++ b/dev-qt/qtlockedfile/files/qtlockedfile.prf
@@ -0,0 +1,6 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_LockedFile-2.4
+} else {
+LIBS *= -lQtSolutions_LockedFile-2.4
+}
diff --git a/dev-qt/qtlockedfile/metadata.xml b/dev-qt/qtlockedfile/metadata.xml
new file mode 100644
index 000000000000..17237689dcfd
--- /dev/null
+++ b/dev-qt/qtlockedfile/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
new file mode 100644
index 000000000000..aecc05cf2149
--- /dev/null
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="QFile extension with advisory locking functions"
+HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
+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"
+IUSE="doc"
+
+DEPEND="dev-qt/qtcore:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_prepare() {
+	default
+
+	echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+	echo 'QT -= gui' >> src/qtlockedfile.pri
+
+	sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+	sed -i -e '/SUBDIRS+=example/d' ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+
+	# libraries
+	dolib.so lib/*
+
+	# headers
+	insinto "$(qt5_get_headerdir)"/QtSolutions
+	doins src/QtLockedFile src/${PN}.h
+
+	# .prf files
+	insinto "$(qt5_get_mkspecsdir)"/features
+	doins "${FILESDIR}"/${PN}.prf
+}
diff --git a/dev-qt/qtmultimedia-4.8.7 b/dev-qt/qtmultimedia-4.8.7
deleted file mode 100644
index 02ac8eef4343..000000000000
--- a/dev-qt/qtmultimedia-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The Multimedia module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=baa34dbdb77b7de4e798dc0bae03bed5
diff --git a/dev-qt/qtmultimedia-5.11.1 b/dev-qt/qtmultimedia-5.11.1
deleted file mode 100644
index 9f4fd78c8916..000000000000
--- a/dev-qt/qtmultimedia-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 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-5.11.1 gles2? ( ~dev-qt/qtgui-5.11.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.1 ~dev-qt/qtwidgets-5.11.1[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtnetwork-5.11.1 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-5.11.1 gles2? ( ~dev-qt/qtgui-5.11.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.1 ~dev-qt/qtwidgets-5.11.1[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=111db119313cc09d011437430a162f6d
diff --git a/dev-qt/qtmultimedia-5.9.4-r1 b/dev-qt/qtmultimedia-5.9.4-r1
deleted file mode 100644
index c45665c77334..000000000000
--- a/dev-qt/qtmultimedia-5.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 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-5.9.4 gles2? ( ~dev-qt/qtgui-5.9.4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.4 ~dev-qt/qtwidgets-5.9.4[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 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-5.9.4 gles2? ( ~dev-qt/qtgui-5.9.4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.4 ~dev-qt/qtwidgets-5.9.4[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f6aaae7622ceed96711d0d7a87c1d9d1
diff --git a/dev-qt/qtmultimedia-5.9.6 b/dev-qt/qtmultimedia-5.9.6
deleted file mode 100644
index 071873548c22..000000000000
--- a/dev-qt/qtmultimedia-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtnetwork-5.9.6 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-5.9.6 gles2? ( ~dev-qt/qtgui-5.9.6[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.6 ~dev-qt/qtwidgets-5.9.6[gles2=] ) gstreamer? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtnetwork-5.9.6 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-5.9.6 gles2? ( ~dev-qt/qtgui-5.9.6[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.6 ~dev-qt/qtwidgets-5.9.6[gles2=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtmultimedia-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bf1f283513489bb0c3e449e403df268a
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
new file mode 100644
index 000000000000..afdb29eec404
--- /dev/null
+++ b/dev-qt/qtmultimedia/Manifest
@@ -0,0 +1,11 @@
+AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4
+AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
+DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
+DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
+EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
+EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
+EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
+EBUILD qtmultimedia-5.9.6.ebuild 1449 BLAKE2B 1b08fa5e1abc5fd5350f8d2d2200e0684ab3df4751318fbbca21168fe89dbd2a31b069cfbee06f3a545b45032293296e3b83d44bdcfe7f9cc30ec03ae77b863d SHA512 dee126b3d0c9c0dec01d25362d3ac357f97259980bbf08daa12d14d779d9b5d3d6fb7922f6a59197cc7e5f962710d464bcf9a44155664a42969d2e7bce287753
+MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
new file mode 100644
index 000000000000..8bd40edb1e80
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
@@ -0,0 +1,25 @@
+--- qt-everywhere-opensource-src-4.8.0.orig/configure	2012-03-13 00:45:02.502205702 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure	2012-03-13 00:47:40.386231881 +0100
+@@ -1049,7 +1049,7 @@
+         VAL=no
+         ;;
+     #Qt style yes options
+-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         VAL=yes
+         ;;
+@@ -2399,6 +2399,13 @@
+         else
+             UNKNOWN_OPT=yes
+         fi
++        ;;
++    alsa)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_ALSA="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
+         ;;
+     *)
+         UNKNOWN_OPT=yes
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
new file mode 100644
index 000000000000..6a040b2d88a5
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
@@ -0,0 +1,155 @@
+From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Fri, 22 Jan 2016 23:17:16 +0100
+Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0
+
+Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159
+---
+ config.tests/unix/alsa/alsatest.cpp              |  2 +-
+ src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++--------
+ src/multimedia/audio/qaudiodeviceinfo_alsa_p.h   |  2 +-
+ src/multimedia/audio/qaudioinput_alsa_p.cpp      |  4 ++--
+ src/multimedia/audio/qaudiooutput_alsa_p.cpp     |  4 ++--
+ 5 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
+index ac5f1e1..8d78f95 100644
+--- a/config.tests/unix/alsa/alsatest.cpp
++++ b/config.tests/unix/alsa/alsatest.cpp
+@@ -40,7 +40,7 @@
+ ****************************************************************************/
+ 
+ #include <alsa/asoundlib.h>
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+ 
+diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+index 973cbab..a09dcf6 100644
+--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
++++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
+     device = QLatin1String(dev);
+     this->mode = mode;
+ 
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+     checkSurround();
+ #endif
+ }
+@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
+     QList<QByteArray> devices = availableDevices(mode);
+ 
+     if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(devices.first().constData());
+ #else
+         dev = QLatin1String("hw:0,0");
+ #endif
+     } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = device;
+ #else
+         int idx = 0;
+@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
+     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
+ 
+     if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(devices.first().constData());
+ #else
+         dev = QLatin1String("hw:0,0");
+ #endif
+     } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = device;
+ #else
+         int idx = 0;
+@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
+     }
+     channelz.append(1);
+     channelz.append(2);
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+     if (surround40) channelz.append(4);
+     if (surround51) channelz.append(6);
+     if (surround71) channelz.append(8);
+@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
+     QList<QByteArray> devices;
+     QByteArray filter;
+ 
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+     // Create a list of all current audio devices that support mode
+     void **hints, **n;
+     char *name, *descr, *io;
+@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
+     return devices.first();
+ }
+ 
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ void QAudioDeviceInfoInternal::checkSurround()
+ {
+     QList<QByteArray> devices;
+diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+index 96febf4..714bf60 100644
+--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
++++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+@@ -98,7 +98,7 @@ private:
+     bool open();
+     void close();
+ 
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+     void checkSurround();
+     bool surround40;
+     bool surround51;
+diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
+index 339fd9f..202a5b2 100644
+--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
++++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
+@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open()
+     QString dev = QString(QLatin1String(m_device.constData()));
+     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput);
+     if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(devices.first());
+ #else
+         dev = QLatin1String("hw:0,0");
+ #endif
+     } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(m_device);
+ #else
+         int idx = 0;
+diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+index bf85de5..fe4b010 100644
+--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
++++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open()
+     QString dev = QString(QLatin1String(m_device.constData()));
+     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
+     if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(devices.first());
+ #else
+         dev = QLatin1String("hw:0,0");
+ #endif
+     } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+         dev = QLatin1String(m_device);
+ #else
+         int idx = 0;
+-- 
+2.7.0
+
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
new file mode 100644
index 000000000000..c6f5fc3b1269
--- /dev/null
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<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="qml">Build QML/QtQuick bindings and imports</flag>
+		<flag name="widgets">Build the QtMultimediaWidgets module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
new file mode 100644
index 000000000000..eb03bb3922ac
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
+fi
+
+IUSE="alsa"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
+	"${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426
+)
+
+QT4_TARGET_DIRECTORIES="src/multimedia"
+
+QCONFIG_ADD="multimedia"
+QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+multilib_src_configure() {
+	local myconf=(
+		-multimedia -audio-backend
+		$(qt_use alsa)
+		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
new file mode 100644
index 000000000000..04cc34da1d15
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	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=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..07c0609fcc71
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+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-base/xorg-proto )
+"
+
+src_prepare() {
+	# bug 646756
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	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=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
new file mode 100644
index 000000000000..b2da4c14dd87
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	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=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork-5.11.1 b/dev-qt/qtnetwork-5.11.1
deleted file mode 100644
index be436a2ca59a..000000000000
--- a/dev-qt/qtnetwork-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.1 ) ssl? ( dev-libs/openssl:0=[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman libproxy networkmanager +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.1 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a7471e78cfd122496ffff0fe6a0e9482
diff --git a/dev-qt/qtnetwork-5.9.4 b/dev-qt/qtnetwork-5.9.4
deleted file mode 100644
index e49c91be64ae..000000000000
--- a/dev-qt/qtnetwork-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.4 ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman libproxy libressl networkmanager +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.4 ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f166819abc3e0bc949ee671d98cc10b8
diff --git a/dev-qt/qtnetwork-5.9.6 b/dev-qt/qtnetwork-5.9.6
deleted file mode 100644
index ad69ea63cabd..000000000000
--- a/dev-qt/qtnetwork-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.6 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.6 ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman libproxy libressl networkmanager +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.6 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.6 ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=062ac097cf10693ffa0f306a24892506
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
new file mode 100644
index 000000000000..ff7cc521b10b
--- /dev/null
+++ b/dev-qt/qtnetwork/Manifest
@@ -0,0 +1,7 @@
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtnetwork-5.11.1.ebuild 1227 BLAKE2B bf6929d3cfa5142bde4baf968f50c5383b88c606a04a31ddca92514a249135cadcb130b53b3373bf83a394f8f48bc0c36bf7e163042a3658076e30bd412f7784 SHA512 194552deb74fd57d827872d53626c30e97f9a84a9aab160247c4711b621e13fe453b6ed291f92e77dbba9b1002f3f6806bdc5ecd9b531abf16e694829f0fbf12
+EBUILD qtnetwork-5.9.4.ebuild 1287 BLAKE2B 970af30659e4e4df96b619d5db6d052d3141c4736ee8e5a6893d72208785f19af48008d5dd614b631429d38d4fb04aef2193093288eee8051b93d97e52bd05b2 SHA512 4e39ee832dba2c0de5210366e59d05b4acd917b67f3d09d5bf8e1f602626edb0f25afaad4f8f2d06ba52fdb0454d461b9d35cd6028e61a63f92df86a8ea7485b
+EBUILD qtnetwork-5.9.6.ebuild 1290 BLAKE2B fb704fd6cf71f0ce5b8008a0d1762120965240308a688aae12a03ea0a7c53f9048443c3207836903dc2a583d2ad4f9f4d14987f48e06ff58ad3c6d414a522c38 SHA512 fee902848dfa05e56bd14e3e455bc2e02cc64c3d0246e0be5cc9b37e0968c235a126058a4f35c0b7f770180f29046bb3f6f8ffab80ba12284cf8dd5accd9275b
+MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
new file mode 100644
index 000000000000..cc8f0589d94a
--- /dev/null
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
+			HTTP/SOCKS proxy configuration</flag>
+		<flag name="networkmanager">Enable <pkg>net-misc/networkmanager</pkg>-based
+			bearer plugin</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
new file mode 100644
index 000000000000..95290d66781c
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+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/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
new file mode 100644
index 000000000000..3a3a82834ea5
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE="bindist connman libproxy libressl 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? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+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/qtnetwork/qtnetwork-5.9.6.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
new file mode 100644
index 000000000000..6c7ba506da68
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE="bindist connman libproxy libressl 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? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+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/qtnetworkauth-5.11.1 b/dev-qt/qtnetworkauth-5.11.1
deleted file mode 100644
index 08c48b8fa87a..000000000000
--- a/dev-qt/qtnetworkauth-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/dev-qt/qtnetworkauth-5.9.4 b/dev-qt/qtnetworkauth-5.9.4
deleted file mode 100644
index 7d4aaa8dd5e5..000000000000
--- a/dev-qt/qtnetworkauth-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtnetworkauth-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/dev-qt/qtnetworkauth-5.9.6 b/dev-qt/qtnetworkauth-5.9.6
deleted file mode 100644
index 68ae528a54a5..000000000000
--- a/dev-qt/qtnetworkauth-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtnetworkauth-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
new file mode 100644
index 000000000000..a4a50e07a6d7
--- /dev/null
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -0,0 +1,7 @@
+DIST qtnetworkauth-everywhere-src-5.11.1.tar.xz 140468 BLAKE2B a64cac71f89ae44b0835b8c7d0a492c24ebd51cfbbb5a5074e33292d2e2d0260658e6086a744e21e2bfb993bb1b34b13e093fdec7a21032725b1879228282935 SHA512 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d
+DIST qtnetworkauth-opensource-src-5.9.4.tar.xz 112244 BLAKE2B 9e75f8f11062b064b98421d9b9ed73cc18351eec788398922b22fa5b528f34baf2290c0595e2cdcad6afe6a0061ddbf37d9bbd2ec977a5ba713c692a125fca6d SHA512 a38e0cd3619ec25b2f7c749522b42f72bb024ef2415449349f7cdceaa9cdf5905c78c6b82bb7ce58b0c8f00ff883d2d79d11e12a9bfead014b553d431190abb2
+DIST qtnetworkauth-opensource-src-5.9.6.tar.xz 112188 BLAKE2B e8e61071da9e619d250ea09b01e12d8dfa73ae364e2cc3a33327c027916ce4bd807987f09d58c6962ed106eb148fed639788e06a74ff4e855db3f7e2ce98903e SHA512 8badcf8170780fcd18ec38980a7571e911f13efea101852f6c78e99031668cfa481df2a2fe07f46e2e78906ff6b663c27461326e2dad981e03d42cf4f78081c3
+EBUILD qtnetworkauth-5.11.1.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+EBUILD qtnetworkauth-5.9.4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+EBUILD qtnetworkauth-5.9.6.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/metadata.xml b/dev-qt/qtnetworkauth/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtnetworkauth/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild
new file mode 100644
index 000000000000..a1e6dc628e9d
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild
new file mode 100644
index 000000000000..a1e6dc628e9d
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild
new file mode 100644
index 000000000000..a1e6dc628e9d
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl-4.8.7 b/dev-qt/qtopengl-4.8.7
deleted file mode 100644
index d645032fa065..000000000000
--- a/dev-qt/qtopengl-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,egl=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=egl qt3support abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,egl=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19991b6a4797ae1432183aa8457f3d51
diff --git a/dev-qt/qtopengl-5.11.1 b/dev-qt/qtopengl-5.11.1
deleted file mode 100644
index 51ac6e2ef04d..000000000000
--- a/dev-qt/qtopengl-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] virtual/opengl dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ae3a0b8263c412443340c830b860e149
diff --git a/dev-qt/qtopengl-5.9.4 b/dev-qt/qtopengl-5.9.4
deleted file mode 100644
index e531da88e024..000000000000
--- a/dev-qt/qtopengl-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] virtual/opengl dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fc08bc04535e41fdf5b44de9d11ca6f6
diff --git a/dev-qt/qtopengl-5.9.6 b/dev-qt/qtopengl-5.9.6
deleted file mode 100644
index 5993c2e86a2c..000000000000
--- a/dev-qt/qtopengl-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtwidgets-5.9.6[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtwidgets-5.9.6[gles2=] virtual/opengl dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=034d2686d0ed3fcfb490c160eec1b3f6
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
new file mode 100644
index 000000000000..eea8d35927e8
--- /dev/null
+++ b/dev-qt/qtopengl/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01
+EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a
+EBUILD qtopengl-5.9.4.ebuild 644 BLAKE2B 39c9006f5b9bf93fc18b0e78b18026d0bf15ded8281c3b5327fcd8030b3fcbfd05443d7e7e37a5b8eabf8ab7086cb98fe786fb5ca601621b51b6f6ca2a8c4ecc SHA512 e7e3b6b1a7c5e708b150387416ae0435f52833dc070a193ed232bb531a3cf6d69acc32f267dde7afe96dc0eeeca618f564ff7112b4b1ca96c189f055c46c189a
+EBUILD qtopengl-5.9.6.ebuild 647 BLAKE2B 9865c66faa2426cb11af9cc0d06f2d22ee68723acd44c69cee776ff4c9f1949ff9de36ea05b7faec766a9e9143c1786a0b987a6c37a5240d114bd6bab46c6774 SHA512 f8cbb97bbbe311d2dd734d1145afab6e2972b0f26cdb322ac20919a90d35ba8c4b677e2229c5ec0face7ba1664bae7f25260276943b23476656e4eab2b3ac66b
+MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
new file mode 100644
index 000000000000..3a2fbf1c8ab7
--- /dev/null
+++ b/dev-qt/qtopengl/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
new file mode 100644
index 000000000000..fb17633c545f
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="egl qt3support"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/opengl
+	src/plugins/graphicssystems/opengl"
+
+QCONFIG_ADD="opengl"
+QCONFIG_DEFINE="QT_OPENGL"
+
+multilib_src_configure() {
+	local myconf=(
+		-opengl
+		$(qt_use qt3support)
+		$(qt_use egl)
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
+}
diff --git a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
new file mode 100644
index 000000000000..5dfd96944027
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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/qtopengl/qtopengl-5.9.4.ebuild b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
new file mode 100644
index 000000000000..d7fc20f91c1f
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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/qtopengl/qtopengl-5.9.6.ebuild b/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
new file mode 100644
index 000000000000..f41e1ec86bbb
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-5.11.1 b/dev-qt/qtpaths-5.11.1
deleted file mode 100644
index 10e196e96945..000000000000
--- a/dev-qt/qtpaths-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=23375c4eecad9165609c104837158e02
diff --git a/dev-qt/qtpaths-5.9.4 b/dev-qt/qtpaths-5.9.4
deleted file mode 100644
index a216bc0263f0..000000000000
--- a/dev-qt/qtpaths-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f0ce2bcb1aab6fbd36d472ae568615aa
diff --git a/dev-qt/qtpaths-5.9.6 b/dev-qt/qtpaths-5.9.6
deleted file mode 100644
index a9fc63742c14..000000000000
--- a/dev-qt/qtpaths-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6e8503bb6087a92c92faf9239052bcdf
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
new file mode 100644
index 000000000000..115f95a2e8ae
--- /dev/null
+++ b/dev-qt/qtpaths/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qtpaths-5.11.1.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
+EBUILD qtpaths-5.9.4.ebuild 405 BLAKE2B 252aeaf3802e11f568ac54422fedc8d4b0c4d9b2af8f3884667b2bcaf182282f5cdcb69e84a8e7acb5d4f34702c8a2b2943d2be7dc25e5101f2eb7b01f07aec7 SHA512 a4a79854b5eb0f48745d8a8af9244614ba33d89fdda7cf670b26c1bd25beb5b6df33f2a045934b150f17ef3ffe193c2210df3749b3c6f5f62bcbf91c11cdc9fe
+EBUILD qtpaths-5.9.6.ebuild 408 BLAKE2B 247016d163e2c71b03c51333b5564598a39a783ca7e0a8c9ad62c08eb1602f0976a1f16f8e2c1f199cbe6defef7a11d8136e15f2fbb7b04825eb846454c515e1 SHA512 a9bcc2a114c6ae52e53807ebab8886876175341f060744ba3287b4753e72706ada7a0543f4862f5357276bba69af5f72072627af18b577332937bc4dc3e0cc2c
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtpaths/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
new file mode 100644
index 000000000000..bc5bdee2884b
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtpaths/qtpaths-5.9.4.ebuild b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
new file mode 100644
index 000000000000..03766d245935
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ppc ppc64 x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtpaths/qtpaths-5.9.6.ebuild b/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
new file mode 100644
index 000000000000..fdc78198ff32
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo-5.11.1 b/dev-qt/qtplugininfo-5.11.1
deleted file mode 100644
index bb188ea71873..000000000000
--- a/dev-qt/qtplugininfo-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/dev-qt/qtplugininfo-5.9.4 b/dev-qt/qtplugininfo-5.9.4
deleted file mode 100644
index c2a67d3dc43d..000000000000
--- a/dev-qt/qtplugininfo-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/dev-qt/qtplugininfo-5.9.6 b/dev-qt/qtplugininfo-5.9.6
deleted file mode 100644
index 82b7a7da7464..000000000000
--- a/dev-qt/qtplugininfo-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
new file mode 100644
index 000000000000..83a07b978f6d
--- /dev/null
+++ b/dev-qt/qtplugininfo/Manifest
@@ -0,0 +1,7 @@
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qtplugininfo-5.11.1.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
+EBUILD qtplugininfo-5.9.4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
+EBUILD qtplugininfo-5.9.6.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/metadata.xml b/dev-qt/qtplugininfo/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtplugininfo/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild
new file mode 100644
index 000000000000..43ae95d1cf5b
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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/qtplugininfo/qtplugininfo-5.9.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild
new file mode 100644
index 000000000000..43ae95d1cf5b
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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/qtplugininfo/qtplugininfo-5.9.6.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.6.ebuild
new file mode 100644
index 000000000000..43ae95d1cf5b
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.9.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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-5.11.1 b/dev-qt/qtpositioning-5.11.1
deleted file mode 100644
index 76e01a0b6c0e..000000000000
--- a/dev-qt/qtpositioning-5.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 geoclue? ( ~dev-qt/qtdbus-5.11.1 ) qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:0 )
-RDEPEND=~dev-qt/qtcore-5.11.1 geoclue? ( ~dev-qt/qtdbus-5.11.1 ) qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ff7dec693fe4321f72cca7b352d8bc43
diff --git a/dev-qt/qtpositioning-5.9.4 b/dev-qt/qtpositioning-5.9.4
deleted file mode 100644
index be935ee81aa3..000000000000
--- a/dev-qt/qtpositioning-5.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 geoclue? ( ~dev-qt/qtdbus-5.9.4 ) qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:0 )
-RDEPEND=~dev-qt/qtcore-5.9.4 geoclue? ( ~dev-qt/qtdbus-5.9.4 ) qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2567fa5e6bc1c4f35bd36edc0589d099
diff --git a/dev-qt/qtpositioning-5.9.6 b/dev-qt/qtpositioning-5.9.6
deleted file mode 100644
index 918f152aefe7..000000000000
--- a/dev-qt/qtpositioning-5.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 geoclue? ( ~dev-qt/qtdbus-5.9.6 ) qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:0 )
-RDEPEND=~dev-qt/qtcore-5.9.6 geoclue? ( ~dev-qt/qtdbus-5.9.6 ) qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtlocation-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4cc5b864d9bf85646a6f1a0c7e3cb5a5
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
new file mode 100644
index 000000000000..01d4c6526e23
--- /dev/null
+++ b/dev-qt/qtpositioning/Manifest
@@ -0,0 +1,7 @@
+DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
+DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
+DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
+EBUILD qtpositioning-5.11.1.ebuild 843 BLAKE2B ad120bb0a2cd8a0655d3b5e271037d7a9e5f4e8bd9e99ebb161bcb1c24e1133c87582b0b0e928607bf7b2f9cdbe0c0e260b518755baeaa646304f6ddfd863ebd SHA512 99d5f6f66130cd18819c3ca6f5f57617ea9848ed73519020981c059faa5ceb8c53a5a945cf073c9e5349b78743ff8c8e1190ba424d3f3bad8f6d9aae96c3e922
+EBUILD qtpositioning-5.9.4.ebuild 807 BLAKE2B 7cd8b965a356bd9ca259d82c1ec4c8b86a722f6b4b3401d30ab99ee92633ee35c88c34e52b04d1a04ed144720ce3ffbbf5ed16967258ce1ca458666e855acb98 SHA512 54c4d3c712ced3fa5bf1755b2df18a74303cf979ba21f5df24157f00e89b1c271fcf045d05492eb851bb31918476a0329cd7e2e09d153c07293093a6329ba584
+EBUILD qtpositioning-5.9.6.ebuild 814 BLAKE2B f2329f8a25f98ecdba3d8250a13e23ce8ae7da181cfc04748dd6710849deba66b5e5437d7839e2241a16f6cf6f0e4e85dcb02ad5da26d5a1cec3cef27d54e4ec SHA512 f8adb5aa771b222872d44ea5f9be7798942a48256ed329019760014022946d685de1b55df06721bbab52b9f49f53fc73c81b104e52b2fc5dbb428923b045df0b
+MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
new file mode 100644
index 000000000000..23d4d81fd3d8
--- /dev/null
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag>
+		<flag name="qml">Build QML bindings</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
new file mode 100644
index 000000000000..37f71567e715
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use qml && QT5_TARGET_SUBDIRS+=(
+		src/positioningquick
+		src/imports/positioning
+	)
+}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
new file mode 100644
index 000000000000..c5c94f7ffba3
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 ~arm64 ~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/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	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/qtpositioning/qtpositioning-5.9.6.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
new file mode 100644
index 000000000000..5b78c008bc36
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	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-5.11.1 b/dev-qt/qtprintsupport-5.11.1
deleted file mode 100644
index 9ea448457fa1..000000000000
--- a/dev-qt/qtprintsupport-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.11.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=] ~dev-qt/qtwidgets-5.11.1[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=058d99d4e9c66b97dfb3d770c44c5f24
diff --git a/dev-qt/qtprintsupport-5.9.4 b/dev-qt/qtprintsupport-5.9.4
deleted file mode 100644
index bb54859eeb59..000000000000
--- a/dev-qt/qtprintsupport-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.9.4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2 test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=319ddb10bb61a61faf8e3079d7cdfd8b
diff --git a/dev-qt/qtprintsupport-5.9.6 b/dev-qt/qtprintsupport-5.9.6
deleted file mode 100644
index 752c1c29d7aa..000000000000
--- a/dev-qt/qtprintsupport-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtwidgets-5.9.6[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.9.6 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2 test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=] ~dev-qt/qtwidgets-5.9.6[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5330cff76ed49ac48f8d45fed4a846a0
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
new file mode 100644
index 000000000000..f582581382ec
--- /dev/null
+++ b/dev-qt/qtprintsupport/Manifest
@@ -0,0 +1,7 @@
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtprintsupport-5.11.1.ebuild 773 BLAKE2B 4af1522c3b043c11f11ea9c79166bea281afc2799de2380b132349480d783cc60b95afe0121bb6ac4ceca1b4abbbbfff0d7662fae4103b2944631f29d9ebb26a SHA512 b0502204b1f03518c9597ae2fdfa6f1b1b4d58d1108250021a8b14a1fb73eaa263b6d7e6d5ff7e19dd420f49613ad5bfae5e0921869ecdded7c510b2f71e2430
+EBUILD qtprintsupport-5.9.4.ebuild 769 BLAKE2B d1e8987e2228f6c7218dd48b8aa85dcd3a9c83d2ce04fa3b26da6a8e9241bd68fa1c1b777d5e80fdb9d08bc0ddb7c6a7a89c1381630faf83029ae24ccb3cc836 SHA512 e4190edb33773bcc786519ed580e570f49fc4f29d7ebad5c87148e388cfc6d1219f5929ea179a495c5a507a24422b57b770dfddfab013844f0b9b1e52d43193d
+EBUILD qtprintsupport-5.9.6.ebuild 772 BLAKE2B 00656897fe2c524f00ee0f33b7807ff96e30dac003dc9c08b80fda540e0f05353d58329700ed0f42090640cb2952319084a62fc8aba3e4333daa297c9f263395 SHA512 57f7ff7fe3bcd7d987883667817403d3ce4ededce6fe1b765b7572cb8445e71c20375cf9cefa4660f6e5c29d050dc372069eaed65dc1eb9c1d175c67827a8453
+MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
new file mode 100644
index 000000000000..17b1d11ac715
--- /dev/null
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
new file mode 100644
index 000000000000..b53ccddd18c8
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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/qtprintsupport/qtprintsupport-5.9.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
new file mode 100644
index 000000000000..d83ecf4b578e
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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/qtprintsupport/qtprintsupport-5.9.6.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
new file mode 100644
index 000000000000..50231eb4ee0b
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-5.11.1 b/dev-qt/qtquickcontrols-5.11.1
deleted file mode 100644
index 56f9a3ffa18b..000000000000
--- a/dev-qt/qtquickcontrols-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=06cac9e9f94c9abfa93ddd7c99a5870d
diff --git a/dev-qt/qtquickcontrols-5.9.4 b/dev-qt/qtquickcontrols-5.9.4
deleted file mode 100644
index e6c7df4c8813..000000000000
--- a/dev-qt/qtquickcontrols-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=91657fb8757a6db908803c5b4ba4c322
diff --git a/dev-qt/qtquickcontrols-5.9.6 b/dev-qt/qtquickcontrols-5.9.6
deleted file mode 100644
index 111940c52a80..000000000000
--- a/dev-qt/qtquickcontrols-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 widgets? ( ~dev-qt/qtwidgets-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 widgets? ( ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtquickcontrols-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0874052235c923c5d84dfcd1a21c7318
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
new file mode 100644
index 000000000000..d7aa390d8510
--- /dev/null
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -0,0 +1,7 @@
+DIST qtquickcontrols-everywhere-src-5.11.1.tar.xz 6058072 BLAKE2B f49b51c72486a5d514d16faf78ffad883e3597f6337d4103bc4b93d9cbce681853c38563a2f237308f8ea2362d8486284da308d4d815388457b429f3a3eeead0 SHA512 d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c
+DIST qtquickcontrols-opensource-src-5.9.4.tar.xz 5945756 BLAKE2B 9b22cbed8e92a9264a67777cd18eee2f8b20a9f2360ea376948563933852015b9b44f9c94410c73f09d2f7958b61228ae3634a6c2e0ad5de7e92249f26196461 SHA512 62f7578fa5253e85b8cb04fec295e1044a6b5946e4041e758f788643aa3336c9c48300dafbd5ab21b0e4b74e184344ad62a9d06f3bcb7466fbea79b0e165070d
+DIST qtquickcontrols-opensource-src-5.9.6.tar.xz 6013760 BLAKE2B 5daf7e1cbf94fb6f532528b52c4b30802f27cf789b041251409ed9d730ed1539fab41cf1b94509ed63a21c479dce43c10714eb1b91cf0d2c2613a3890feb5c6a SHA512 1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e
+EBUILD qtquickcontrols-5.11.1.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
+EBUILD qtquickcontrols-5.9.4.ebuild 747 BLAKE2B 41e87081cd3ecd0b2eeba5db2253ed4ef667fe748320c8911a3f74da279eece1b5247e9bed2e1ad0abd9e2a0c7685726091a56aa95f182e09c1d917a99bfc774 SHA512 414b59b57e1917d77c03f584795438c157459920532372adcc04e13059a75fcf04892d5d6ae72621f679675e932988073b3ae0d12d915a5b524c086644ac0b07
+EBUILD qtquickcontrols-5.9.6.ebuild 750 BLAKE2B b577eb11ca741b4d30d002045a24076f399aeae4224bf7d54b34b44df63fd8ed3e59b70e35aec1c4847998e78bfc114bb473ecc7604d04ea0ae78ffb9fb7b3e7 SHA512 a24ccd3f379034f55cbb5fd81abbdf2b00af7b1321c130a350d5c16a173515d3fde21b094a217277c2ce53d706a788a6449038276dd9c6e1933f60e4be23910b
+MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml
new file mode 100644
index 000000000000..cc8ed92a390e
--- /dev/null
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="widgets">Enable QtWidgets support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
new file mode 100644
index 000000000000..e0dc94116163
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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/qtquickcontrols/qtquickcontrols-5.9.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
new file mode 100644
index 000000000000..e01b5b3d3527
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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/qtquickcontrols/qtquickcontrols-5.9.6.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
new file mode 100644
index 000000000000..f9b2d627bdb7
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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/qtquickcontrols2-5.11.1 b/dev-qt/qtquickcontrols2-5.11.1
deleted file mode 100644
index 79f0328bef69..000000000000
--- a/dev-qt/qtquickcontrols2-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 widgets? ( ~dev-qt/qtwidgets-5.11.1 ) ~dev-qt/qtgraphicaleffects-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d78d95cfdc208b9988ce7cb49267f1b0
diff --git a/dev-qt/qtquickcontrols2-5.9.4 b/dev-qt/qtquickcontrols2-5.9.4
deleted file mode 100644
index 3a0fb787816f..000000000000
--- a/dev-qt/qtquickcontrols2-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) ~dev-qt/qtgraphicaleffects-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b53ec6b4896e235501750a288bb261c3
diff --git a/dev-qt/qtquickcontrols2-5.9.6 b/dev-qt/qtquickcontrols2-5.9.6
deleted file mode 100644
index 68c744b4f331..000000000000
--- a/dev-qt/qtquickcontrols2-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 widgets? ( ~dev-qt/qtwidgets-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 widgets? ( ~dev-qt/qtwidgets-5.9.6 ) ~dev-qt/qtgraphicaleffects-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtquickcontrols2-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f43cef7179e868aaafc96ee522dd0c5a
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
new file mode 100644
index 000000000000..760ae5aad937
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -0,0 +1,7 @@
+DIST qtquickcontrols2-everywhere-src-5.11.1.tar.xz 9032192 BLAKE2B 42ee81bad1cd3888c770d559ad91fa38e8ae57a72a5b6a1faced4cd8c6292e89392ea1fab14f821ed04aae5b7ac997b111f64b9725f0b35bd3b685605d367e61 SHA512 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68
+DIST qtquickcontrols2-opensource-src-5.9.4.tar.xz 4153488 BLAKE2B 39fab418b0875fd080228e8dc4103884d862924b2ab12d630303eae366294ec8c97b744db58aee1b00bc923d9abda1db4f7d73931699f3961cc2a28eac2e2e84 SHA512 17704cfd14dbc14d2971b82a81786bd7a5cfdd4e6ae6bc0c5b26c6a6a36d8391ba1ac9969cc5614c8d0fff8ed3b238ef57a481927f82fda509023838d3692762
+DIST qtquickcontrols2-opensource-src-5.9.6.tar.xz 4158180 BLAKE2B dca050d5c0939f51dbb8181d9d644e2e0c6d1e1937cd14146c16cf0452e027666ad8e4f1ba50ca118698ea4cf4afb4b7876dd562394e5f5cbd97de3d5384526a SHA512 46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d
+EBUILD qtquickcontrols2-5.11.1.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
+EBUILD qtquickcontrols2-5.9.4.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
+EBUILD qtquickcontrols2-5.9.6.ebuild 604 BLAKE2B a244e7fa8ecba2a7bf819f8fe28f054d5ee5a8e1574333273f3617651fd94a75b6c5a29b2620ab3a9a775fb0da880c2e930fdc0f4cba26c4e06a3b45c41d25a0 SHA512 22ee614a9ee6a06534d16ebd5bfff640ed0f0def3c652d66decf34b63cd72985f12e0aa36a92654ac53cfa0cd699cd8c820c45532aa6a645c8a7bc20f811375b
+MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/metadata.xml b/dev-qt/qtquickcontrols2/metadata.xml
new file mode 100644
index 000000000000..cc8ed92a390e
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="widgets">Enable QtWidgets support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
new file mode 100644
index 000000000000..aa6bccf51564
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
new file mode 100644
index 000000000000..53ac04d9af39
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild
new file mode 100644
index 000000000000..eaa1dfc78620
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript-4.8.7 b/dev-qt/qtscript-4.8.7
deleted file mode 100644
index d4bb6aab0f25..000000000000
--- a/dev-qt/qtscript-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The QtScript module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1f8308dd18687be2a07eb8c126242be
diff --git a/dev-qt/qtscript-5.11.1 b/dev-qt/qtscript-5.11.1
deleted file mode 100644
index 9a29b73e8ebc..000000000000
--- a/dev-qt/qtscript-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 scripttools? ( ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 scripttools? ( ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c2630124b5963ae28c707b6ecec292d4
diff --git a/dev-qt/qtscript-5.9.4 b/dev-qt/qtscript-5.9.4
deleted file mode 100644
index a56e2fc0bba0..000000000000
--- a/dev-qt/qtscript-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 scripttools? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 scripttools? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=57944610b528dffd0686b489c5eac364
diff --git a/dev-qt/qtscript-5.9.6 b/dev-qt/qtscript-5.9.6
deleted file mode 100644
index d116d802b65f..000000000000
--- a/dev-qt/qtscript-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 scripttools? ( ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 scripttools? ( ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtscript-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4bc428cd279f717af6654ef868e66efa
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
new file mode 100644
index 000000000000..3658046ed8f0
--- /dev/null
+++ b/dev-qt/qtscript/Manifest
@@ -0,0 +1,10 @@
+AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01dd83db6b377a4e72dd3b6ced8d11d0c206aadf56c35423d11841407452ab3e8f4ff3509a803e757536ad76cb87eaea76a SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
+DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
+DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46
+EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5
+EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a
+EBUILD qtscript-5.9.4.ebuild 682 BLAKE2B fc04d73b06779e8abfec714ae6b59e59a72237b56fbcf48eb24a5cceaf9860e5fc88ad36b68d9cacb6dc470a795c7d783908a55b638b1e884faf4bd3a143df05 SHA512 91eb46966db41a9718404c74cc2f18b723b9630fbd9b2a3fbbc42bc2eaf0edca796a0fcb72e32731880a3c13631eb7b92241180161b94f88a7f5cda949f6a75d
+EBUILD qtscript-5.9.6.ebuild 685 BLAKE2B 19a77ca6d324ece261144a16276d85a630b06b62adce2416074d692f7612e433d24ab2cc12d08f7be49bf140a72a30918bea668da007d4aea29114154ce1740b SHA512 6be3366270ffba5f22d44a226cd2b14392f70a2280f9049a1cb1c2283838fd44e005da6e9382191b85bb59dc42bf38888000252ba84bd805c994dc4a8626bd26
+MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e
diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
new file mode 100644
index 000000000000..cde4cfb93f51
--- /dev/null
+++ b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
@@ -0,0 +1,53 @@
+From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@digia.com>
+Date: Tue, 4 Mar 2014 10:46:18 +0100
+Subject: Fix build on x32
+
+Recognize x32 and disable JIT in this configuration.
+
+Task-number: QTBUG-35463
+Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 0b95639..85ed8a7 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -202,6 +202,11 @@
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
+ #define WTF_CPU_X86_64 1
++
++#if defined(__ILP32__)
++#define WTF_CPU_X32 1
++#endif
++
+ #endif
+ 
+ /* 64-bit mode on AIX */
+@@ -906,7 +911,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
+@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
+ #define ENABLE_REPAINT_THROTTLING 0
+ #endif
+ 
++/* Disable JIT on x32 */
++#if CPU(X32)
++#define ENABLE_JIT 0
++#endif
++
+ #if !defined(ENABLE_JIT)
+ 
+ /* The JIT is tested & working on x86_64 Mac */
+-- 
+cgit v0.11.0
+
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
new file mode 100644
index 000000000000..a559e6341854
--- /dev/null
+++ b/dev-qt/qtscript/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="scripttools">Build the QtScriptTools module (requires QtWidgets)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
new file mode 100644
index 000000000000..ce3c8d0893c2
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The QtScript module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+jit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/script"
+
+QCONFIG_ADD="script"
+QCONFIG_DEFINE="QT_SCRIPT"
+
+PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_use jit javascript-jit)
+		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
+		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
+		-no-gtkstyle
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtscript/qtscript-5.11.1.ebuild b/dev-qt/qtscript/qtscript-5.11.1.ebuild
new file mode 100644
index 000000000000..2644fc6ec232
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.11.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscript/qtscript-5.9.4.ebuild b/dev-qt/qtscript/qtscript-5.9.4.ebuild
new file mode 100644
index 000000000000..54141c4a6bac
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscript/qtscript-5.9.6.ebuild b/dev-qt/qtscript/qtscript-5.9.6.ebuild
new file mode 100644
index 000000000000..a1f1da28d553
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.9.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscxml-5.11.1 b/dev-qt/qtscxml-5.11.1
deleted file mode 100644
index 03c3b9e5e6de..000000000000
--- a/dev-qt/qtscxml-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=931899ecf2935db1b1545f4395bf26e6
diff --git a/dev-qt/qtscxml-5.9.4 b/dev-qt/qtscxml-5.9.4
deleted file mode 100644
index e7168c83cbfa..000000000000
--- a/dev-qt/qtscxml-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=cb7ad0eb6c0c214ed6b3700fbbd27c9a
diff --git a/dev-qt/qtscxml-5.9.6 b/dev-qt/qtscxml-5.9.6
deleted file mode 100644
index 94a242068321..000000000000
--- a/dev-qt/qtscxml-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtscxml-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6aae9864c80fe73444a50c17e82ae1fb
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
new file mode 100644
index 000000000000..6e1dd0fbf5b0
--- /dev/null
+++ b/dev-qt/qtscxml/Manifest
@@ -0,0 +1,7 @@
+DIST qtscxml-everywhere-src-5.11.1.tar.xz 436148 BLAKE2B d26d8e54bc89685110168043ec876fa8bb34c0c23ed31c625d26f71e82283716ed70e3fd71ad02233bd69546ace02cb87549ef3270e3bd43c0758db480db3639 SHA512 d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689
+DIST qtscxml-opensource-src-5.9.4.tar.xz 414280 BLAKE2B 6fcea56794febf65b7e21b79893e9c3a849278ad6d4ad24a8f8e272ec101fdee72fe29d21bd99b1ba4d977e52dd3acc026660ce6d5a6ecc684590a8d190615b7 SHA512 e000411b82dfef08fbd5fce601530548a9b5959a4980309434572ec3475e6bc9cdf870cb82bfd5208b533d66a7e46dddf52f5ceaedaf3f0d438c4a4c8260c9b6
+DIST qtscxml-opensource-src-5.9.6.tar.xz 414120 BLAKE2B 90458c151e42308d660556871ab4ce4972a2d620d9785d2f39b2c913d0fa35522be5fcc459838f42c93b6ad6d76a0022b85cd3cf367fcdb77004f199091e0d4d SHA512 d649a43b5d9b753c431120972be93a190583315045d724ea5149ba93a73aa65724eef8a8b0d33f48a543418e045961e91af1d068774a923469f871ed3a97d4fe
+EBUILD qtscxml-5.11.1.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
+EBUILD qtscxml-5.9.4.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
+EBUILD qtscxml-5.9.6.ebuild 373 BLAKE2B 37639747ebc94e8ff232c98af82e73734689e3dbfac96fa27ba851dc710ed23d575bcf1f832c99e938cf216df5705ec2bff5b980182f9fa38ed566a04a1e8062 SHA512 4b5cbbae87eb1765d489c412daeca061be354a0503f8a8657f68ad259dd913433936c06e48d69768d08bdc72e9a7150df77fd974529a99f4fa2bf411b18ccbc5
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/metadata.xml b/dev-qt/qtscxml/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtscxml/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtscxml/qtscxml-5.11.1.ebuild b/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
new file mode 100644
index 000000000000..59b06ef21029
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-5.9.4.ebuild b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
new file mode 100644
index 000000000000..ca4f733913f9
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-5.9.6.ebuild b/dev-qt/qtscxml/qtscxml-5.9.6.ebuild
new file mode 100644
index 000000000000..5f9558fa4aa3
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.9.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors-5.11.1 b/dev-qt/qtsensors-5.11.1
deleted file mode 100644
index 8a3ed2b97a77..000000000000
--- a/dev-qt/qtsensors-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=19cc27a106594683e75febf31b99bd56
diff --git a/dev-qt/qtsensors-5.9.4 b/dev-qt/qtsensors-5.9.4
deleted file mode 100644
index 98e0a58d7b44..000000000000
--- a/dev-qt/qtsensors-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=788a6b67c08de67e886c027e107a8444
diff --git a/dev-qt/qtsensors-5.9.6 b/dev-qt/qtsensors-5.9.6
deleted file mode 100644
index 8a8c62c26b5e..000000000000
--- a/dev-qt/qtsensors-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtsensors-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bc8bc0906bca8620d8a0c40a2c141b81
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
new file mode 100644
index 000000000000..f1000bd51408
--- /dev/null
+++ b/dev-qt/qtsensors/Manifest
@@ -0,0 +1,7 @@
+DIST qtsensors-everywhere-src-5.11.1.tar.xz 2033508 BLAKE2B b0b99adafdb96835a019c915f57bdbdc76dd965d32081a2b8d4f1ce60a06fb9d1c450a2949a1ca2475aa303514e99ebe695dbbd0395140c7edba863731b8b32c SHA512 5da90766ec979ee51b3df97f794b1661a1103b80cc57941516171d5102b54c15bdf1cfabde21e5b94ddad324686a6a92171193312e7c6791d5de63832452010d
+DIST qtsensors-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
+DIST qtsensors-opensource-src-5.9.6.tar.xz 1994404 BLAKE2B 38935553d7b765e2de9b9328ecbdca6c141c687742c6981b5174261122e568c5534c44b97d67016b33a1bfa47eafb0f04a89d13c1cc43296ffcb31174290c762 SHA512 1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3
+EBUILD qtsensors-5.11.1.ebuild 537 BLAKE2B e560851f2ddb5f429f5d760e1c287f6b6eaeae49013c02ae54c66c13f4ff071ab0665d411a7c53589ca9eaf77a7fa72165730deba2aa2f1617ce2ac831897e22 SHA512 e190d35f102385927cbef9d5b1d685e8261a96cfa3bec1cf7a206ce9405e699af15a31f8437358deeca205acdfadc8821a2e30eedecd20771ffd22d3c4613143
+EBUILD qtsensors-5.9.4.ebuild 529 BLAKE2B 6ea55cffff0218bf22db4721a22de169bf4b19aa56af940cf1cb615efb501a3b599e4a8e492d79d1a136fde81b4941b240d138cafccbb8a06daccb53c07acde7 SHA512 4d1dc97c80a8b984f60d23514db8bc13baf8006e08bf72f0c3a45deb75f9c140940e7b6bef4373823695c2b0a9ab526f16ab06608097fbffe3a0a08cb55aae55
+EBUILD qtsensors-5.9.6.ebuild 536 BLAKE2B 25d6c565911da12c2b49ae0fde4315c66175dd2d06d8df0ff8c740f244aa82f09ff55a9ef213a8ff741e9bdffe999cec412797f11fe6cf16c86602eefce5a43f SHA512 ab601c23243e457ecb30691b1413b0f785513c80fd494261075dea9a77c47f74208a4e67c0599a26f20ad35421f9d348b585bd4394e68d998adeea969e28d338
+MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml
new file mode 100644
index 000000000000..c33b152da0be
--- /dev/null
+++ b/dev-qt/qtsensors/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Build QML bindings</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
new file mode 100644
index 000000000000..d0b0c5b6e6de
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${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/qtsensors/qtsensors-5.9.4.ebuild b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
new file mode 100644
index 000000000000..861d1633b0e3
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ppc64 x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${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/qtsensors/qtsensors-5.9.6.ebuild b/dev-qt/qtsensors/qtsensors-5.9.6.ebuild
new file mode 100644
index 000000000000..6a0466975319
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.9.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${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/qtserialbus-5.11.1 b/dev-qt/qtserialbus-5.11.1
deleted file mode 100644
index b0af68de8b6d..000000000000
--- a/dev-qt/qtserialbus-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtserialport-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Support for CAN and other serial buses
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtserialport-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/dev-qt/qtserialbus-5.9.4 b/dev-qt/qtserialbus-5.9.4
deleted file mode 100644
index 7386bbf85c6f..000000000000
--- a/dev-qt/qtserialbus-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtserialport-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Support for CAN and other serial buses
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtserialport-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/dev-qt/qtserialbus-5.9.6 b/dev-qt/qtserialbus-5.9.6
deleted file mode 100644
index f938dcfc95cf..000000000000
--- a/dev-qt/qtserialbus-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtserialport-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Support for CAN and other serial buses
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtserialport-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtserialbus-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
new file mode 100644
index 000000000000..8314bda383bb
--- /dev/null
+++ b/dev-qt/qtserialbus/Manifest
@@ -0,0 +1,7 @@
+DIST qtserialbus-everywhere-src-5.11.1.tar.xz 320844 BLAKE2B c55bfb9858afaeb875b48f291eeca138e9aa7597eaede14b40235af0db64da4e71fafc1cad840d4717487d6f614305f9ea6f89d105006392e2324bea193ae625 SHA512 9469fe7dc6d334eb2b0737cba62db72b7bd8af56631dca47125edb595a9dbf4a89be2d4658f6daf13d13cbe6b01915d61cbeeb71cd804612825bbd78692fb682
+DIST qtserialbus-opensource-src-5.9.4.tar.xz 279352 BLAKE2B 145154d86de8d968c26103c7eab21f2928e8666123c0d8ab20e9459bd86dbe54e70f4d83ff7f9c6203f078f2ab3ce21cd2d08ed268e0af29b0578d0b08e6dba9 SHA512 d4f09d67edc69b9063be114007eb7200ee043f37bbbad9bbe392249b37ec766bc2d0f5725e9af2df2fd68095ecedf71196ffaac30569bdf5ee2606a8fddc4321
+DIST qtserialbus-opensource-src-5.9.6.tar.xz 278920 BLAKE2B 34775b4aebaedec3e3a826c8588b8b167d617af2df5918314939d38604e3ef8781efa3e806824b93785eb527b3149fe1a49774d2bee12272e97d040f24ec0f0c SHA512 332edf0da83a20a39e65280c817b591b3b5b50710ae1dcce1bbe284233e20bc239584db634078697e87293a9811d1ad6f9d38b3ca7aa6188b9509cafe6672f6f
+EBUILD qtserialbus-5.11.1.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+EBUILD qtserialbus-5.9.4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+EBUILD qtserialbus-5.9.6.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/metadata.xml b/dev-qt/qtserialbus/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtserialbus/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild
new file mode 100644
index 000000000000..c6a1fac19557
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Support for CAN and other serial buses"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild
new file mode 100644
index 000000000000..c6a1fac19557
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Support for CAN and other serial buses"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild
new file mode 100644
index 000000000000..c6a1fac19557
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Support for CAN and other serial buses"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport-5.11.1 b/dev-qt/qtserialport-5.11.1
deleted file mode 100644
index 5ac21eeef695..000000000000
--- a/dev-qt/qtserialport-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 virtual/libudev:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6edf3bb120bc793f33520629efa89e74
diff --git a/dev-qt/qtserialport-5.9.4 b/dev-qt/qtserialport-5.9.4
deleted file mode 100644
index 14b404918b0d..000000000000
--- a/dev-qt/qtserialport-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 virtual/libudev:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f5e6db27b1ccd84bc94658ab641a97e8
diff --git a/dev-qt/qtserialport-5.9.6 b/dev-qt/qtserialport-5.9.6
deleted file mode 100644
index ea7a0610bb9b..000000000000
--- a/dev-qt/qtserialport-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 virtual/libudev:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtserialport-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=254f58eaccd9e03e4da4374c543f03a1
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
new file mode 100644
index 000000000000..06c9bfac5893
--- /dev/null
+++ b/dev-qt/qtserialport/Manifest
@@ -0,0 +1,7 @@
+DIST qtserialport-everywhere-src-5.11.1.tar.xz 301692 BLAKE2B 8d57503dbd16d142ac72dbc496218d57ff92212b44e8a504f3b6ba27b2bdb295061705c1318000d50c2383ce815c8420b056ea66720f62338a1b98785d37c5f4 SHA512 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404
+DIST qtserialport-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
+DIST qtserialport-opensource-src-5.9.6.tar.xz 268344 BLAKE2B 1aa206d12e508474c7a7aae3d16923d80170ea739e1fed74de363fa42afcd94fbdaf683e85515d5de7086a8bdf901dd03f48ba949e4429e47dd0af176861c36f SHA512 a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847
+EBUILD qtserialport-5.11.1.ebuild 547 BLAKE2B 9bfc01a34fd6c72d287f2171aaf54bc58b2de2ceb5b08fedddcb507314d3441fdd1dac6ff5fc1c844e56a6f0666645977c43fe1138b41a5da03640261ca44e45 SHA512 4ea49a5ccf688e58cdc09d12773e799b247f65e6ef34e4ded25a06111f4a897263c050eb277d4fc3b3d46c435fcea8762117e7806aceeeb1311ca9d6788f8c5b
+EBUILD qtserialport-5.9.4.ebuild 539 BLAKE2B c2128a79328ce2effe83b6c2135fc07a1e1eeaf00d85b4148116fc30b9e6a459ca7b66983b9051f9e027d7af5ab3e2d39b04b888a730e24a219f4ee092542ba3 SHA512 200bf31da4b42d7ac46e684b2218b94ddb415988967ea175321dba67f4327693db43d86093d13bba151f045d601baf242824802cb1920379b1d3993a4bb214ab
+EBUILD qtserialport-5.9.6.ebuild 546 BLAKE2B 950c4001c4e1c319e354cec00d2d999e3f55073a9770484b4634f5eaf2ccab6d4aa7eed2ef3454b3c6db5afc9094ffbf8d07edccfa8b401713cc9d27f72bdcd0 SHA512 bbddeeeb4833c27c462cb3bfcc00c6f6b5229425c81fdb60a3d413d1a944c61288c78ac6777036a31d7e702b5230bd804ce862c10480ba9a115d3eba8cd5b4b3
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtserialport/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
new file mode 100644
index 000000000000..f29b276edef7
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialport/qtserialport-5.9.4.ebuild b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
new file mode 100644
index 000000000000..bccdd88491a8
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~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/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialport/qtserialport-5.9.6.ebuild b/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
new file mode 100644
index 000000000000..f6cd95bf26aa
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtsingleapplication-2.6.1_p20171024 b/dev-qt/qtsingleapplication-2.6.1_p20171024
deleted file mode 100644
index 2c4b0cd7453f..000000000000
--- a/dev-qt/qtsingleapplication-2.6.1_p20171024
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Qt library to start applications only once per user
-EAPI=6
-HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
-IUSE=doc X
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4883a3321f9434d56efcc718fea422c4
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
new file mode 100644
index 000000000000..29d7f7abd403
--- /dev/null
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -0,0 +1,7 @@
+AUX 2.6.1_p20130904-no-gui.patch 2294 BLAKE2B 8a97c2acbdf8c5a66d7d392d9e329bf6e16b75e573822db58c789bc0d16b690a98b452dbda70db003cf91915154f807a9adf4d27c05af38187e206df854e9e11 SHA512 68b6ccf490483df0590af59c447fdfe99f421fd9dbc6211a7666f7ad0557025e13640b1c579fd25477fc0c197f49efa63c017e24a47b91291d99c773a7ad8dc9
+AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 BLAKE2B e1668e24798405e91a37fed221cec9241964b6aaa820d078f7999a6f186655e51a3f353b5da8c17779bf5a56333bfd5d2df748e4ec8010ffa2d7be49fd75412e SHA512 96a1dd68e8ba841c5466183cfdcb9693e01d2096878f52f0f521bcee14ec38fb005bace877af473b645aa035c3651c136220fd2fc5dfb7a8883b9a75cdc55eba
+AUX qtsingleapplication.prf 255 BLAKE2B a810e133b1017901bffb26aa1ede3ba64d28044b57c5b49828f55d6bf0e0f3e7c3bced99b69064985a8d1703b996d8eb678da89fb620fd91c2b28b8e5c8dfdea SHA512 005d9f547279ee7df2a4c0ae17ad371a73c9d21a3257740d5ad63c261c8eed64acff7211d009ef787ff9610075d0fbf31fb404803cd0ed2647dc2036ef89fad5
+AUX qtsinglecoreapplication.prf 241 BLAKE2B b356e55f6ba7fb1028e399b6111463bd5f0a02d4cd3c07240c433f7f0bffca587334752fb89e38673c075d47d3cee69a69420ccae6d2fa69454b1cac496edc6d SHA512 938d2eb0c2a3a8dc8ab1c15a175a6bad78b20ad699936b7afbbc54fec10cff6f7ed9ca69b68d81d36495fad439b8550c0d515e4b4a6856362c475f1d9fa7d974
+DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
+EBUILD qtsingleapplication-2.6.1_p20171024.ebuild 1456 BLAKE2B 29d9114b0e26e2933bee4b7c0de38dbee7e5a7b27c536aa9ae698940fab3c3852acb0de06e21464d20d5379fbc5360b71a4aaad63a51004678cadba40bf3770b SHA512 0825a00418fd6a733c8a9fd973d6bea377750c7c82578da6c91db074a94f6e8ad8da3bb5910c0032e92145cfb3553eb5cc2ca0d6172428eb7ed7fa032a701c74
+MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
new file mode 100644
index 000000000000..19019e2892a4
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
@@ -0,0 +1,67 @@
+From f66352d6c2918123466bd72aee2118b9167562af Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:43:18 +0100
+Subject: [PATCH] no gui
+
+---
+ buildlib/buildlib.pro           |  4 +++-
+ src/qtsingleapplication.pri     | 11 +++++------
+ src/qtsinglecoreapplication.pri |  2 +-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/buildlib/buildlib.pro b/buildlib/buildlib.pro
+index 37dddcd..f7c6508 100644
+--- a/buildlib/buildlib.pro
++++ b/buildlib/buildlib.pro
+@@ -2,7 +2,9 @@ TEMPLATE=lib
+ CONFIG += qt dll qtsingleapplication-buildlib
+ mac:CONFIG += absolute_library_soname
+ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+-include(../src/qtsingleapplication.pri)
++include(../common.pri)
++include(../src/qtsinglecoreapplication.pri)
++exists(../config.pri):!infile(../config.pri, QTSA_NO_GUI, yes):include(../src/qtsingleapplication.pri)
+ TARGET = $$QTSINGLEAPPLICATION_LIBNAME
+ DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
+ win32 {
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 02c9e5b..772924d 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -1,15 +1,14 @@
+-include(../common.pri)
+-INCLUDEPATH += $$PWD
+-DEPENDPATH += $$PWD
+-QT *= network
++INCLUDEPATH *= $$PWD
++DEPENDPATH *= $$PWD
++QT *= gui network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+ CONFIG *= qtlockedfile
+ 
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+ } else {
+-    SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp
+-    HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h
++    SOURCES += $$PWD/qtsingleapplication.cpp
++    HEADERS += $$PWD/qtsingleapplication.h
+ }
+ 
+ win32 {
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index f5b8414..bf14a3f 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -3,7 +3,7 @@ DEPENDPATH      += $$PWD
+ HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+ 
+-QT *= network
++QT = core network
+ CONFIG *= qtlockedfile
+ 
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+-- 
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
new file mode 100644
index 000000000000..93c78fab9bab
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
@@ -0,0 +1,81 @@
+From 62210d463f87abb0584ce699915e1845cacaa480 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:33:15 +0100
+Subject: [PATCH] unbundle qtlockedfile
+
+---
+ src/qtlocalpeer.cpp             | 11 +----------
+ src/qtlocalpeer.h               |  2 +-
+ src/qtsingleapplication.pri     |  1 +
+ src/qtsinglecoreapplication.pri |  1 +
+ 4 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
+index 332b064..f17e662 100644
+--- a/src/qtlocalpeer.cpp
++++ b/src/qtlocalpeer.cpp
+@@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #include <unistd.h>
+ #endif
+ 
+-namespace QtLP_Private {
+-#include "qtlockedfile.cpp"
+-#if defined(Q_OS_WIN)
+-#include "qtlockedfile_win.cpp"
+-#else
+-#include "qtlockedfile_unix.cpp"
+-#endif
+-}
+-
+ const char* QtLocalPeer::ack = "ack";
+ 
+ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
+@@ -114,7 +105,7 @@ bool QtLocalPeer::isClient()
+     if (lockFile.isLocked())
+         return false;
+ 
+-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
++    if (!lockFile.lock(QtLockedFile::WriteLock, false))
+         return true;
+ 
+     bool res = server->listen(socketName);
+diff --git a/src/qtlocalpeer.h b/src/qtlocalpeer.h
+index 1b533b1..1127735 100644
+--- a/src/qtlocalpeer.h
++++ b/src/qtlocalpeer.h
+@@ -68,7 +68,7 @@ protected:
+     QString id;
+     QString socketName;
+     QLocalServer* server;
+-    QtLP_Private::QtLockedFile lockFile;
++    QtLockedFile lockFile;
+ 
+ private:
+     static const char* ack;
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 6f2bced..02c9e5b 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
+ QT *= network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
++CONFIG *= qtlockedfile
+ 
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index d2d6cc3..f5b8414 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -4,6 +4,7 @@ HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+ 
+ QT *= network
++CONFIG *= qtlockedfile
+ 
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+     DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
+-- 
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
new file mode 100644
index 000000000000..3171424fd04f
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
@@ -0,0 +1,9 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
+QT *= widgets
+} else {
+LIBS *= -lQtSolutions_SingleApplication-2.6
+}
+QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
new file mode 100644
index 000000000000..87d2a9583dbd
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
@@ -0,0 +1,8 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
+} else {
+LIBS *= -lQtSolutions_SingleApplication-2.6
+}
+QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/metadata.xml b/dev-qt/qtsingleapplication/metadata.xml
new file mode 100644
index 000000000000..17237689dcfd
--- /dev/null
+++ b/dev-qt/qtsingleapplication/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
new file mode 100644
index 000000000000..91161fc3faaf
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
+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"
+IUSE="doc X"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtlockedfile[qt5(+)]
+	dev-qt/qtnetwork:5
+	X? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch"
+	"${FILESDIR}/2.6.1_p20130904-no-gui.patch"
+)
+
+src_prepare() {
+	default
+
+	echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+	use X || echo 'QTSA_NO_GUI = yes' >> config.pri
+
+	sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+	sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
+
+	# to ensure unbundling
+	rm src/qtlockedfile* || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+
+	# libraries
+	dolib.so lib/*
+
+	# headers
+	insinto "$(qt5_get_headerdir)"/QtSolutions
+	doins src/qtsinglecoreapplication.h
+	use X && doins src/{QtSingleApplication,${PN}.h}
+
+	# .prf files
+	insinto "$(qt5_get_mkspecsdir)"/features
+	doins "${FILESDIR}"/qtsinglecoreapplication.prf
+	use X && doins "${FILESDIR}"/${PN}.prf
+}
diff --git a/dev-qt/qtspeech-5.11.1 b/dev-qt/qtspeech-5.11.1
deleted file mode 100644
index 5a33575a3d72..000000000000
--- a/dev-qt/qtspeech-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=41b54d0a49e3b7726e1fdabb1cc165b9
diff --git a/dev-qt/qtspeech-5.9.4 b/dev-qt/qtspeech-5.9.4
deleted file mode 100644
index 76162e1b8bc3..000000000000
--- a/dev-qt/qtspeech-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtspeech-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=97c895c326c7cc58029a5d444867d9df
diff --git a/dev-qt/qtspeech-5.9.6 b/dev-qt/qtspeech-5.9.6
deleted file mode 100644
index c3a5eab8defc..000000000000
--- a/dev-qt/qtspeech-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtspeech-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8fec0befc1bb220fcf41935f2330da1c
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
new file mode 100644
index 000000000000..9ae68b7ff5ce
--- /dev/null
+++ b/dev-qt/qtspeech/Manifest
@@ -0,0 +1,8 @@
+AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c3eeaa0a946346ae0725e2a7a9198fd0dce4bf85ad9b0d06e49234dc11203d5a0f52e11e17b879a9dc1712014e91 SHA512 8d2dce3280948bc0451d0f753d415552c556c089d5195172953215c3abdf14100a3284699e9d5cfd0feca83466d1a35945a8bd2a863b325ea5e257b277a0e71f
+DIST qtspeech-everywhere-src-5.11.1.tar.xz 101732 BLAKE2B 2201a78f27851c4ec1d2a7056c6b0b620ff77b73be626940f6fe296baa677c5ee4a8098390be48620af77db10b75b777214b41c8dc3fd9b54f3a3cdf8f613345 SHA512 d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51
+DIST qtspeech-opensource-src-5.9.4.tar.xz 80860 BLAKE2B 8556d375edc5bf0e3edd9745cef6bccab3e2457efee1fa4cc3f6d4feb90da3f651135ba9034caac474ef2e9888bbb3a41771d85b4f8a13b16867ba516a42f47b SHA512 6e2913b23c57cb0dd407b09db78fbb9b6b15c721f6d7af65c744d71f8a66f235a1069b1098eb5cd8b35449255ef94af2a96b2c4a1c550fe0e03000e023c393d9
+DIST qtspeech-opensource-src-5.9.6.tar.xz 80716 BLAKE2B dd7b7fc52394cb9b9a9f31de3f08fe9efadc03694604f871f802b465a1bea6753be9ec2bd3843296403939dd2ae0b7e40e910b7fd01e0f8a17f82517531356ea SHA512 0a07c7cf0e58388f4fcd197d6b8f3b6a84a618974d725fc03847ab42b814dfe9e44025e8adcc5c66d9c7bb156e6b6e9457a62c8d2211e45de1ae27d89697e333
+EBUILD qtspeech-5.11.1.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
+EBUILD qtspeech-5.9.4.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
+EBUILD qtspeech-5.9.6.ebuild 477 BLAKE2B 0f511ae55bda8494d34bcc03721e58b019ad9fcdb40b4894e55e37c776b61b42a7fa76f0b12794c67c93d1bb911d5e9916e9f03edbc3a43e746f7de1c67224c5 SHA512 168ce792cb3bdc724bb290530fd7c829a78eea926a81a37c0ef246e52922bf0044114f795cb9de085aecd0c712c98cd5c778a22a48941dbbaac18c295c8d460b
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch b/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch
new file mode 100644
index 000000000000..fa5d900afdc1
--- /dev/null
+++ b/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/651012
+
+--- a/src/plugins/tts/speechdispatcher/speechdispatcher.pro
++++ b/src/plugins/tts/speechdispatcher/speechdispatcher.pro
+@@ -5,6 +5,7 @@
+ load(qt_plugin)
+ 
+ QT += core texttospeech
++QT -= gui
+ 
+ CONFIG += link_pkgconfig
+ packagesExist(speech-dispatcher): PKGCONFIG = speech-dispatcher
diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtspeech/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtspeech/qtspeech-5.11.1.ebuild b/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
new file mode 100644
index 000000000000..24627d2b8665
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
diff --git a/dev-qt/qtspeech/qtspeech-5.9.4.ebuild b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
new file mode 100644
index 000000000000..3b552c0e3d17
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
diff --git a/dev-qt/qtspeech/qtspeech-5.9.6.ebuild b/dev-qt/qtspeech/qtspeech-5.9.6.ebuild
new file mode 100644
index 000000000000..fb7bd527b471
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.9.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
diff --git a/dev-qt/qtsql-4.8.7-r1 b/dev-qt/qtsql-4.8.7-r1
deleted file mode 100644
index fa8727ad5c6c..000000000000
--- a/dev-qt/qtsql-4.8.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( || ( >=dev-db/unixODBC-2.3.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/libiodbc-3.52.8-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The SQL module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres qt3support +sqlite abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( || ( >=dev-db/unixODBC-2.3.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/libiodbc-3.52.8-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06755ff8361593fefe1e7a21463c3119
diff --git a/dev-qt/qtsql-5.11.1-r1 b/dev-qt/qtsql-5.11.1-r1
deleted file mode 100644
index cd2934714890..000000000000
--- a/dev-qt/qtsql-5.11.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 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 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.11.1
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=cad130ed082d8b57fa6419fe924b6266
diff --git a/dev-qt/qtsql-5.9.4-r1 b/dev-qt/qtsql-5.9.4-r1
deleted file mode 100644
index 3761105fdc7e..000000000000
--- a/dev-qt/qtsql-5.9.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 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 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c0f12d5b478f1d0234ca57cacea7c3b1
diff --git a/dev-qt/qtsql-5.9.6-r1 b/dev-qt/qtsql-5.9.6-r1
deleted file mode 100644
index 7cf60c1b43ce..000000000000
--- a/dev-qt/qtsql-5.9.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 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 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 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 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.9.6
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f11b62954a782ea66ccd1dadf7d03574
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
new file mode 100644
index 000000000000..e5b8e929e0b2
--- /dev/null
+++ b/dev-qt/qtsql/Manifest
@@ -0,0 +1,11 @@
+AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609
+AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
+EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 9370519007fd4316023f02b3c600b460d7f6700d5afd8a9021d44630b314c3e0ab80b17fc256f505a6569f76d71c66f7aef227f38e000432b4d54e3046aabbe8 SHA512 47784173975a4f6c0ab8d161c64ee7e511768f20b5179f6bb4e14196def668b89d7bd6edd969d97b68fc8e12b3df7229ebcae928c243c3584790a4accf374dbf
+EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a
+EBUILD qtsql-5.9.6-r1.ebuild 1621 BLAKE2B c0bfd65354609f7dbd0433ea26136775157c1d64bd3617d537bc36178c62c0e1f3c563965d3e5f25d52efa51f5e844f5e4d5c0accd4621afbda741d08abc4d74 SHA512 229e14702121ccea04cf4ed22e69167dc0c5d7df5e0dfef9c9f2f0908ba7b2622b11eb277281ad79170a70c4036c2b3b538cfaefbd4eada510b7d82b843277f3
+MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch
new file mode 100644
index 000000000000..bfd0c903bc35
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@qt.io>
+Date: Wed, 27 Sep 2017 09:23:10 +0200
+Subject: [PATCH] Extend the MariaDB define check to cover the later versions
+ too
+
+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
+---
+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+index 6e428fb..b2d3e85 100644
+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ 
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+     qAddPostRoutine(mysql_server_end);
+ #endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ #  if MYSQL_VERSION_ID > 40000
+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
+-- 
+2.7.4
+
diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
new file mode 100644
index 000000000000..79de44dca959
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@qt.io>
+Date: Wed, 27 Sep 2017 09:23:10 +0200
+Subject: [PATCH] Extend the MariaDB define check to cover the later versions
+ too
+
+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
+---
+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+index 6e428fb..b2d3e85 100644
+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ 
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+     qAddPostRoutine([]() { mysql_server_end(); });
+ #endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ #  if MYSQL_VERSION_ID > 40000
+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
+-- 
+2.7.4
+
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
new file mode 100644
index 000000000000..bea102dd5ae8
--- /dev/null
+++ b/dev-qt/qtsql/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
new file mode 100644
index 000000000000..089d7a76c79c
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit multilib qt4-build-multilib
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
+	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+	odbc? ( || (
+		>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
+		>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
+	) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_native_use freetds  sql-tds    plugin)
+		$(qt_use        mysql    sql-mysql  plugin) $(use mysql && echo -mysql_config "${EPREFIX}/usr/bin/${CHOST}-mysql_config")
+		$(qt_use        oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(qt_use        odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_native_use postgres sql-psql   plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use        sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-ibase
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-nis -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
new file mode 100644
index 000000000000..40fde45fdef4
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 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 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+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/qtsql/qtsql-5.9.4-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..ca002e4eca0f
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 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 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-mariadb-10.2.patch"
+	# See also: https://codereview.qt-project.org/#/c/206850/
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+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/qtsql/qtsql-5.9.6-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..e4c0d1add852
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 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 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+	# See also: https://codereview.qt-project.org/#/c/206850/
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+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-4.8.7 b/dev-qt/qtsvg-4.8.7
deleted file mode 100644
index be483fb92da4..000000000000
--- a/dev-qt/qtsvg-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The SVG module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37209ba46a9093d16f8f843c07b343c0
diff --git a/dev-qt/qtsvg-5.11.1 b/dev-qt/qtsvg-5.11.1
deleted file mode 100644
index b536e2a9067e..000000000000
--- a/dev-qt/qtsvg-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwidgets-5.11.1 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=14ee4aef44678546a8b106e7a23391a0
diff --git a/dev-qt/qtsvg-5.9.4-r2 b/dev-qt/qtsvg-5.9.4-r2
deleted file mode 100644
index fbb8c583cb2a..000000000000
--- a/dev-qt/qtsvg-5.9.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.9.4-r1:5/5.9 ~dev-qt/qtgui-5.9.4 >=dev-qt/qtwidgets-5.9.4-r1:5/5.9 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.9.4-r1:5/5.9 ~dev-qt/qtgui-5.9.4 >=dev-qt/qtwidgets-5.9.4-r1:5/5.9 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2150cdc4a5fedcbee24c0c486fed96a6
diff --git a/dev-qt/qtsvg-5.9.6 b/dev-qt/qtsvg-5.9.6
deleted file mode 100644
index 2b91b7a0b745..000000000000
--- a/dev-qt/qtsvg-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwidgets-5.9.6 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtsvg-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c955d353417eb1116224c2bc8ff5f0e2
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
new file mode 100644
index 000000000000..4b93c4d90b6b
--- /dev/null
+++ b/dev-qt/qtsvg/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
+DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
+DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4
+EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583
+EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f
+EBUILD qtsvg-5.9.4-r2.ebuild 491 BLAKE2B 1f78d69d00c5ff09b09581769de621315a993c709ed19c09064fde88008c924d0ec59779946d3b3f6385787586a406e63cf91b1db33dc531fb02574f296565b4 SHA512 0eee956fca2fcbf1b2ec2c934e0c76a289941ca7112f37cc66f41807290a3e640299972e5239bc8682d87ebb639ce30db27d6b0c34184d5f4c21ad01d9eabcb1
+EBUILD qtsvg-5.9.6.ebuild 470 BLAKE2B 3347da1beec207192163a454ce8d61a730e6082783cba005dadec23fcebfb1940ee9ba118315335670895b567a260a761f10a789e9c29d8af637f2dcfeb14afd SHA512 499a101af81f9cefca00356c1092ed06e508dc59733fcb3366b43a4e76cb9b45df7cb851a5fde417d5309462129bb0317933c672c6508d1786eabbb72b46c885
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/qtsvg/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
new file mode 100644
index 000000000000..e93289484ea4
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The SVG module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+accessibility"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/svg
+	src/plugins/imageformats/svg
+	src/plugins/iconengines/svgiconengine"
+
+QCONFIG_ADD="svg"
+QCONFIG_DEFINE="QT_SVG"
+
+multilib_src_configure() {
+	local myconf=(
+		-svg
+		$(qt_use accessibility)
+		-no-xkb  -no-xrender
+		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
+		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-fontconfig -no-glib -no-gtkstyle
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
new file mode 100644
index 000000000000..8afd46f07af4
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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/qtsvg/qtsvg-5.9.4-r2.ebuild b/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild
new file mode 100644
index 000000000000..9fe32a7d8818
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}-r1:${SLOT}
+	~dev-qt/qtgui-${PV}
+	>=dev-qt/qtwidgets-${PV}-r1:${SLOT}
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
diff --git a/dev-qt/qtsvg/qtsvg-5.9.6.ebuild b/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
new file mode 100644
index 000000000000..11d03ab64a5e
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-4.8.7 b/dev-qt/qttest-4.8.7
deleted file mode 100644
index 77f317f1e7a7..000000000000
--- a/dev-qt/qttest-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The QtTest module for unit testing Qt applications and libraries
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81855f82799c8b155558207a12bfda1f
diff --git a/dev-qt/qttest-5.11.1 b/dev-qt/qttest-5.11.1
deleted file mode 100644
index 4410cf07d427..000000000000
--- a/dev-qt/qttest-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 test? ( ~dev-qt/qtgui-5.11.1 ~dev-qt/qtxml-5.11.1 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2e81e792910e9a899673dc7685400b8a
diff --git a/dev-qt/qttest-5.9.4 b/dev-qt/qttest-5.9.4
deleted file mode 100644
index 58fbebcc87c8..000000000000
--- a/dev-qt/qttest-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 test? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtxml-5.9.4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=65867c01d6c80e1174fec91ddbac6303
diff --git a/dev-qt/qttest-5.9.6 b/dev-qt/qttest-5.9.6
deleted file mode 100644
index 38feecd00aa0..000000000000
--- a/dev-qt/qttest-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 test? ( ~dev-qt/qtgui-5.9.6 ~dev-qt/qtxml-5.9.6 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=711fee34244c423e92ede3311849615a
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
new file mode 100644
index 000000000000..c6a72532f3c0
--- /dev/null
+++ b/dev-qt/qttest/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8
+EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88
+EBUILD qttest-5.9.4.ebuild 545 BLAKE2B 85bbb66b553452f36b6afbd85eeb571008e7b9e0b243307a1cca65068f8ae7e0f50d2d9c65b65d4b70af4966495e57a093382d05afa69b112b0974c1aa14a224 SHA512 50a40c8669a267cfaaed421d9e5d48b22ac6cfeb502bc63b49abba6062f022b52c8141868c388a1a3c1f9fcf819070f29796fd0d229090b9a3eac39b8a4dcbb6
+EBUILD qttest-5.9.6.ebuild 548 BLAKE2B cb938477aa7530ce6cdac28b9f0ce707093527651272e13741854c8277b0c5e841c189099784f64f21699690c460dbef66ef455ea73a5f08f313a144d4e1a007 SHA512 b2eaa7f3c68d1c8363f6169628324b7100ea8a2a9fc4de6cfc42753914a067580d5b52bec9d1455b95070b8a0058a24c2e6a8619889fbe7b019f310beaa64fe6
+MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
new file mode 100644
index 000000000000..22d751f51bd7
--- /dev/null
+++ b/dev-qt/qttest/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
new file mode 100644
index 000000000000..c9adac525eb4
--- /dev/null
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/testlib"
+
+multilib_src_configure() {
+	local myconf=(
+		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
+		-no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-accessibility -no-fontconfig -no-glib -no-svg
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qttest/qttest-5.11.1.ebuild b/dev-qt/qttest/qttest-5.11.1.ebuild
new file mode 100644
index 000000000000..a136469c91b4
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.11.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttest/qttest-5.9.4.ebuild b/dev-qt/qttest/qttest-5.9.4.ebuild
new file mode 100644
index 000000000000..2cedc2d60395
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttest/qttest-5.9.6.ebuild b/dev-qt/qttest/qttest-5.9.6.ebuild
new file mode 100644
index 000000000000..da6174eb48eb
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.9.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttranslations-4.8.7 b/dev-qt/qttranslations-4.8.7
deleted file mode 100644
index 8c706e386273..000000000000
--- a/dev-qt/qttranslations-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7 dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Translation files for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1438e3e6cf1eae8e2f2210930ff7fb8
diff --git a/dev-qt/qttranslations-5.11.1 b/dev-qt/qttranslations-5.11.1
deleted file mode 100644
index 64f8e2a9db21..000000000000
--- a/dev-qt/qttranslations-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.11.1 ~dev-qt/qtcore-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=858222fbe161b7533a8b336a10464ee4
diff --git a/dev-qt/qttranslations-5.9.4 b/dev-qt/qttranslations-5.9.4
deleted file mode 100644
index 236f226ee2a9..000000000000
--- a/dev-qt/qttranslations-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.9.4 ~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttranslations-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b2dacaa0a20c4ab950509280aa77cf0
diff --git a/dev-qt/qttranslations-5.9.6 b/dev-qt/qttranslations-5.9.6
deleted file mode 100644
index c73118f9d589..000000000000
--- a/dev-qt/qttranslations-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.9.6 ~dev-qt/qtcore-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttranslations-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=ed5cfcf72a471771bb6dcb061f789063
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
new file mode 100644
index 000000000000..8293e7379ae6
--- /dev/null
+++ b/dev-qt/qttranslations/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
+DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
+DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7
+EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab
+EBUILD qttranslations-5.11.1.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
+EBUILD qttranslations-5.9.4.ebuild 375 BLAKE2B 1eb759e922cfdd8c16db5a2a275bd51b700369aaa0cc660cf80996506826f223dc1441c817bb5bc7ca2ab4d5eca57e71d2311821e257fd4371e254b3b30d6fba SHA512 6d72e2552b8fd5746029c4d76e43fa62162e520eed2a091d2ef605e9b6ffbede380dc9d6b6ac64774b309776346cbb6e71a889d1d647ef23d6700a28ae29e8b3
+EBUILD qttranslations-5.9.6.ebuild 378 BLAKE2B 7df8d7dd45418e168683722ef80a5418603dfcfc2532c011cce65f201fa9909c2d8985453e0f5686df2e3c3495c4986f0ec2090c35876d343e379ff5d2caf16d SHA512 6b9ccd26cb8729d1128869815d0c498a848a535f492db3739807029d5fdcca6c981af3356c07ee4ddf9d9074ccf048ec4108e9dde90c828ba65611cf5735474c
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qttranslations/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
new file mode 100644
index 000000000000..11907196f693
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Translation files for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
+
+QT4_TARGET_DIRECTORIES="translations"
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		qt4_prepare_env
+		qt4_symlink_tools_to_build_dir
+		qt4_foreach_target_subdir qt4_qmake
+	fi
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && qt4_multilib_src_compile
+}
+
+multilib_src_test() {
+	:
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && qt4_multilib_src_install
+}
diff --git a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
new file mode 100644
index 000000000000..0229115262ce
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qttranslations/qttranslations-5.9.4.ebuild b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
new file mode 100644
index 000000000000..c404aeb37701
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qttranslations/qttranslations-5.9.6.ebuild b/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
new file mode 100644
index 000000000000..c4c153634d7c
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard-5.11.1 b/dev-qt/qtvirtualkeyboard-5.11.1
deleted file mode 100644
index 878d9bbc9734..000000000000
--- a/dev-qt/qtvirtualkeyboard-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtsvg-5.11.1 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtsvg-5.11.1 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=1b9964e67e1af6c4c9ba75ce140ca939
diff --git a/dev-qt/qtvirtualkeyboard-5.9.4 b/dev-qt/qtvirtualkeyboard-5.9.4
deleted file mode 100644
index 33737dc0bfde..000000000000
--- a/dev-qt/qtvirtualkeyboard-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtsvg-5.9.4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtsvg-5.9.4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6c88317b2ba122037fd975d161466440
diff --git a/dev-qt/qtvirtualkeyboard-5.9.6 b/dev-qt/qtvirtualkeyboard-5.9.6
deleted file mode 100644
index f19ad47266ff..000000000000
--- a/dev-qt/qtvirtualkeyboard-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtsvg-5.9.6 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtsvg-5.9.6 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtvirtualkeyboard-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e150cbac6ce01a889ffe80462d10c83c
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
new file mode 100644
index 000000000000..c5ae6078bc9f
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -0,0 +1,7 @@
+DIST qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz 10648700 BLAKE2B 32ee4cff4951347d8cc6ca9bf34a983017520acd5692322e3409db27fa08aeef2784302eb326b95bb55ea9f23a113f20370bd2d2fc64496919205eb6d9511c13 SHA512 e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0
+DIST qtvirtualkeyboard-opensource-src-5.9.4.tar.xz 10026856 BLAKE2B 7097d8243d11bb7b3cbc9f85cb124ca587e6652a67877e3c771a5c5dcca9c20f952474ffe8ab434caa6d2620e66e381829dc23e3dec927c1776f31a76b599d30 SHA512 6c10d3432cdb61a800c0eba436e135908cc44b5d36d14c93230e7284aae6fd671e116ddb976e610b37c4251c0b6ce4325be4464fec73d042eb9e9f29ee4397e6
+DIST qtvirtualkeyboard-opensource-src-5.9.6.tar.xz 10045984 BLAKE2B 22d15eb3a6bdf8fa490eb6475785ca88a0c9f07f25e37c41d9d0171de9af71e3124567184a41c7b4e25a49edd8f794325a0cf141d8fd7f9491096b7a3bc5245a SHA512 a46dc3c387530f52be0b1f989a9bf9d01e363668d3e57142c40588b72457eda2bca2f3aca765a23db0359d070670bb6583a6c91d960ca7d87b118397ff453e5b
+EBUILD qtvirtualkeyboard-5.11.1.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
+EBUILD qtvirtualkeyboard-5.9.4.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
+EBUILD qtvirtualkeyboard-5.9.6.ebuild 1017 BLAKE2B db63cbad5b15e40139a41debd81f4c0d2c0fffbe6d2f922ec0f02406103a77d5e080d3c46a43ab9c6a9742c5d0c52f202a1b10aaee2eb3ab2ceead3df9280466 SHA512 0f55c083232432ee85129d8646c30977733573628a4833b0507e9e52b024e6db2fffc5d3c43f6765632172ddcf5de7bcbc4d9110e2f8fdaef786eddf69347a9b
+MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/metadata.xml b/dev-qt/qtvirtualkeyboard/metadata.xml
new file mode 100644
index 000000000000..1f6a41cfea6b
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="handwriting">Adds handwriting recognition integration support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
new file mode 100644
index 000000000000..21fd992d37cf
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit "")
+		$(usex spell "" CONFIG+=disable-hunspell)
+		$(usex xcb "" CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
+                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
+                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
+                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
new file mode 100644
index 000000000000..770ad2ccfbb5
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit "")
+		$(usex spell "" CONFIG+=disable-hunspell)
+		$(usex xcb "" CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
+                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
+                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
+                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild
new file mode 100644
index 000000000000..ce15ddc115d1
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit "")
+		$(usex spell "" CONFIG+=disable-hunspell)
+		$(usex xcb "" CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
+                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
+                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
+                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland-5.11.1 b/dev-qt/qtwayland-5.11.1
deleted file mode 100644
index 7b88a485ea7b..000000000000
--- a/dev-qt/qtwayland-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f8203b85ce0071070b9ba8613f5fe48c
diff --git a/dev-qt/qtwayland-5.9.4-r1 b/dev-qt/qtwayland-5.9.4-r1
deleted file mode 100644
index a6bc9175e030..000000000000
--- a/dev-qt/qtwayland-5.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+libinput xcomposite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=cdd1643c02992181b1922c37ce5e1d39
diff --git a/dev-qt/qtwayland-5.9.6 b/dev-qt/qtwayland-5.9.6
deleted file mode 100644
index 6add30897e87..000000000000
--- a/dev-qt/qtwayland-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=+libinput xcomposite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwayland-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4fd0021deb5787566f9a9b53a1237ec5
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
new file mode 100644
index 000000000000..4d5947180190
--- /dev/null
+++ b/dev-qt/qtwayland/Manifest
@@ -0,0 +1,8 @@
+AUX qtwayland-5.9.4-qquickwindow-crash.patch 3408 BLAKE2B c37b4bf3612509d08de1437181db18fe0c5abafbe447010ec092fe7657cf6b2536e2cb181a3741f52eb4dff30c39946602861ecf6916a9a4b6ad576aa7d24a72 SHA512 33f660550904e2811d8f2816c7e62020a342007f6ea444bd62a3560a74c1f5816a40c99df42b5923f4871b10828c8bff5155fa197db1f1cb7432ead02cd56477
+DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
+DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b84de2f51900e4e09ecd57aee800534998d3a2e733501da877f912c4b0ce671d417f543eb44bc1607225af0a134ba5702d17efae431 SHA512 93d43bdcc39fd471cdd335c0699c5e5dd77cd0bc2d15f2a1170d8ccd103d84e2c7e657575a370ac6c678b52c2b617fb2c80ce4d226264cb6c857064452f7dc10
+DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
+EBUILD qtwayland-5.11.1.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
+EBUILD qtwayland-5.9.4-r1.ebuild 973 BLAKE2B 11a8749fecdbc4fc8035ad2001dd4614e17d2577f194d6ba10a02fc5929e31e65488e86857498ea822590b098295722938096c2901c391cad97e78ab0c477de8 SHA512 7288dd998a999c98eb2053f21c82f9d0518ce6d79a6992bea0b1a58c6bfedcc530cdea0e0b501751df0e07c8afdee4a21a6bcadc945cb8dcdd0a07cb6ef2e4a8
+EBUILD qtwayland-5.9.6.ebuild 906 BLAKE2B 5e40da583875aec4d19a346654f5daa11c5887ed1783fdfbad211316ee1148f2d2ae6dba3fceaecd8b398721602c68ba602e2165c0a848951be81af81120ec4a SHA512 01daebae4a839b188bbd71b1c09fb84614af6f6287978d6905923cf78f1478581a7dc50321401447cb0f32cfddda8fa157ace1cd3f86f00f97f3bcf01257a51a
+MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
new file mode 100644
index 000000000000..40f2a6dff4e0
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
@@ -0,0 +1,109 @@
+From bf09c7a1493c01a65ee0f110b37a04e653edc08e Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 3 Jan 2018 19:18:42 +0000
+Subject: [PATCH] Don't recreate hidden egl surfaces
+
+QWaylandEglWindow deletes surfaces when a window changes from hidden to
+visible, presumably as a result of us not having a valid wl_surface
+object. By extension it doesn't make sense to create a surface whilst a
+window is still hidden.
+
+This fixes a crash where a QQuickWindow hides and then is destroyed. In
+QQuickWindow destruction we have to create a valid context in order to
+delete any textures/assets owned by the scene graph; as the wl_surface
+has gone this causes an error in the EGL libs when we create an EGL
+surface.
+
+Task-number: QTBUG-65553
+Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116
+Reviewed-by: Johan Helsing <johan.helsing@qt.io>
+---
+ .../client/wayland-egl/qwaylandglcontext.cpp       |  2 +-
+ tests/auto/client/client/tst_client.cpp            | 37 ++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+index 2a9e39e..f4dd6f4 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+@@ -407,7 +407,7 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
+         window->createDecoration();
+ 
+     if (eglSurface == EGL_NO_SURFACE) {
+-        window->updateSurface(true);
++        window->updateSurface(window->isExposed());
+         eglSurface = window->eglSurface();
+     }
+ 
+diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
+index 3897bd3..aed601d 100644
+--- a/tests/auto/client/client/tst_client.cpp
++++ b/tests/auto/client/client/tst_client.cpp
+@@ -35,6 +35,8 @@
+ #include <QMimeData>
+ #include <QPixmap>
+ #include <QDrag>
++#include <QWindow>
++#include <QOpenGLWindow>
+ 
+ #include <QtTest/QtTest>
+ #include <QtWaylandClient/private/qwaylandintegration_p.h>
+@@ -112,6 +114,25 @@ public:
+     QPoint mousePressPos;
+ };
+ 
++class TestGlWindow : public QOpenGLWindow
++{
++    Q_OBJECT
++
++public:
++    TestGlWindow();
++
++protected:
++    void paintGL() override;
++};
++
++TestGlWindow::TestGlWindow()
++{}
++
++void TestGlWindow::paintGL()
++{
++    glClear(GL_COLOR_BUFFER_BIT);
++}
++
+ class tst_WaylandClient : public QObject
+ {
+     Q_OBJECT
+@@ -149,6 +170,7 @@ private slots:
+     void dontCrashOnMultipleCommits();
+     void hiddenTransientParent();
+     void hiddenPopupParent();
++    void glWindow();
+ 
+ private:
+     MockCompositor *compositor;
+@@ -409,6 +431,21 @@ void tst_WaylandClient::hiddenPopupParent()
+     QTRY_VERIFY(compositor->surface());
+ }
+ 
++void tst_WaylandClient::glWindow()
++{
++    QSKIP("Skipping GL tests, as not supported by all CI systems: See https://bugreports.qt.io/browse/QTBUG-65802");
++
++    QScopedPointer<TestGlWindow> testWindow(new TestGlWindow);
++    testWindow->show();
++    QSharedPointer<MockSurface> surface;
++    QTRY_VERIFY(surface = compositor->surface());
++
++    //confirm we don't crash when we delete an already hidden GL window
++    //QTBUG-65553
++    testWindow->setVisible(false);
++    QTRY_VERIFY(!compositor->surface());
++}
++
+ int main(int argc, char **argv)
+ {
+     setenv("XDG_RUNTIME_DIR", ".", 1);
+-- 
+2.7.4
+
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
new file mode 100644
index 000000000000..4fb03e679017
--- /dev/null
+++ b/dev-qt/qtwayland/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
new file mode 100644
index 000000000000..4c3553046dbc
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput?]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..5a6da39c498d
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ppc ppc64 x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput?]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qquickwindow-crash.patch" ) # 5.9 branch
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild b/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
new file mode 100644
index 000000000000..95d69972cf65
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput?]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebchannel-5.11.1 b/dev-qt/qtwebchannel-5.11.1
deleted file mode 100644
index c094f31701a4..000000000000
--- a/dev-qt/qtwebchannel-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=6e7a90249ca184cf597c8976510d7c84
diff --git a/dev-qt/qtwebchannel-5.9.4 b/dev-qt/qtwebchannel-5.9.4
deleted file mode 100644
index a13496becb8d..000000000000
--- a/dev-qt/qtwebchannel-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f6c150c7ac706382b9a26b4f74189dd1
diff --git a/dev-qt/qtwebchannel-5.9.6 b/dev-qt/qtwebchannel-5.9.6
deleted file mode 100644
index dadd515e3f44..000000000000
--- a/dev-qt/qtwebchannel-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebchannel-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=47eac3e865ce17e4dd753f56d31cdca4
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
new file mode 100644
index 000000000000..a3ae5e4c3d67
--- /dev/null
+++ b/dev-qt/qtwebchannel/Manifest
@@ -0,0 +1,7 @@
+DIST qtwebchannel-everywhere-src-5.11.1.tar.xz 179700 BLAKE2B 05f945110ec743aee4357ee696bee4ac230489c816b8cc630c6cd1344b5c385412470e2d4c6c7ddb2f044a17e2fce70f62d4244accac0e394a97a8ce638f3c72 SHA512 e0a18919cc4fe858eb1a623fc4e79c2936b4ea390d23611a708dd8fc26aac4ecbc262a5b0194f0a4df1fbe69c53568a62183e5847e0bf4c73cbce2122170e0a9
+DIST qtwebchannel-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
+DIST qtwebchannel-opensource-src-5.9.6.tar.xz 147564 BLAKE2B b94d420e8b694aef37c620ccc2c8dbff31887686e8afd70ff547e7466a6dff21457872b6a2aafc15d676005db85b202fb8260529d94078279e5ec1cd3d9e06be SHA512 f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5
+EBUILD qtwebchannel-5.11.1.ebuild 572 BLAKE2B f1c0e3733716fde195c07c6b5902259a7f036552727a4ac893c683ac6c1ab09b82ded3ca27f1ff5bda111830112fc73c7538f9b015d7c8389bcc8990683891e7 SHA512 f05966782c48702b6523f159d3b5d138b4c85946ee947834c4fba0325c2260d5e633b0fadf5a43c7ad60d678e67864bda3556c35ed5dea8ff16a9ad8d8b6a1b9
+EBUILD qtwebchannel-5.9.4.ebuild 564 BLAKE2B 841c1280a0faeb5fe4d2df74b87f359aab2152272e56286a7faf7af0206247a15a50f979a252c2b57a5acb9b5c72991ce3d9582fd4471c2132b465532c935afc SHA512 24facdba59179122b01c05f03d67ddeacbc6d2333057ab36101685128ca80037e63e11d74752236c4cd83a573d74c75f2d94e3a7165333cd7a295ca2fade415c
+EBUILD qtwebchannel-5.9.6.ebuild 571 BLAKE2B 25510a06cc63c6b2db8c2e12bbb3ed6049544cd327dd60921db517305836f5624b0a51b4884aa94bdb64ff0c67594d95845a7800f43bec15c4ea7babc83cc421 SHA512 76e42c82e821a995ad07cf60ce0db7a0233a93a738534d885e1d5e93a6ed1bd9be656cec8ae023a6c34f317e0cdb2c16549831ddb5243d8186fa3645838bba16
+MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/metadata.xml b/dev-qt/qtwebchannel/metadata.xml
new file mode 100644
index 000000000000..d437181335d4
--- /dev/null
+++ b/dev-qt/qtwebchannel/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
new file mode 100644
index 000000000000..7f4acf242e82
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 ~arm64 ~ppc ~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/qtwebchannel/qtwebchannel-5.9.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
new file mode 100644
index 000000000000..4ab90dad0123
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 ~arm64 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/qtwebchannel/qtwebchannel-5.9.6.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.6.ebuild
new file mode 100644
index 000000000000..ff1e54522c79
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 ~arm64 ~ppc ~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-5.11.1 b/dev-qt/qtwebengine-5.11.1
deleted file mode 100644
index 5b6b48d6ed08..000000000000
--- a/dev-qt/qtwebengine-5.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=806932f1a383eecec8fe81bec5a3efd9
diff --git a/dev-qt/qtwebengine-5.9.4 b/dev-qt/qtwebengine-5.9.4
deleted file mode 100644
index f9c03a109f57..000000000000
--- a/dev-qt/qtwebengine-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwebchannel-5.9.4[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= 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[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 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 alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ~dev-qt/qtwidgets-5.9.4 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwebchannel-5.9.4[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= 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[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 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 alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=beab5a3f85a25a404648c9581592cfcc
diff --git a/dev-qt/qtwebengine-5.9.6-r1 b/dev-qt/qtwebengine-5.9.6-r1
deleted file mode 100644
index 33442bce543e..000000000000
--- a/dev-qt/qtwebengine-5.9.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= 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[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( <media-video/ffmpeg-4:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= 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[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 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 alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( <media-video/ffmpeg-4:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebengine-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=1a330a62a2154acf91791636195e1f61
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
new file mode 100644
index 000000000000..7f30d48b07a2
--- /dev/null
+++ b/dev-qt/qtwebengine/Manifest
@@ -0,0 +1,16 @@
+AUX qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch 2517 BLAKE2B 8339355528656eee5a86866017173aac5036db853c92679d83fa8036561af49cd980022099912c58a7384cd9f3b95e26b8adeb22683fc7848d20cb4e4352f616 SHA512 f6fc127d80e9db6cbe971bcdfb3ddf7ec44c083b9f30fb415ec4e04cb263b3d3087e7dfbf984ad33782ae0ea769e4038acb3f2777a2f164d9d81bb9ac319ffc9
+AUX qtwebengine-5.11.1-ffmpeg4.patch 1261 BLAKE2B 1c076c83921f223b6001d2bd71039637ffe7cab8c2f88c3ba6aa78a4ec6f8cbfc6fcdba6a89e8c8cb2d6e8f38dc06bcd28e9012931632d7af2d0157bdaaa1579 SHA512 64c64db96b1270d157c08fe572cde7e559700ced28b5b350a46ce1f1f0007a871f165547ef8a2d26b2269bd592b92c3aa2655618917c4f3c2d4f02165eef2c91
+AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c6051874c7a7d9d36caaebd86a9689682a19ea8f16df68ff9403a5d182a33ae5bc9b5efbb485bbdd335e81757642f1a71f562fb3ae2533af5d67 SHA512 284fbee4559a38a64e7426be272f4d4362613d8a55c6aef2123c12ddfef3f5c2cfb534bd11ba4c698b6c2bf29bc58fb4c6a06eef7bdf7e766d99673c2434dcf5
+AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0
+AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
+AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
+AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
+AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
+AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
+DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
+DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
+DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
+EBUILD qtwebengine-5.11.1.ebuild 3561 BLAKE2B 5da8a844634a2e22317fcc70f4a69fe659d8c545016087b267f1cec7a831a5e400068fc7fd08183b85ad980dd8f17d07e00e6bca1ab3a43b3e16b5cca0c99baf SHA512 feda1a965eeb27cb5ed4af78807a0cec6c39ddde4379f70c06baa4deb65e6c5bfdfded950c892028afa746ed975fd2f2fa6e53abef2e2a95f9e8562ac4e2285c
+EBUILD qtwebengine-5.9.4.ebuild 3228 BLAKE2B e9028450e30f0ba3d9756ed933b03182de04e38b4f465be7256c5d9d40c494a8b6e35758b9028e532347423123a814867e95a308511a1a6bd7fc0117b0b7b67c SHA512 ed99c3d3ff0f5b3bb49cd78bf5463852b42f44775d98b6fad0412b4ae0f768ea5cd7d96562cb7c261e6e3168c4413233b2ec5a973ef2d4c48e4492c99415ac57
+EBUILD qtwebengine-5.9.6-r1.ebuild 3412 BLAKE2B 028878c71afaa96e3b3e138e145bdcbd946d6f6b2b0c196031141848c7bf648a28741d3a23a8f6a6e960e354a574c858a5d9913019fab44e5045d66f025c2149 SHA512 16df5dc2a5e8b8127a0fbd4e183de93b1bcecc248f0683b7b07e27663aceca238a8047f84e6d89235a364d8d23b3f867aa29ef26a987705250990a3b1f515043
+MISC metadata.xml 1096 BLAKE2B a4b3f106b5a3ea4468e6b1b5b458b69f310b0a89b02ab6720d13a6df727686570385f065caf84e782a4043b9027823dbabc5ab67fec209db97139aad64aae1ed SHA512 e3864852c1da88f27b5d384ac2b63b2e93551db73242be03283dd2a23dc27835f05cd7ad8655053b24a06a7d402c3ba1142f49d3ae72a2cdd4cb778b09e8404a
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
new file mode 100644
index 000000000000..4b2676faa6a0
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
@@ -0,0 +1,68 @@
+From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 11 Jun 2018 16:16:55 +0300
+Subject: Add fallback lookup for eglGetProcAddress
+
+Use the GLContext to find address for eglGetProcAddress symbol, if it's
+not found with dlopen.
+
+Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ src/core/gl_context_qt.cpp | 11 +++++++++++
+ src/core/gl_context_qt.h   |  1 +
+ src/core/gl_surface_qt.cpp |  4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
+index 9ed1db8b..95491709 100644
+--- a/src/core/gl_context_qt.cpp
++++ b/src/core/gl_context_qt.cpp
+@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress()
+     return get_proc_address;
+ }
+ 
++QFunctionPointer GLContextHelper::getEglGetProcAddress()
++{
++     QFunctionPointer get_proc_address = nullptr;
++#ifndef QT_NO_OPENGL
++    if (QOpenGLContext *context = qt_gl_global_share_context()) {
++        get_proc_address = context->getProcAddress("eglGetProcAddress");
++    }
++#endif
++    return get_proc_address;
++}
++
+ QT_END_NAMESPACE
+ 
+ #if defined(USE_OZONE) || defined(OS_WIN)
+diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
+index 8ffdad58..cecceabc 100644
+--- a/src/core/gl_context_qt.h
++++ b/src/core/gl_context_qt.h
+@@ -63,6 +63,7 @@ public:
+     static void* getXDisplay();
+     static void* getNativeDisplay();
+     static QFunctionPointer getGlXGetProcAddress();
++    static QFunctionPointer getEglGetProcAddress();
+ private:
+     Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs);
+ 
+diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
+index 7e579246..4d38d7c2 100644
+--- a/src/core/gl_surface_qt.cpp
++++ b/src/core/gl_surface_qt.cpp
+@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
+               base::GetFunctionPointerFromNativeLibrary(library,
+                                                         "eglGetProcAddress"));
+       if (!get_proc_address) {
++          QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
++          get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address);
++      }
++      if (!get_proc_address) {
+         LOG(ERROR) << "eglGetProcAddress not found.";
+         base::UnloadNativeLibrary(library);
+         return false;
+-- 
+cgit v1.1-6-g87c4
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
new file mode 100644
index 000000000000..e9ef452a8d95
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
@@ -0,0 +1,32 @@
+From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
+From: Xiaohan Wang <xhwang@chromium.org>
+Date: Mon, 29 Jan 2018 21:28:28 +0000
+Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
+
+AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
+https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
+
+BUG=777484
+
+Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
+Reviewed-on: https://chromium-review.googlesource.com/889686
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#532593}
+---
+ src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
+index 0341e5784f725..60ffba708b0e5 100644
+--- a/src/3rdparty/chromium/media/base/decoder_buffer.h
++++ b/src/3rdparty/chromium/media/base/decoder_buffer.h
+@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
+     : public base::RefCountedThreadSafe<DecoderBuffer> {
+  public:
+   enum {
+-    kPaddingSize = 32,
++    kPaddingSize = 64,
+ #if defined(ARCH_CPU_ARM_FAMILY)
+     kAlignmentSize = 16
+ #else
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
new file mode 100644
index 000000000000..8ac5b90b72c8
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
@@ -0,0 +1,46 @@
+--- a/config.tests/xml2/xml2.cpp
++++ b/config.tests/xml2/xml2.cpp
+@@ -27,9 +27,6 @@
+ ****************************************************************************/
+ 
+ #include <libxml/xmlversion.h>
+-#if defined(LIBXML_CATALOG_ENABLED)
+-#error "libxml catalog enabled"
+-#endif
+ #if !defined(LIBXML_ICU_ENABLED)
+ #error "libxml icu not enabled"
+ #endif
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
+@@ -28,6 +28,10 @@
+ 
+ #include <libxml/parser.h>
+ #include <libxml/parserInternals.h>
++#include <libxml/xmlversion.h>
++#if defined(LIBXML_CATALOG_ENABLED)
++#include <libxml/catalog.h>
++#endif
+ #include <libxslt/xslt.h>
+ #include <memory>
+ #include "core/css/StyleEngine.h"
+@@ -538,10 +542,6 @@
+ static bool ShouldAllowExternalLoad(const KURL& url) {
+   String url_string = url.GetString();
+ 
+-  // libxml should not be configured with catalogs enabled, so it
+-  // should not be asking to load default catalogs.
+-  CHECK(!IsLibxmlDefaultCatalogFile(url));
+-
+   // The most common DTD. There isn't much point in hammering www.w3c.org by
+   // requesting this URL for every XHTML document.
+   if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
+@@ -646,6 +646,9 @@
+   if (did_init)
+     return;
+ 
++#if defined(LIBXML_CATALOG_ENABLED)
++  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
++#endif
+   xmlInitParser();
+   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
+   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
new file mode 100644
index 000000000000..aaf3aae462ab
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
@@ -0,0 +1,98 @@
+From: Antonio Larrosa <alarrosa@suse.com>
+Subject: Disable GPU when using nouveau or running on wayland
+References: boo#1005323, boo#1060990
+
+Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support.
+It also crashes when running on wayland, the cause is not yet known.
+Work around these issues by not doing GPU-accelerated rendering in such
+cases.
+
+Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+===================================================================
+--- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp
++++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+@@ -100,6 +100,7 @@
+ #include <QOffscreenSurface>
+ #ifndef QT_NO_OPENGL
+ # include <QOpenGLContext>
++# include <QOpenGLFunctions>
+ #endif
+ #include <QQuickWindow>
+ #include <QStringList>
+@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v
+ }
+ #endif
+ 
++#ifndef QT_NO_OPENGL
++QString openGLVendor()
++{
++    QString vendor;
++
++    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
++    QSurface *oldSurface = 0;
++    if (oldContext)
++        oldSurface = oldContext->surface();
++
++    QScopedPointer<QOffscreenSurface> surface( new QOffscreenSurface );
++    surface->create();
++    QOpenGLContext context;
++    if (!context.create()) {
++        qDebug() << "Error creating openGL context";
++    }
++    else if (!context.makeCurrent(surface.data())) {
++        qDebug() << "Error making openGL context current context";
++    } else {
++        const GLubyte *p;
++        QOpenGLFunctions *f = context.functions();
++        if ((p = f->glGetString(GL_VENDOR)))
++            vendor = QString::fromLatin1(reinterpret_cast<const char *>(p));
++    }
++
++    context.doneCurrent();
++    if (oldContext && oldSurface)
++        oldContext->makeCurrent(oldSurface);
++
++    return vendor;
++}
++#endif
++
+ } // namespace
+ 
+ namespace QtWebEngineCore {
+@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext()
+     const char *glType = 0;
+ #ifndef QT_NO_OPENGL
+ 
++    bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
++
++    if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive))
++    {
++        qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n"
++                      "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n"
++                      "environment variable before running this application, but this is \n"
++                      "not recommended since this usually causes applications to crash.";
++        disableGpu = true;
++    }
++
++    if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau"))
++    {
++        qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n"
++                      "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n"
++                      "environment variable before running this application, but this is \n"
++                      "not recommended since this usually causes applications to crash as\n"
++                      "Nouveau openGL drivers don't support multithreaded rendering";
++        disableGpu = true;
++    }
++
+     bool tryGL =
+             !usingANGLE()
+             && (!usingSoftwareDynamicGL()
+@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext()
+                 || enableWebGLSoftwareRendering
+ #endif
+                 )
+-            && !usingQtQuick2DRenderer();
++            && !usingQtQuick2DRenderer() && !disableGpu;
+ 
+     if (tryGL) {
+         if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
new file mode 100644
index 000000000000..9866ab929194
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+   // are added to the allowed set. The list has to be updated when a new
+   // version of Unicode is released. The current version is 9.0.0 and ICU 60
+   // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+   const icu::UnicodeSet aspirational_scripts(
+       icu::UnicodeString(
+           // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
new file mode 100644
index 000000000000..ecedaf62f344
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -661,6 +661,7 @@ action("run_mksnapshot") {
+ 
+   deps = [
+     ":mksnapshot($v8_snapshot_toolchain)",
++    ":run_paxmark",
+   ]
+ 
+   script = "tools/run.py"
+@@ -706,6 +707,28 @@ action("run_mksnapshot") {
+     args += [ rebase_path(v8_embed_script, root_build_dir) ]
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++    ":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++     "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++    "-sm",
++    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++                                      "root_out_dir") + "/mksnapshot",
++                       root_build_dir),
++  ]
++}
+ 
+ action("run_mkpeephole") {
+   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
new file mode 100644
index 000000000000..8b739680f685
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
@@ -0,0 +1,70 @@
+From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001
+From: Viktor Engelmann <viktor.engelmann@qt.io>
+Date: Fri, 18 Aug 2017 14:50:20 +0200
+Subject: [PATCH] Fix improper boolean values
+
+jpeg_codec.cc contained some implicit conversions to boolean, which
+is apparently problematic for some versions of libjpeg. Patch
+taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191
+but not backported, since it has not been accepted into chromium yet.
+
+Task-Number: QTBUG-58482
+
+Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+index 6d92637..85c7bec 100644
+--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
+   // tell libjpeg where to write the next data
+   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
+   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
+-  return 1;
++  return TRUE;
+ }
+ 
+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
+@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+   cinfo.data_precision = 8;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
++  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
+ 
+   // set up the destination manager
+   jpeg_destination_mgr destmgr;
+@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+   JpegEncoderState state(output);
+   cinfo.client_data = &state;
+ 
+-  jpeg_start_compress(&cinfo, 1);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
+ //   set to a positive value if TRUE is returned. A FALSE return should only
+ //   be used when I/O suspension is desired."
+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
+-  return false;
++  return FALSE;
+ }
+ 
+ // Skip data in the buffer. Since we have all the data at once, this operation
+@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
+   cinfo.client_data = &state;
+ 
+   // fill the file metadata into our buffer
+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
++  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
+     return false;
+ 
+   // we want to always get RGB data out
+-- 
+2.7.4
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
new file mode 100644
index 000000000000..ef5f44efcf23
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
@@ -0,0 +1,46 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-01-15 12:39:43.000000000 +0100
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-02-06 20:55:37.455912163 +0100
+@@ -57,12 +57,12 @@
+ };
+ extern "C" {
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+-  return 0;
++  return FALSE;
+ }
+ };
+ extern "C" {
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+-  return 0;
++  return FALSE;
+ }
+ };
+ extern "C" {
+@@ -126,7 +126,7 @@
+     jpeg_destroy_decompress(&cinfo);
+     return false;
+   }
+-  int ret = jpeg_read_header(&cinfo, true);
++  int ret = jpeg_read_header(&cinfo, TRUE);
+   if (ret != JPEG_HEADER_OK) {
+     jpeg_destroy_decompress(&cinfo);
+     return false;
+@@ -210,7 +210,7 @@
+   }
+   cinfo.image_width = m_OrigWidth;
+   cinfo.image_height = m_OrigHeight;
+-  int ret = jpeg_read_header(&cinfo, true);
++  int ret = jpeg_read_header(&cinfo, TRUE);
+   if (ret != JPEG_HEADER_OK)
+     return false;
+ 
+@@ -433,7 +433,7 @@
+   if (setjmp(ctx->m_JumpMark) == -1)
+     return 1;
+ 
+-  int ret = jpeg_read_header(&ctx->m_Info, true);
++  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+   if (ret == JPEG_SUSPENDED)
+     return 2;
+   if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
new file mode 100644
index 000000000000..ba6a49fd7488
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
@@ -0,0 +1,24 @@
+From: Fedora
+Subject: Fix build for 32-bit platforms
+
+Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source?
+https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch
+
+diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h
+--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h	2018-05-15 14:58:46.448912634 -0400
++++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h	2018-05-15 14:58:52.041784613 -0400
+@@ -18,7 +18,13 @@
+ #endif
+ 
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
new file mode 100644
index 000000000000..cd7c273bf4c3
--- /dev/null
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="designer">Install the QWebEngineView plugin used to add widgets in
+			<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
+		<flag name="geolocation">Enable physical position determination
+			via <pkg>dev-qt/qtpositioning</pkg></flag>
+		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
+			instead of bundled.</flag>
+		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+			instead of bundled.</flag>
+		<flag name="widgets">Enable QtWidgets support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
new file mode 100644
index 000000000000..b1eb5634dd54
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 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 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( 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/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc]
+	media-libs/libwebp:=
+	media-libs/mesa[egl]
+	media-libs/opus
+	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
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/designer-${PV} )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( dev-libs/icu:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+	"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
+	"${FILESDIR}/${P}-ffmpeg4.patch"
+	"${FILESDIR}/${P}-eglGetProcAddress-fallback-lookup.patch" # 5.11 branch
+	"${FILESDIR}/${P}-nouveau-disable-gpu.patch" # bug 609752
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	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=(
+		--
+		-opus
+		-printing-and-pdf
+		-webp
+		$(usex alsa '-alsa' '')
+		$(usex bindist '' '-proprietary-codecs')
+		$(usex pulseaudio '-pulseaudio' '')
+		$(usex system-ffmpeg '-ffmpeg' '')
+		$(usex system-icu '-webengine-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/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
new file mode 100644
index 000000000000..b3c814f5d936
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 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 ~arm ~arm64 x86"
+fi
+
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +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/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	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[egl]
+	media-libs/opus
+	net-libs/libsrtp:0=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/libcap
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0
+	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
+	alsa? ( media-libs/alsa-lib )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( dev-libs/icu:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.9.3-icu-60.1.patch"
+	"${FILESDIR}/${P}-jpeg-9-1.patch" # bug 607424
+	# TODO upstream:
+	"${FILESDIR}/${P}-jpeg-9-2.patch" # bug 646456
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	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/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..a8c75e67834d
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 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 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( 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/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	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[egl]
+	media-libs/opus
+	net-libs/libsrtp:0=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/libcap
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0
+	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
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/designer-${PV} )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( <media-video/ffmpeg-4:0= )
+	system-icu? ( dev-libs/icu:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
+	"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
+	"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+	"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	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-5.212.0_pre20180120 b/dev-qt/qtwebkit-5.212.0_pre20180120
deleted file mode 100644
index b14832d213fc..000000000000
--- a/dev-qt/qtwebkit-5.212.0_pre20180120
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems dev-lang/perl dev-util/gperf >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=BSD LGPL-2+
-RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
-REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
-SLOT=5/5.212
-SRC_URI=http://code.qt.io/cgit/qt/qtwebkit.git/snapshot/72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da.tar.gz -> qtwebkit-5.212.0_pre20180120.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b35cc030a6d28d08270303e7efd0f879
diff --git a/dev-qt/qtwebkit-5.9.1 b/dev-qt/qtwebkit-5.9.1
deleted file mode 100644
index 2d874abdcc92..000000000000
--- a/dev-qt/qtwebkit-5.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5[icu] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5 ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.1:5 ) webp? ( media-libs/libwebp:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/rubygems test? ( >=dev-qt/qttest-5.9.1:5 ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5[icu] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5 ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.1:5 ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
-REQUIRED_USE=?? ( gstreamer multimedia )
-RESTRICT=mirror test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5e2fa4913763e7b1a708de05db258f39
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
new file mode 100644
index 000000000000..8daeac3610f5
--- /dev/null
+++ b/dev-qt/qtwebkit/Manifest
@@ -0,0 +1,9 @@
+AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
+AUX qtwebkit-5.4.2-system-leveldb.patch 711 BLAKE2B 26eb498e422836585b2fb2c1212600bc57ef2b13ed64c790efd346e7a8e780132f3158775bf5df0aefcb795f8f50e510dc065114fb71521bd0afa116f29575e1 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb
+AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9d69ab992d29df3a62630bf077e211d6c1d3848a93ab25bb6bae2971e44518dafe2841c8b78d3556f1d8f1380d85269fb2 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749
+AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
+DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
+DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3667 BLAKE2B e3ad28e501011ea9196a8d8b882c19851d5ce4da44f27b506250571d8153fb52f8e512b126061592e13e3292783da6e0a430d8deb819483da574983a4c11f528 SHA512 dbb45888740314be77a463ed8bc3c102b5763f0a2c10d1f637184ee03d79f330c3c51d8bbfd671d7183e13cecd4191b91fd1e822c79c5aeb325d99f81d865b8b
+EBUILD qtwebkit-5.9.1.ebuild 3503 BLAKE2B 0bed04771bb14fbea809c3a2db5254943883f34b971b459c3c2a3f008660b24c4813b800cd14bc4a47c1d807ed17725e16eddc30f6f50ed62cf678931d6e2f87 SHA512 5b80352dcf1f6be843cd94b90c90552c06662494359b1d84a91e495274674fc3bc9a807e8e86d67da96ca28e00c7a74590a250e74d845183ff53fd002bec51c9
+MISC metadata.xml 1374 BLAKE2B 582f07a66b4dd4ff72e865c69596a364247bffbe1c11ea4a77c38c8b1dd6af6062a97889116387a251e890aee572724f2293e7b281fb5200fa3b3c1b91d4ccde SHA512 6f845148e018566a18f4dc86f1ff2224c45e5a135083263f7335fb0bb7a5ebba620787485ac1746f5207854b752be9ab3e5385b4fed63251359172bd4c196742
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
new file mode 100644
index 000000000000..d8b5ba6cf31e
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
@@ -0,0 +1,22 @@
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Fri, 26 Jan 2018 20:50:07 +0300
+Subject: [PATCH] Add missing #include <functional>
+
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa6de8..9b9ebe429816 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ 
++#include <functional>
+ #include <wtf/HashMap.h>
+ #include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
new file mode 100644
index 000000000000..265d5075f2fa
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ 
+ int main(int, char**)
+ {
+
+--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
new file mode 100644
index 000000000000..40e58f0d0dec
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg <zorry@gentoo.org>
+Gentoo-bug: 562396
+
+--- a/Tools/qmake/mkspecs/features/features.pri
++++ b/Tools/qmake/mkspecs/features/features.pri
+@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
+     ENABLE_INPUT_TYPE_WEEK=0 \
+     ENABLE_INSPECTOR=1 \
+     ENABLE_INSPECTOR_SERVER=1 \
++    ENABLE_JIT=0 \
+     ENABLE_JAVASCRIPT_DEBUGGER=1 \
+     ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+     ENABLE_LEGACY_NOTIFICATIONS=1 \
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
new file mode 100644
index 000000000000..867e8dcb8ef9
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- a/Tools/qmake/mkspecs/features/features.prf
++++ b/Tools/qmake/mkspecs/features/features.prf
+@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
+ 
+     # HTML5 Media Support for builds with GStreamer
+     unix:!mac:qtConfig(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/metadata.xml b/dev-qt/qtwebkit/metadata.xml
new file mode 100644
index 000000000000..c7df499ff74f
--- /dev/null
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<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="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</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>
+		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
+		<flag name="webp">Add support for WebP image format</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
new file mode 100644
index 000000000000..98972468ba2d
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2+"
+SLOT="5/5.212"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
+
+REQUIRED_USE="
+	nsplugin? ( X )
+	qml? ( opengl )
+	?? ( gstreamer multimedia )
+"
+
+# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${QT_MIN_VER}
+	>=dev-qt/qtgui-${QT_MIN_VER}
+	>=dev-qt/qtnetwork-${QT_MIN_VER}
+	>=dev-qt/qtwidgets-${QT_MIN_VER}=
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+	opengl? (
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+	)
+	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+	qml? (
+		>=dev-qt/qtdeclarative-${QT_MIN_VER}
+		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	dev-lang/perl
+	dev-util/gperf
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${COMMIT}
+
+PATCHES=( "${FILESDIR}/${P}-functional.patch" )
+
+CHECKREQS_DISK_BUILD="16G" # bug 417307
+
+_check_reqs() {
+	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
+		check-reqs_$1
+	fi
+}
+
+pkg_pretend() {
+	_check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	_check_reqs pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix, bug #395875
+	tc-export CC
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local mycmakeargs=(
+		-DPORT=Qt
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		-DUSE_GSTREAMER=$(usex gstreamer)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
+		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
+		-DENABLE_WEBKIT2=$(usex qml)
+		$(cmake-utils_use_find_package webp WebP)
+		-DENABLE_X11_TARGET=$(usex X)
+	)
+
+	if has_version "virtual/rubygems[ruby_targets_ruby25]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
+	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+	else
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# bug 572056
+	if [[ ! -f ${ED%/}$(qt5_get_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/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
new file mode 100644
index 000000000000..61024cda2c39
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1:5"
+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 ~ppc ppc64 x86"
+fi
+
+# TODO: qttestlib
+
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
+REQUIRED_USE="?? ( gstreamer 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-${QT_MIN_VER}[icu]
+	>=dev-qt/qtgui-${QT_MIN_VER}
+	>=dev-qt/qtnetwork-${QT_MIN_VER}
+	>=dev-qt/qtsql-${QT_MIN_VER}
+	>=dev-qt/qtwidgets-${QT_MIN_VER}
+	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-${QT_MIN_VER} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+	opengl? (
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}
+	)
+	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	dev-util/gperf
+	sys-devel/bison
+	sys-devel/flex
+	virtual/rubygems
+	test? ( >=dev-qt/qttest-${QT_MIN_VER} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
+src_prepare() {
+	# ensure bundled library cannot be used
+	rm -r Source/ThirdParty/leveldb || die
+
+	# force using system library
+	sed -i -e 's/qtConfig(system-jpeg)/true/' \
+		-e 's/qtConfig(system-png)/true/' \
+		Tools/qmake/mkspecs/features/features.prf || 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_config opengl opengl Tools/qmake/mkspecs/features/features.prf
+
+	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 gstreamer; then
+		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
+	fi
+
+	# bug 562396
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
+
+	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-5.11.1 b/dev-qt/qtwebsockets-5.11.1
deleted file mode 100644
index 296cb810e5f5..000000000000
--- a/dev-qt/qtwebsockets-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.1 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f67277cf03526b83968e7d2fb842ef08
diff --git a/dev-qt/qtwebsockets-5.9.4 b/dev-qt/qtwebsockets-5.9.4
deleted file mode 100644
index 5d7eba7d0bcf..000000000000
--- a/dev-qt/qtwebsockets-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4500423305b9f86ab8bee25489ad37c7
diff --git a/dev-qt/qtwebsockets-5.9.6 b/dev-qt/qtwebsockets-5.9.6
deleted file mode 100644
index 750134678c2a..000000000000
--- a/dev-qt/qtwebsockets-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebsockets-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=2d163af512a48a7a42e04e12654c71b2
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
new file mode 100644
index 000000000000..6fa7276840ab
--- /dev/null
+++ b/dev-qt/qtwebsockets/Manifest
@@ -0,0 +1,7 @@
+DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc
+DIST qtwebsockets-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
+DIST qtwebsockets-opensource-src-5.9.6.tar.xz 199624 BLAKE2B 9433758ad1cc8f929baebd4a73ffcaa6130277a9832bc43746ddf999870dee7080dfbe39c75d1311ac90a1aabec5b50e5376b24618f336fd660047558198d101 SHA512 3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd
+EBUILD qtwebsockets-5.11.1.ebuild 539 BLAKE2B ef00dfefc365b70159695f236af006dfe992a50274970b1a93ce1cc5141f891887c75fdd4a99b00d37c85980897e03928d3f006192cf31665abca761f5e29dd5 SHA512 f91f054e63e2db29e3ba473d0a9c8f9c3d183eb878d816cd209438cc9cc2d882aa80c2f6774c43d14a1aff82026f55d403f881ba4be90efb11e73f3cd63969aa
+EBUILD qtwebsockets-5.9.4.ebuild 531 BLAKE2B effc25681c849666974ce5c934d2407c70d0f8854ac9af3f80105ff0dafda5c59d11b6c37e9daeb34c7dbab4ea07253ec4de6111fefe92b8f30d4d04a5fcd5d3 SHA512 f116ba3147571fa035701be18ef0fb25747df8e135bda4c2cb75fce0acff9062ee73fff3c814d0c05bc37b8a98a670c39154cf97e26a1e4b3c740c16987d15ee
+EBUILD qtwebsockets-5.9.6.ebuild 538 BLAKE2B 3756fe8e2300994f7ca77fcc85266829f0837b92465cf28d9918a69c42444c29c8e4f972d943434c2d5646283cc4345c2c5b89d158b42049715bbccff1a4a3ff SHA512 0a5af6536ab601e777ffb33297418bdd658a33c5a7961383b909782f1da2fe4d997d2a6720857a15f9d53b4a9ebea7e3e1f50047416ad20cf04c42ab939fdfca
+MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml
new file mode 100644
index 000000000000..c33b152da0be
--- /dev/null
+++ b/dev-qt/qtwebsockets/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="qml">Build QML bindings</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
new file mode 100644
index 000000000000..362a0a81c42a
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/qtwebsockets/qtwebsockets-5.9.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
new file mode 100644
index 000000000000..d4e1bda01754
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~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/qtwebsockets/qtwebsockets-5.9.6.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.6.ebuild
new file mode 100644
index 000000000000..1ae411dbcddf
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~arm64 ~hppa ~ppc ~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/qtwebview-5.11.1 b/dev-qt/qtwebview-5.11.1
deleted file mode 100644
index f607196797c2..000000000000
--- a/dev-qt/qtwebview-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwebengine-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtwebengine-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/dev-qt/qtwebview-5.9.4 b/dev-qt/qtwebview-5.9.4
deleted file mode 100644
index 59bc89128303..000000000000
--- a/dev-qt/qtwebview-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwebengine-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwebengine-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebview-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/dev-qt/qtwebview-5.9.6 b/dev-qt/qtwebview-5.9.6
deleted file mode 100644
index 7c353a46748b..000000000000
--- a/dev-qt/qtwebview-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwebengine-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtwebengine-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebview-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
new file mode 100644
index 000000000000..96fcaddb5134
--- /dev/null
+++ b/dev-qt/qtwebview/Manifest
@@ -0,0 +1,7 @@
+DIST qtwebview-everywhere-src-5.11.1.tar.xz 132948 BLAKE2B 7e6fb1544a8cdae2de4cab8d2c42a154eadc79a67a1295311f67c94c19d50d81f578db8749fb02ee741c98ae3461c638b4a8a0cc109a2d95a4670522108e4e6c SHA512 e345d89ee30ed8cc7d087236c63179f887a81f81d41d0db15cf4f838aa38fbcefcaa7b880e82d80de5703610cadf88dd30dad88d44c8b27257980c214a98d2ba
+DIST qtwebview-opensource-src-5.9.4.tar.xz 108684 BLAKE2B cb660595d88da5a8c9f9e951e4a13ebb265271f0dfe081c5cb19658674f0bc206b2852b83da8a21855ba176f70d93ab20013e373393169aa4a03b478e1ced39c SHA512 e59e8bc50672ea54631b3ac510291b57a6d4d66250819fbae61b7cb814e7653301d55a42c8225a46d106f92736035e039ac7d2e97f3ef13f50bc5874c7e8602f
+DIST qtwebview-opensource-src-5.9.6.tar.xz 108724 BLAKE2B eaefe9d68bdd0c68f569f9f01bc403a49e36f7bc20859a79225575d13a653eaec741b986917faf91b50188052c811841c85d438104ff0ee9ed5b6a83274b0860 SHA512 dcb3e038737297efb2f58820de386e6ea349d65cf5557116aec34d3115bf7ab2de528365cdefe7433bad6b94ebbf210a282a6018557eb772db5f41909405638b
+EBUILD qtwebview-5.11.1.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
+EBUILD qtwebview-5.9.4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
+EBUILD qtwebview-5.9.6.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/metadata.xml b/dev-qt/qtwebview/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtwebview/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebview/qtwebview-5.11.1.ebuild b/dev-qt/qtwebview/qtwebview-5.11.1.ebuild
new file mode 100644
index 000000000000..43288fc107ef
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebview/qtwebview-5.9.4.ebuild b/dev-qt/qtwebview/qtwebview-5.9.4.ebuild
new file mode 100644
index 000000000000..43288fc107ef
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebview/qtwebview-5.9.6.ebuild b/dev-qt/qtwebview/qtwebview-5.9.6.ebuild
new file mode 100644
index 000000000000..43288fc107ef
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.9.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets-5.11.1 b/dev-qt/qtwidgets-5.11.1
deleted file mode 100644
index 1d0e699c60e8..000000000000
--- a/dev-qt/qtwidgets-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.1[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.1[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b069c13688588f35e6d0e06074c046ce
diff --git a/dev-qt/qtwidgets-5.9.4-r1 b/dev-qt/qtwidgets-5.9.4-r1
deleted file mode 100644
index 77be1d716bf5..000000000000
--- a/dev-qt/qtwidgets-5.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=f317c8eda1d09ad31d0d08b395e5da8c
diff --git a/dev-qt/qtwidgets-5.9.6-r1 b/dev-qt/qtwidgets-5.9.6-r1
deleted file mode 100644
index 1ddb0e10824e..000000000000
--- a/dev-qt/qtwidgets-5.9.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.6[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.6[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8ac20b25801bdffdc1336bd9225e32be
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
new file mode 100644
index 000000000000..f8c7b68b376b
--- /dev/null
+++ b/dev-qt/qtwidgets/Manifest
@@ -0,0 +1,8 @@
+AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
+EBUILD qtwidgets-5.9.4-r1.ebuild 1059 BLAKE2B c1c09e2e1aa5d3634ec45185b4280a86b2b2cf2cb68f949fb7389220c0f1a112f168667b52da4e2f0f9477fd58d0da98e0acada386655ba1299824fcefccd978 SHA512 8fbef18c9dd5ec033eb53f599d1078336dc357c59e8b95e4833266f579bc4242f74755f04c4d30db0c3cf5dff94a9b1343c6aeeba6d754f25c458f3395e4cb2e
+EBUILD qtwidgets-5.9.6-r1.ebuild 1136 BLAKE2B cec35fc492331334a42fb5d30f309f9a8d5a4ace395dab1aaf91e458b081f1483da867b9d4647ba54b73f81f2144e329b1b1f9e32e350e84abcd64e9b14cc6fd SHA512 e73498ea8e61ac499b583e823ddd78d3b55d3d4dc26df57ca31ccc8e51d0ba6e34b6bf4d1389796d1318a0ae821494eab68e4e09ca6c212bf69c2da2fc9c98b7
+MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
new file mode 100644
index 000000000000..3123fc3e50f5
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
@@ -0,0 +1,115 @@
+From 57bc08dac38b02128031357976436fa0f68bd574 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 Jun 2018 20:18:11 +0200
+Subject: [PATCH] Revert "Fix restoring geometry of dockwidget"
+
+See also: Regression caused by the fix for QTBUG-16252
+QTBUG: https://bugreports.qt.io/browse/QTBUG-68939
+
+This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4.
+---
+ src/widgets/widgets/qdockarealayout.cpp | 20 ++------------------
+ src/widgets/widgets/qdockarealayout_p.h |  1 -
+ 2 files changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
+index bef7214c75..21d1d4cb85 100644
+--- a/src/widgets/widgets/qdockarealayout.cpp
++++ b/src/widgets/widgets/qdockarealayout.cpp
+@@ -226,7 +226,7 @@ static quintptr tabId(const QDockAreaLayoutItem &item)
+ static const int zero = 0;
+ 
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+-    : restoredSizeHint(0,0), sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
++    : sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
+ #if QT_CONFIG(tabbar)
+     , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth)
+ #endif
+@@ -236,7 +236,7 @@ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo(const int *_sep, QInternal::DockPosition _dockPos,
+                                             Qt::Orientation _o, int tbshape,
+                                             QMainWindow *window)
+-    : restoredSizeHint(0,0), sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
++    : sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
+ #if QT_CONFIG(tabbar)
+     , tabbed(false), tabBar(0), tabBarShape(static_cast<QTabBar::Shape>(tbshape))
+ #endif
+@@ -407,9 +407,6 @@ QSize QDockAreaLayoutInfo::sizeHint() const
+     if (isEmpty())
+         return QSize(0, 0);
+ 
+-    if (!restoredSizeHint.isNull())
+-        return restoredSizeHint;
+-
+     int a = 0, b = 0;
+     int min_perp = 0;
+     int max_perp = QWIDGETSIZE_MAX;
+@@ -2376,7 +2373,6 @@ bool QDockAreaLayout::restoreState(QDataStream &stream, const QList<QDockWidget*
+         stream >> size;
+         if (!testing) {
+             docks[pos].rect = QRect(QPoint(0, 0), size);
+-            docks[pos].restoredSizeHint = size;
+         }
+         if (!docks[pos].restoreState(stream, dockwidgets, testing)) {
+             stream.setStatus(QDataStream::ReadCorruptData);
+@@ -2678,8 +2674,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+         center_rect.setBottom(rect.bottom() - docks[QInternal::BottomDock].rect.height() - sep);
+ 
+     QSize left_hint = docks[QInternal::LeftDock].size();
+-    if (!docks[QInternal::LeftDock].restoredSizeHint.isNull())
+-        left_hint = docks[QInternal::LeftDock].restoredSizeHint;
+     if (left_hint.isNull() || fallbackToSizeHints)
+         left_hint = docks[QInternal::LeftDock].sizeHint();
+     QSize left_min = docks[QInternal::LeftDock].minimumSize();
+@@ -2687,8 +2681,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     left_hint = left_hint.boundedTo(left_max).expandedTo(left_min);
+ 
+     QSize right_hint = docks[QInternal::RightDock].size();
+-    if (!docks[QInternal::RightDock].restoredSizeHint.isNull())
+-        right_hint = docks[QInternal::RightDock].restoredSizeHint;
+     if (right_hint.isNull() || fallbackToSizeHints)
+         right_hint = docks[QInternal::RightDock].sizeHint();
+     QSize right_min = docks[QInternal::RightDock].minimumSize();
+@@ -2696,8 +2688,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     right_hint = right_hint.boundedTo(right_max).expandedTo(right_min);
+ 
+     QSize top_hint = docks[QInternal::TopDock].size();
+-    if (!docks[QInternal::TopDock].restoredSizeHint.isNull())
+-        top_hint = docks[QInternal::TopDock].restoredSizeHint;
+     if (top_hint.isNull() || fallbackToSizeHints)
+         top_hint = docks[QInternal::TopDock].sizeHint();
+     QSize top_min = docks[QInternal::TopDock].minimumSize();
+@@ -2705,8 +2695,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     top_hint = top_hint.boundedTo(top_max).expandedTo(top_min);
+ 
+     QSize bottom_hint = docks[QInternal::BottomDock].size();
+-    if (!docks[QInternal::BottomDock].restoredSizeHint.isNull())
+-        bottom_hint = docks[QInternal::BottomDock].restoredSizeHint;
+     if (bottom_hint.isNull() || fallbackToSizeHints)
+         bottom_hint = docks[QInternal::BottomDock].sizeHint();
+     QSize bottom_min = docks[QInternal::BottomDock].minimumSize();
+@@ -3288,10 +3276,6 @@ int QDockAreaLayout::separatorMove(const QList<int> &separator, const QPoint &or
+     int delta = 0;
+     int index = separator.last();
+ 
+-    for (int i = 0; i < QInternal::DockCount; ++i)
+-        if (!docks[i].restoredSizeHint.isNull())
+-            docks[i].restoredSizeHint = QSize(0, 0);
+-
+     if (separator.count() > 1) {
+         QDockAreaLayoutInfo *info = this->info(separator);
+         delta = pick(info->o, dest - origin);
+diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
+index ea397e00ac..82244c192e 100644
+--- a/src/widgets/widgets/qdockarealayout_p.h
++++ b/src/widgets/widgets/qdockarealayout_p.h
+@@ -189,7 +189,6 @@ public:
+ 
+     QMainWindowLayout *mainWindowLayout() const;
+ 
+-    QSize restoredSizeHint;
+     const int *sep;
+     mutable QVector<QWidget*> separatorWidgets;
+     QInternal::DockPosition dockPos;
+-- 
+2.17.1
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
new file mode 100644
index 000000000000..17b1d11ac715
--- /dev/null
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
new file mode 100644
index 000000000000..caf1f79a84de
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..227aec0b741d
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..2512fb63819d
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-QDockWidget-revert-restore-geometry.patch" )
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras-5.11.1 b/dev-qt/qtx11extras-5.11.1
deleted file mode 100644
index 3ba0a9b4bde0..000000000000
--- a/dev-qt/qtx11extras-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[xcb] test? ( ~dev-qt/qtwidgets-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1[xcb] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=3a93fa1972be2dc77eec7df5c2d53d8e
diff --git a/dev-qt/qtx11extras-5.9.4 b/dev-qt/qtx11extras-5.9.4
deleted file mode 100644
index b05dee9b9464..000000000000
--- a/dev-qt/qtx11extras-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[xcb] test? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[xcb] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=21b14c2d3da1bcc7f21f2cf3dbc8cdfa
diff --git a/dev-qt/qtx11extras-5.9.6 b/dev-qt/qtx11extras-5.9.6
deleted file mode 100644
index ab626971764d..000000000000
--- a/dev-qt/qtx11extras-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[xcb] test? ( ~dev-qt/qtwidgets-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6[xcb] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtx11extras-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=e9fdf443951731f706285c9ab75e58ec
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
new file mode 100644
index 000000000000..3d6cd3fd5ae3
--- /dev/null
+++ b/dev-qt/qtx11extras/Manifest
@@ -0,0 +1,7 @@
+DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af
+DIST qtx11extras-opensource-src-5.9.4.tar.xz 76604 BLAKE2B cffb9870ec726edebbfbb2ed39206c8f1522e6f11d3429dbb0861501fed0d8dd3552f23ba363f3704ff1b6e9af89a91e68e90f2f7ccf80b150598778d26dfea3 SHA512 f05a273db98f95f998c681eab9f8d4a5d132342282bf63d1104ad718c424602fdc8dc71e14940999692449d3fea1442a5932c08cab3d6c0a9acbbf0403fee23c
+DIST qtx11extras-opensource-src-5.9.6.tar.xz 76896 BLAKE2B f8f3d8f642bff43a74ea6e58492a566e87dc0cd6f17061dd95f98fae4e3336703d03a49ba85403ccb85f02f2cfa7fa554985d6fe19b7d5f055f3fccd73ec2536 SHA512 22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1
+EBUILD qtx11extras-5.11.1.ebuild 445 BLAKE2B d929e4694614ec0bd3a33bab12d94e2e9d805b255eb3ff1a33a88b574fea3513de7a944f7638308e0b0808d08eea7ed5a6965473cd299374cbb228d3d12d8c31 SHA512 71c8168225337152bf3e8e8d63aeee3d1d90aa56ede5307f6b04f385779b99eb184aa4a9f091853c4fbd0fecc046fc27b945794a13072d34b19ccba60807e334
+EBUILD qtx11extras-5.9.4.ebuild 441 BLAKE2B c560a683ef4337df6299dc36b466cf9e8280d67440643a88baa33a4e7e5a3aed765e96ece849fa24c9f7096e118877f0a90ae395656d6c3219280c7db57b1841 SHA512 393fe8df2f9b16076119762e282e12d4be9dc07b1d1b889e2db357aa26000525be99a08280578e708909b2f9b96457fa3095788e46b16b2fd106a3df1424afa8
+EBUILD qtx11extras-5.9.6.ebuild 444 BLAKE2B f4ae0351b9b68cceb3087963c80e44eaab3c15abad66567a7392f3ed7e41de7b9856183741b1e27bcfe0db232e10d3c32e42f5d275f900041c60bbb54e62c77c SHA512 e4de5ead47d0c96c0948d03859c07797324b2730335ae63a5efd55d1a1377390fa807c34f5e16c87ae74b1d72346e966a3c0aad918708b4f349378aece43d806
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtx11extras/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
new file mode 100644
index 000000000000..b029cc4254d8
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
new file mode 100644
index 000000000000..5dec8a1d9172
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
new file mode 100644
index 000000000000..ace9790d5e9f
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+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-5.11.1 b/dev-qt/qtxml-5.11.1
deleted file mode 100644
index 382b1bf6c0c8..000000000000
--- a/dev-qt/qtxml-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 test? ( ~dev-qt/qtnetwork-5.11.1 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=49622f34c897470a089d8ceb201b7844
diff --git a/dev-qt/qtxml-5.9.4 b/dev-qt/qtxml-5.9.4
deleted file mode 100644
index 49bfef6e2c10..000000000000
--- a/dev-qt/qtxml-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 test? ( ~dev-qt/qtnetwork-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=eddefda826292ddb8147fd2aa491d8fa
diff --git a/dev-qt/qtxml-5.9.6 b/dev-qt/qtxml-5.9.6
deleted file mode 100644
index e1bde946ab58..000000000000
--- a/dev-qt/qtxml-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 test? ( ~dev-qt/qtnetwork-5.9.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=4262676cd370d4266b1b27c214a99212
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
new file mode 100644
index 000000000000..f289bac6abbf
--- /dev/null
+++ b/dev-qt/qtxml/Manifest
@@ -0,0 +1,7 @@
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
+DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
+EBUILD qtxml-5.11.1.ebuild 504 BLAKE2B 800d9acd20b8d497c4fca13df757f5227fbf06823fb4e1a496a0dd4c33fffb01ad1a1c11dbc10f6e3e50a0517809055a6839958d024cd2eaa31c876d5af9580f SHA512 7ffb83cbed0d8a708f6ae2c7a7ba435f4e4bf09c84c26e31c86188b82c421ae3005b6d220e51cbf4a473bac7dd3d4cb5b8f8b70f1b36c4d025feeb70335526a1
+EBUILD qtxml-5.9.4.ebuild 500 BLAKE2B a8c227d6065e6c8a16d9ab9cb4ff3684fc9016a9e9dc8903431a34a2cafef7cb9d3a7d36c7ad8a4b311c7fa35fe3431a5221a214e3fdd315482fad478b863dc3 SHA512 a1d121e4f44472f93b4d37bbf30e73f55e03546cb4fe441d0915c51afc728265cc8fb816bf3306908139d39e0513ff9e532585d801c29632defe662e9e73c8b4
+EBUILD qtxml-5.9.6.ebuild 503 BLAKE2B f42d382cbebd7b9a447bef30dae297415b42395eed227a74c59b88e056235d10f10c5c50b819d42749a09a01ba01681288451c43900033048affc715385708f4 SHA512 2ec2de1be93f9a7b7c81fcd2cdea78e331a068b1bd8654dcf85b41baeee9e7ad32cc36fe3e7df8a3baccebd8549ff7287d9e868008935e13e543cb0e86a7a8c3
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtxml/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtxml/qtxml-5.11.1.ebuild b/dev-qt/qtxml/qtxml-5.11.1.ebuild
new file mode 100644
index 000000000000..b8568f5ed9a2
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.11.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxml/qtxml-5.9.4.ebuild b/dev-qt/qtxml/qtxml-5.9.4.ebuild
new file mode 100644
index 000000000000..a8415869254c
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxml/qtxml-5.9.6.ebuild b/dev-qt/qtxml/qtxml-5.9.6.ebuild
new file mode 100644
index 000000000000..b1b910c5a48b
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxmlpatterns-4.8.7 b/dev-qt/qtxmlpatterns-4.8.7
deleted file mode 100644
index 9473baad3017..000000000000
--- a/dev-qt/qtxmlpatterns-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The XmlPatterns module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8395aba6231a7567f34fecb4f3e76bb
diff --git a/dev-qt/qtxmlpatterns-5.11.1 b/dev-qt/qtxmlpatterns-5.11.1
deleted file mode 100644
index bb24776b91c8..000000000000
--- a/dev-qt/qtxmlpatterns-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtnetwork-5.11.1 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=991338605294f2d1bf266dc05d247307
diff --git a/dev-qt/qtxmlpatterns-5.9.4 b/dev-qt/qtxmlpatterns-5.9.4
deleted file mode 100644
index 79b68f5a38be..000000000000
--- a/dev-qt/qtxmlpatterns-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9deb7dc2b75e4492f98a79f85953e603
diff --git a/dev-qt/qtxmlpatterns-5.9.6 b/dev-qt/qtxmlpatterns-5.9.6
deleted file mode 100644
index e2f1918d1e91..000000000000
--- a/dev-qt/qtxmlpatterns-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtnetwork-5.9.6 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtxmlpatterns-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=39f90ac35aa047d7f1a6d67b9be6c2a6
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
new file mode 100644
index 000000000000..d82e0b9b6d0c
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -0,0 +1,9 @@
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
+DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
+DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788
+EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf
+EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53
+EBUILD qtxmlpatterns-5.9.4.ebuild 423 BLAKE2B 29a95538e2450fd50671dd1dd93e8605ad958de12901c20469aa4a8ab632a80d7f3cdc5beb08c63fe2ff57ce1e6ed8b8958edf401b6401faf57ab17542c90722 SHA512 eb6cf00eca1dbbbb50542e9c5ac7a872bb9aa74f93104b9abc892f44378cbcf4130474da14d69b613e1eaad6b72e12f11ed9e01a4c7f12ca24119795f8abf17a
+EBUILD qtxmlpatterns-5.9.6.ebuild 426 BLAKE2B 91a1cbf228fa3990b10c7f3e911f6b5c9b617cea135a9ad2b74410265ba463d7e73b6bfe62fbb4636f7d3bffaf694e75c5256ae11cba95c60e92b24d01ad3bc5 SHA512 c8db8a8e9b70de85dbb63a9ee0edb5bb4d535357526c8edc84dc59210857bbf8b69574fa821ddf764c129f9aabe5693ad88d05e047d482c31086baeccc4980da
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml
new file mode 100644
index 000000000000..32568f62fb8e
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
new file mode 100644
index 000000000000..c5ab5f0e709d
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/xmlpatterns
+	tools/xmlpatterns
+	tools/xmlpatternsvalidator"
+
+QCONFIG_ADD="xmlpatterns"
+QCONFIG_DEFINE="QT_XMLPATTERNS"
+
+multilib_src_configure() {
+	local myconf=(
+		-xmlpatterns
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
new file mode 100644
index 000000000000..8e0054f70379
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
new file mode 100644
index 000000000000..c1c76807184c
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
new file mode 100644
index 000000000000..282a4ae18a83
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-qt
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)