dev-qt : use our frozen eclass to build

52 files changed, 102 insertions, 102 deletions

diff --git a/dev-qt/assistant/assistant-5.11.1-r1337.ebuild b/dev-qt/assistant/assistant-5.11.1-r1337.ebuild
index 0fe2bc14..f0101a7a 100644
--- a/dev-qt/assistant/assistant-5.11.1-r1337.ebuild
+++ b/dev-qt/assistant/assistant-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop gnome2-utils qt5-build-r10000
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -33,11 +33,11 @@ src_prepare() {
 	qt_use_disable_mod webkit webkitwidgets \
 		src/assistant/assistant/assistant.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_src_install
 
 	doicon -s 32 src/assistant/assistant/images/assistant.png
 	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
@@ -45,11 +45,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	qt5-build_pkg_postinst
+	qt5-build-r10000_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	qt5-build_pkg_postrm
+	qt5-build-r10000_pkg_postrm
 	gnome2_icon_cache_update
 }
diff --git a/dev-qt/designer/designer-5.11.1-r1337.ebuild b/dev-qt/designer/designer-5.11.1-r1337.ebuild
index c561782d..82aae8a4 100644
--- a/dev-qt/designer/designer-5.11.1-r1337.ebuild
+++ b/dev-qt/designer/designer-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop gnome2-utils qt5-build-r10000
 
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
@@ -36,22 +36,22 @@ src_prepare() {
 	qt_use_disable_mod webkit webkitwidgets \
 		src/designer/src/plugins/plugins.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_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
+	qt5-build-r10000_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	qt5-build_pkg_postrm
+	qt5-build-r10000_pkg_postrm
 	gnome2_icon_cache_update
 }
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild
index 72c04bdc..4240e2ed 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Tools for working with Qt translation data files"
 
@@ -31,5 +31,5 @@ src_prepare() {
 	qt_use_disable_mod qml qmldevtools-private \
 		src/linguist/lupdate/lupdate.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/linguist/linguist-5.11.1-r1337.ebuild b/dev-qt/linguist/linguist-5.11.1-r1337.ebuild
index 38f06fe3..91a0185b 100644
--- a/dev-qt/linguist/linguist-5.11.1-r1337.ebuild
+++ b/dev-qt/linguist/linguist-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop gnome2-utils qt5-build-r10000
 
 DESCRIPTION="Graphical tool for translating Qt applications"
 
@@ -28,7 +28,7 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_src_install
 
 	local size
 	for size in 16 32 48 64 128; do
@@ -38,11 +38,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	qt5-build_pkg_postinst
+	qt5-build-r10000_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	qt5-build_pkg_postrm
+	qt5-build-r10000_pkg_postrm
 	gnome2_icon_cache_update
 }
diff --git a/dev-qt/pixeltool/pixeltool-5.11.1-r1337.ebuild b/dev-qt/pixeltool/pixeltool-5.11.1-r1337.ebuild
index 7bcdc97e..8021f7d2 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.1-r1337.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt screen magnifier"
 
diff --git a/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild b/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild
index 4736c7cd..54cc8fad 100644
--- a/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.1-r1337.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.1-r1337.ebuild
index ceb1e6f9..7f5da1cf 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.1-r1337.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop gnome2-utils qt5-build-r10000
 
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
@@ -27,7 +27,7 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_src_install
 
 	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
 	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
@@ -35,11 +35,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	qt5-build_pkg_postinst
+	qt5-build-r10000_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	qt5-build_pkg_postrm
+	qt5-build-r10000_pkg_postrm
 	gnome2_icon_cache_update
 }
diff --git a/dev-qt/qdoc/qdoc-5.11.1-r1337.ebuild b/dev-qt/qdoc/qdoc-5.11.1-r1337.ebuild
index 4c656e1b..799036ac 100644
--- a/dev-qt/qdoc/qdoc-5.11.1-r1337.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt documentation generator"
 
