dev-qt: Use qt5_tools_configure where possible

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

12 files changed, 2 insertions, 168 deletions

diff --git a/dev-qt/designer/designer-5.15.0_beta4.ebuild b/dev-qt/designer/designer-5.15.0_beta4.ebuild
index a8446a05..bd0d9546 100644
--- a/dev-qt/designer/designer-5.15.0_beta4.ebuild
+++ b/dev-qt/designer/designer-5.15.0_beta4.ebuild
@@ -25,10 +25,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
 src_prepare() {
 	qt_use_disable_mod declarative quickwidgets \
 		src/designer/src/plugins/plugins.pro
@@ -39,16 +35,6 @@ src_prepare() {
 	qt5-build_src_prepare
 }
 
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
-
 src_install() {
 	qt5-build_src_install
 
diff --git a/dev-qt/designer/designer-5.15.9999.ebuild b/dev-qt/designer/designer-5.15.9999.ebuild
index a8446a05..bd0d9546 100644
--- a/dev-qt/designer/designer-5.15.9999.ebuild
+++ b/dev-qt/designer/designer-5.15.9999.ebuild
@@ -25,10 +25,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
 src_prepare() {
 	qt_use_disable_mod declarative quickwidgets \
 		src/designer/src/plugins/plugins.pro
@@ -39,16 +35,6 @@ src_prepare() {
 	qt5-build_src_prepare
 }
 
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
-
 src_install() {
 	qt5-build_src_install
 
diff --git a/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild b/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild
index 6e644ada..e3a011cf 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild
@@ -19,17 +19,3 @@ DEPEND="
 	~dev-qt/qtwidgets-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
index 6e644ada..e3a011cf 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild
@@ -19,17 +19,3 @@ DEPEND="
 	~dev-qt/qtwidgets-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild b/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild
index dddcd583..9052d517 100644
--- a/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild
@@ -20,22 +20,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
 src_prepare() {
 	qt_use_disable_mod qml qmldevtools-private \
 		src/qdoc/qdoc.pro
 
 	qt5-build_src_prepare
 }
-
-src_configure() {
-	# src/qdoc requires files that are only generated when qmake is
-	# run in the root directory. bug 676948; same fix as bug 633776
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.9999.ebuild b/dev-qt/qdoc/qdoc-5.15.9999.ebuild
index dddcd583..9052d517 100644
--- a/dev-qt/qdoc/qdoc-5.15.9999.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.9999.ebuild
@@ -20,22 +20,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
 src_prepare() {
 	qt_use_disable_mod qml qmldevtools-private \
 		src/qdoc/qdoc.pro
 
 	qt5-build_src_prepare
 }
-
-src_configure() {
-	# src/qdoc requires files that are only generated when qmake is
-	# run in the root directory. bug 676948; same fix as bug 633776
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild b/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild
index 94e64960..c6a3b3f5 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild
@@ -21,10 +21,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
 src_prepare() {
 	qt_use_disable_mod network network \
 		src/qtdiag/qtdiag.pro
@@ -34,13 +30,3 @@ src_prepare() {
 
 	qt5-build_src_prepare
 }
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
index 94e64960..c6a3b3f5 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild
@@ -21,10 +21,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
 src_prepare() {
 	qt_use_disable_mod network network \
 		src/qtdiag/qtdiag.pro
@@ -34,13 +30,3 @@ src_prepare() {
 
 	qt5-build_src_prepare
 }
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild b/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild
index 6999dd88..c221a484 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild
@@ -17,17 +17,3 @@ DEPEND="
 	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
index 7cbdff0f..c221a484 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,17 +17,3 @@ DEPEND="
 	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild
index 44e33e18..30824146 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild
@@ -17,17 +17,3 @@ DEPEND="
 	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
index 2e2bcc16..30824146 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,17 +17,3 @@ DEPEND="
 	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}