dev-qt: 5.13 stable branch EAPI-7 bump

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

53 files changed, 71 insertions, 73 deletions

diff --git a/dev-qt/assistant/assistant-5.13.9999.ebuild b/dev-qt/assistant/assistant-5.13.9999.ebuild
index 6d109d6a..135cf542 100644
--- a/dev-qt/assistant/assistant-5.13.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.13.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -46,10 +46,10 @@ src_install() {
 
 pkg_postinst() {
 	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/dev-qt/designer/designer-5.13.9999.ebuild b/dev-qt/designer/designer-5.13.9999.ebuild
index ba8d912c..dd3e48ec 100644
--- a/dev-qt/designer/designer-5.13.9999.ebuild
+++ b/dev-qt/designer/designer-5.13.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
@@ -48,10 +48,10 @@ src_install() {
 
 pkg_postinst() {
 	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/dev-qt/linguist-tools/linguist-tools-5.13.9999.ebuild b/dev-qt/linguist-tools/linguist-tools-5.13.9999.ebuild
index 7f79197d..9f4191f4 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.13.9999.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/linguist/linguist-5.13.9999.ebuild b/dev-qt/linguist/linguist-5.13.9999.ebuild
index 28d6c0c8..ec3611f8 100644
--- a/dev-qt/linguist/linguist-5.13.9999.ebuild
+++ b/dev-qt/linguist/linguist-5.13.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="Graphical tool for translating Qt applications"
 
@@ -39,10 +39,10 @@ src_install() {
 
 pkg_postinst() {
 	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/dev-qt/pixeltool/pixeltool-5.13.9999.ebuild b/dev-qt/pixeltool/pixeltool-5.13.9999.ebuild
index 3e68ab76..2acca437 100644
--- a/dev-qt/pixeltool/pixeltool-5.13.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qdbus/qdbus-5.13.9999.ebuild b/dev-qt/qdbus/qdbus-5.13.9999.ebuild
index d13d3104..4e1b4362 100644
--- a/dev-qt/qdbus/qdbus-5.13.9999.ebuild
+++ b/dev-qt/qdbus/qdbus-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.13.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.13.9999.ebuild
index 09dd13e8..3969f03e 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.13.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.13.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
@@ -36,10 +36,10 @@ src_install() {
 
 pkg_postinst() {
 	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/dev-qt/qdoc/qdoc-5.13.9999.ebuild b/dev-qt/qdoc/qdoc-5.13.9999.ebuild
index 02aa22c3..e705553b 100644
--- a/dev-qt/qdoc/qdoc-5.13.9999.ebuild
+++ b/dev-qt/qdoc/qdoc-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qt3d/qt3d-5.13.9999.ebuild b/dev-qt/qt3d/qt3d-5.13.9999.ebuild
index 875c47d5..925abb14 100644
--- a/dev-qt/qt3d/qt3d-5.13.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="3D rendering module for the Qt5 framework"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.9999.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.9999.ebuild
index c610b7cd..6f8451cd 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.9999.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtconnectivity"
 inherit qt5-build
 
diff --git a/dev-qt/qtcharts/qtcharts-5.13.9999.ebuild b/dev-qt/qtcharts/qtcharts-5.13.9999.ebuild
index fe200dea..44f40be1 100644
--- a/dev-qt/qtcharts/qtcharts-5.13.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Chart component library for the Qt5 framework"
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.9999.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.9999.ebuild
index a8d2c0d8..eaf03f74 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.9999.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtcore/qtcore-5.13.9999.ebuild b/dev-qt/qtcore/qtcore-5.13.9999.ebuild
index 2aa86f3a..661a57a2 100644
--- a/dev-qt/qtcore/qtcore-5.13.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.9999.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.9999.ebuild
index 74192731..5ec3207e 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.9999.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="3D data visualization library for the Qt5 framework"
diff --git a/dev-qt/qtdbus/qtdbus-5.13.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.13.9999.ebuild
index f8e4dd27..6a6570fb 100644
--- a/dev-qt/qtdbus/qtdbus-5.13.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild
index b3c3411f..c208c86f 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit python-any-r1 qt5-build
 
@@ -13,8 +13,9 @@ fi
 
 IUSE="gles2 +jit localstorage +widgets"
 
+BDEPEND="${PYTHON_DEPS}"
 # qtgui[gles2=] is needed because of bug 504322
-COMMON_DEPEND="
+DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
@@ -22,10 +23,7 @@ COMMON_DEPEND="
 	localstorage? ( ~dev-qt/qtsql-${PV} )
 	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
 "
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!<dev-qt/qtquickcontrols-5.7:5
 "
 
diff --git a/dev-qt/qtdiag/qtdiag-5.13.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.13.9999.ebuild
index 88cdf532..11ddd15e 100644
--- a/dev-qt/qtdiag/qtdiag-5.13.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qtgamepad/qtgamepad-5.13.9999.ebuild b/dev-qt/qtgamepad/qtgamepad-5.13.9999.ebuild
index 56adbb1c..cf981234 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.13.9999.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Qt module to support gamepad hardware"
@@ -16,8 +16,8 @@ DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}[evdev?]
 	evdev? ( virtual/libudev:= )
-	sdl? ( media-libs/libsdl )
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	sdl? ( media-libs/libsdl )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.9999.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.9999.ebuild
index d7d01db8..23d9db6e 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.9999.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
 
diff --git a/dev-qt/qtgui/qtgui-5.13.9999.ebuild b/dev-qt/qtgui/qtgui-5.13.9999.ebuild
index e8a8655c..56a37349 100644
--- a/dev-qt/qtgui/qtgui-5.13.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qthelp/qthelp-5.13.9999.ebuild b/dev-qt/qthelp/qthelp-5.13.9999.ebuild
index 943173a1..e3a0a199 100644
--- a/dev-qt/qthelp/qthelp-5.13.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild
index 37e54535..5327581b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
diff --git a/dev-qt/qtlocation/qtlocation-5.13.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.13.9999.ebuild
index 96f688d8..ff48cdc6 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.9999.ebuild
index 6d824153..e56a2019 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.9999.ebuild
index 8312d0c1..a8f3a81d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.13.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.13.9999.ebuild
index 92b8093e..7fbd2442 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Network authorization library for the Qt5 framework"
diff --git a/dev-qt/qtopengl/qtopengl-5.13.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.13.9999.ebuild
index c1ee20ac..15897af6 100644
--- a/dev-qt/qtopengl/qtopengl-5.13.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
diff --git a/dev-qt/qtpaths/qtpaths-5.13.9999.ebuild b/dev-qt/qtpaths/qtpaths-5.13.9999.ebuild
index b0988877..ec3e1e7d 100644
--- a/dev-qt/qtpaths/qtpaths-5.13.9999.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.13.9999.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.13.9999.ebuild
index 5051b383..85a22f17 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.13.9999.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qtpositioning/qtpositioning-5.13.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-5.13.9999.ebuild
index a6334e9a..cc8b4e33 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.13.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtlocation"
 inherit qt5-build
 
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.9999.ebuild
index faa7032b..0fb87884 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.9999.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.9999.ebuild
index 918b4e49..25f8d80d 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.9999.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.9999.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.9999.ebuild
index 3e47b88d..4babc06b 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.9999.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
diff --git a/dev-qt/qtscript/qtscript-5.13.9999.ebuild b/dev-qt/qtscript/qtscript-5.13.9999.ebuild
index 075e8bd8..c5092df8 100644
--- a/dev-qt/qtscript/qtscript-5.13.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
diff --git a/dev-qt/qtscxml/qtscxml-5.13.9999.ebuild b/dev-qt/qtscxml/qtscxml-5.13.9999.ebuild
index 43f3d8b3..58d4c3e9 100644
--- a/dev-qt/qtscxml/qtscxml-5.13.9999.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
diff --git a/dev-qt/qtsensors/qtsensors-5.13.9999.ebuild b/dev-qt/qtsensors/qtsensors-5.13.9999.ebuild
index 675f29c7..2cf55ab9 100644
--- a/dev-qt/qtsensors/qtsensors-5.13.9999.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
diff --git a/dev-qt/qtserialbus/qtserialbus-5.13.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-5.13.9999.ebuild
index 7a679090..4a031a9a 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.13.9999.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
diff --git a/dev-qt/qtserialport/qtserialport-5.13.9999.ebuild b/dev-qt/qtserialport/qtserialport-5.13.9999.ebuild
index 4d918afe..78e261c2 100644
--- a/dev-qt/qtserialport/qtserialport-5.13.9999.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
diff --git a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
index ee3692cc..17f8c70c 100644
--- a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
diff --git a/dev-qt/qtsql/qtsql-5.13.9999.ebuild b/dev-qt/qtsql/qtsql-5.13.9999.ebuild
index 92ce286d..ba9ab526 100644
--- a/dev-qt/qtsql/qtsql-5.13.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtsvg/qtsvg-5.13.9999.ebuild b/dev-qt/qtsvg/qtsvg-5.13.9999.ebuild
index ad774a2c..943bcaab 100644
--- a/dev-qt/qtsvg/qtsvg-5.13.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="SVG rendering library for the Qt5 framework"
diff --git a/dev-qt/qttest/qttest-5.13.9999.ebuild b/dev-qt/qttest/qttest-5.13.9999.ebuild
index b365a47c..3003c2e7 100644
--- a/dev-qt/qttest/qttest-5.13.9999.ebuild
+++ b/dev-qt/qttest/qttest-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
diff --git a/dev-qt/qttranslations/qttranslations-5.13.9999.ebuild b/dev-qt/qttranslations/qttranslations-5.13.9999.ebuild
index 9ddb031a..43701fa1 100644
--- a/dev-qt/qttranslations/qttranslations-5.13.9999.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Translation files for the Qt5 framework"
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.9999.ebuild
index c6f4faa3..0fa27800 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.9999.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
diff --git a/dev-qt/qtwayland/qtwayland-5.13.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.13.9999.ebuild
index dcdeeaa6..ac4fdc11 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.9999.ebuild
index 03797ea3..24910e03 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index 91945c1d..9a2e8527 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit multiprocessing pax-utils python-any-r1 qt5-build
 
@@ -124,9 +124,9 @@ src_install() {
 	qt5-build_src_install
 
 	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+	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
+	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
 }
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.9999.ebuild
index b80875f5..097f97a9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
diff --git a/dev-qt/qtwebview/qtwebview-5.13.9999.ebuild b/dev-qt/qtwebview/qtwebview-5.13.9999.ebuild
index 1c7076ec..fa902e48 100644
--- a/dev-qt/qtwebview/qtwebview-5.13.9999.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.9999.ebuild
index f1ee2b9f..85ceaa9c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtx11extras/qtx11extras-5.13.9999.ebuild b/dev-qt/qtx11extras/qtx11extras-5.13.9999.ebuild
index 6245a6cc..7754c982 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.13.9999.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
diff --git a/dev-qt/qtxml/qtxml-5.13.9999.ebuild b/dev-qt/qtxml/qtxml-5.13.9999.ebuild
index f0c71f59..a7668e1e 100644
--- a/dev-qt/qtxml/qtxml-5.13.9999.ebuild
+++ b/dev-qt/qtxml/qtxml-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.9999.ebuild
index 7a53e251..3075ba68 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"