@@ -33,5 +33,5 @@ src_prepare() {
 	# QT_TARGET_SUBDIRS causing build to fail
 	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qt3d/qt3d-5.11.1-r1337.ebuild b/dev-qt/qt3d/qt3d-5.11.1-r1337.ebuild
index e6563090..71b274f7 100644
--- a/dev-qt/qt3d/qt3d-5.11.1-r1337.ebuild
+++ b/dev-qt/qt3d/qt3d-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="The 3D module for the Qt5 framework"
 
@@ -28,5 +28,5 @@ src_prepare() {
 
 	qt_use_disable_mod qml quick src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild
index 7f4a8b1b..ff5fd647 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtconnectivity"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
@@ -29,5 +29,5 @@ src_prepare() {
 
 	qt_use_disable_mod qml quick src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild b/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild
index ff3df69c..0124cb36 100644
--- a/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
@@ -25,5 +25,5 @@ src_prepare() {
 	qt_use_disable_mod qml quick \
 		src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild
index 75e304af..7f10be60 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild
index 48916104..08d160b8 100644
--- a/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -49,11 +49,11 @@ src_configure() {
 		$(qt_use !icu iconv)
 		$(qt_use systemd journald)
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_src_install
 
 	local flags=(
 		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1-r1337.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1-r1337.ebuild
index 64777049..7b8d9336 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1-r1337.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
@@ -27,5 +27,5 @@ src_prepare() {
 	qt_use_disable_mod qml quick \
 		src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild
index b31a0a2f..b965500c 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
@@ -39,5 +39,5 @@ src_configure() {
 	local myconf=(
 		-dbus-linked
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild
index 3da293ee..401fa541 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit python-any-r1 qt5-build
+inherit python-any-r1 qt5-build-r10000
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
@@ -52,7 +52,7 @@ src_prepare() {
 		tests/auto/quick/quick.pro \
 		tests/auto/quick/examples/examples.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_configure() {
@@ -60,5 +60,5 @@ src_configure() {
 		--
 		-qml-debug
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtdiag/qtdiag-5.11.1-r1337.ebuild b/dev-qt/qtdiag/qtdiag-5.11.1-r1337.ebuild
index 85c0174e..b1c17bd2 100644
--- a/dev-qt/qtdiag/qtdiag-5.11.1-r1337.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
@@ -32,5 +32,5 @@ src_prepare() {
 	qt_use_disable_mod widgets widgets \
 		src/qtdiag/qtdiag.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1-r1337.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1-r1337.ebuild
index 51a225a5..45dc8478 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1-r1337.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 VIRTUALX_REQUIRED="test"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
diff --git a/dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild b/dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild
index 034e4220..16c55bac 100644
--- a/dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
@@ -139,7 +139,7 @@ src_prepare() {
 	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
 		src/plugins/platforms/platforms.pro || die
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_configure() {
@@ -166,5 +166,5 @@ src_configure() {
 		$(qt_use xcb xkbcommon-x11 system)
 		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild b/dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild
index 1e0ee9ab..1a9e4016 100644
--- a/dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1-r1337.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1-r1337.ebuild
index 5b10805b..d5149044 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.1-r1337.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
@@ -25,5 +25,5 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	qt_use_compile_test jpeg2k jasper
 	qt_use_compile_test mng libmng
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtlocation/qtlocation-5.11.1-r1337.ebuild b/dev-qt/qtlocation/qtlocation-5.11.1-r1337.ebuild
index f791b5b3..3a58aafc 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.1-r1337.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="The Location module for the Qt5 framework"
 
@@ -40,5 +40,5 @@ src_configure() {
 	# qmake is run in the root directory. Bug 633776.
 	mkdir -p "${QT5_BUILD_DIR}" || die
 	qt5_qmake "${QT_BUILD_DIR}"
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild
index 04cc34da..2c814b7a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
@@ -54,7 +54,7 @@ src_prepare() {
 		src/gsttools/gsttools.pro \
 		src/plugins/gstreamer/common.pri
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_configure() {
@@ -64,5 +64,5 @@ src_configure() {
 		$(qt_use gstreamer)
 		$(qt_use pulseaudio)
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild
index 95290d66..a6689b57 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
@@ -53,5 +53,5 @@ src_configure() {
 		$(qt_use libproxy)
 		$(usex ssl -openssl-linked '')
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1-r1337.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1-r1337.ebuild
index a1e6dc62..01e239a6 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1-r1337.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
diff --git a/dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild b/dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild
index 5dfd9694..e75d39f7 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
@@ -30,5 +30,5 @@ src_configure() {
 	local myconf=(
 		-opengl $(usex gles2 es2 desktop)
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild b/dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild
index bc5bdee2..c9eeeb7e 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Command line client to QStandardPaths"
 
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.1-r1337.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.1-r1337.ebuild
index 43ae95d1..44f32834 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.11.1-r1337.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt5 plugin metadata dumper"
 
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.1-r1337.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.1-r1337.ebuild
index 37f71567..9ac79b84 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.1-r1337.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtlocation"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1-r1337.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1-r1337.ebuild
index b53ccddd..afe2ad5a 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.1-r1337.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.1-r1337.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Printing support library for the Qt5 framework"
 
@@ -38,5 +38,5 @@ src_configure() {
 		$(qt_use cups)
 		-opengl $(usex gles2 es2 desktop)
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1-r1337.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1-r1337.ebuild
index e0dc9411..da6a2032 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1-r1337.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
@@ -28,5 +28,5 @@ src_prepare() {
 		tests/auto/controls/controls.pro \
 		tests/auto/testplugin/testplugin.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1-r1337.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1-r1337.ebuild
index aa6bccf5..a6151501 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1-r1337.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
@@ -26,5 +26,5 @@ src_prepare() {
 	qt_use_disable_mod widgets widgets \
 		src/imports/platform/platform.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild b/dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild
index 2644fc6e..e96683ca 100644
--- a/dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
@@ -25,12 +25,12 @@ src_prepare() {
 	qt_use_disable_mod scripttools widgets \
 		src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_configure() {
 	local myqmakeargs=(
 		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtscxml/qtscxml-5.11.1-r1337.ebuild b/dev-qt/qtscxml/qtscxml-5.11.1-r1337.ebuild
index 59b06ef2..8b4a0d9d 100644
--- a/dev-qt/qtscxml/qtscxml-5.11.1-r1337.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
diff --git a/dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild b/dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild
index d0b0c5b6..393a294b 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
@@ -24,5 +24,5 @@ src_prepare() {
 	qt_use_disable_mod qml quick \
 		src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.1-r1337.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.1-r1337.ebuild
index c6a1fac1..433a3dbb 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.11.1-r1337.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Support for CAN and other serial buses"
 
diff --git a/dev-qt/qtserialport/qtserialport-5.11.1-r1337.ebuild b/dev-qt/qtserialport/qtserialport-5.11.1-r1337.ebuild
index f29b276e..2e7a9439 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.1-r1337.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
@@ -23,5 +23,5 @@ src_prepare() {
 	sed -i -e 's/:qtConfig(libudev)//' \
 		src/serialport/serialport-lib.pri || die
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild b/dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild
index 24627d2b..0a164b71 100644
--- a/dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild
index db29e42d..df01a9b4 100644
--- a/dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
@@ -53,5 +53,5 @@ src_configure() {
 	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
 	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
 
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild b/dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild
index 8afd46f0..d0289d24 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
diff --git a/dev-qt/qttest/qttest-5.11.1-r1337.ebuild b/dev-qt/qttest/qttest-5.11.1-r1337.ebuild
index a136469c..a11ce49a 100644
--- a/dev-qt/qttest/qttest-5.11.1-r1337.ebuild
+++ b/dev-qt/qttest/qttest-5.11.1-r1337.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
diff --git a/dev-qt/qttranslations/qttranslations-5.11.1-r1337.ebuild b/dev-qt/qttranslations/qttranslations-5.11.1-r1337.ebuild
index 02291152..f7eeb61c 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.1-r1337.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Translation files for the Qt5 framework"
 
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1-r1337.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1-r1337.ebuild
index 21fd992d..d21fa729 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1-r1337.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
 
@@ -34,5 +34,5 @@ src_configure() {
                         lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
 	)
 
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild
index 4c355304..e0a84bbb 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Wayland platform plugin for Qt"
 
@@ -35,5 +35,5 @@ src_prepare() {
 
 	use xcomposite || rm -r config.tests/xcomposite || die
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild
index 7f4acf24..b58dbcfc 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
@@ -22,5 +22,5 @@ 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
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild
index 495c4d06..bc55f9cb 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build-r10000
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
@@ -105,7 +105,7 @@ src_prepare() {
 
 	qt_use_disable_mod widgets widgets src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
 
 src_configure() {
@@ -123,11 +123,11 @@ src_configure() {
 		$(usex system-ffmpeg '-ffmpeg' '')
 		$(usex system-icu '-webengine-icu' '')
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
 
 src_install() {
-	qt5-build_src_install
+	qt5-build-r10000_src_install
 
 	# bug 601472
 	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild
index 362a0a81..c78e6beb 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
@@ -23,5 +23,5 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	qt_use_disable_mod qml quick src/src.pro
 
-	qt5-build_src_prepare
+	qt5-build-r10000_src_prepare
 }
diff --git a/dev-qt/qtwebview/qtwebview-5.11.1-r1337.ebuild b/dev-qt/qtwebview/qtwebview-5.11.1-r1337.ebuild
index 43288fc1..a579ad2c 100644
--- a/dev-qt/qtwebview/qtwebview-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
 
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild
index caf1f79a..886bc57b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
@@ -53,5 +53,5 @@ src_configure() {
 		$(qt_use xcb xkbcommon system)
 		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
 	)
-	qt5-build_src_configure
+	qt5-build-r10000_src_configure
 }
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild
index b029cc42..ffbd36c5 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
diff --git a/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild b/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild
index b8568f5e..79543d00 100644
--- a/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild
index 8e0054f7..f0aa8d4d 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit qt5-build
+inherit qt5-build-r10000
 
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"