From 5e3f6464030f4ebe87979ee4a1d61b879cb36771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 23:24:31 +0700
Subject: [PATCH 1/3] build-style/qmake: look for modules in target

- With this added, we can remove qt5*-devel from hostmakedepends
---
 common/build-style/qmake.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 90f541b7bd1..25d62258f7f 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -37,6 +37,7 @@ include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
 
 QMAKE_TARGET_CONFIG     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
 QMAKE_TARGET_MODULE     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
+QMAKEMODULES            = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules
 QMAKE_CC                = ${CC}
 QMAKE_CXX               = ${CXX}
 QMAKE_LINK              = ${CXX}

From e33dc0f086f6ad330f54b2d5b020644467872df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Mar 2021 21:42:07 +0700
Subject: [PATCH 2/3] srcpkgs: remove qt5-*-devel enmass from hostmakedepends

---
 srcpkgs/2048-qt/template               |  2 +-
 srcpkgs/FeatherPad/template            |  6 +-----
 srcpkgs/Fritzing/template              |  6 +-----
 srcpkgs/LibreCAD/template              |  3 +--
 srcpkgs/QLC+/template                  |  3 +--
 srcpkgs/UEFITool/template              |  2 +-
 srcpkgs/YACReader/template             |  4 +---
 srcpkgs/Z80Explorer/template           |  4 ----
 srcpkgs/actiona/template               |  7 +------
 srcpkgs/biblioteq/template             |  4 +---
 srcpkgs/chatterino2/template           | 18 ++++++++++++------
 srcpkgs/chessx/template                |  6 +-----
 srcpkgs/clipgrab/template              |  7 +------
 srcpkgs/cmst/template                  |  6 +-----
 srcpkgs/cool-retro-term/template       |  2 +-
 srcpkgs/cutechess-gui/template         |  6 +-----
 srcpkgs/cutter/template                |  3 +--
 srcpkgs/dialogbox/template             |  2 +-
 srcpkgs/eqonomize/template             |  5 +----
 srcpkgs/fingerprint-gui/template       |  2 --
 srcpkgs/fmit/template                  |  7 ++-----
 srcpkgs/focuswriter/template           |  6 +-----
 srcpkgs/gede/template                  |  6 +-----
 srcpkgs/ghostwriter/template           |  3 +--
 srcpkgs/goldendict/template            |  4 ----
 srcpkgs/imagewriter/template           |  6 +-----
 srcpkgs/jamulus/template               |  6 +-----
 srcpkgs/kristall/template              |  2 +-
 srcpkgs/kvantum/template               |  5 -----
 srcpkgs/leocad/template                |  2 +-
 srcpkgs/libcommuni/template            |  6 +-----
 srcpkgs/librepcb/template              |  4 ----
 srcpkgs/lumina/template                |  6 +-----
 srcpkgs/merkaartor/template            |  4 ----
 srcpkgs/minitube/template              |  6 +-----
 srcpkgs/mpc-qt/template                |  2 +-
 srcpkgs/mumble/template                |  4 ----
 srcpkgs/notepadqq/template             |  6 +-----
 srcpkgs/octoxbps/template              |  6 +-----
 srcpkgs/olive/template                 |  2 +-
 srcpkgs/openscad/template              |  6 +-----
 srcpkgs/orion/template                 |  6 +-----
 srcpkgs/pencil2d/template              |  6 +-----
 srcpkgs/phototonic/template            |  6 +-----
 srcpkgs/plume-creator/template         |  6 ------
 srcpkgs/qarma/template                 |  5 +----
 srcpkgs/qcas/template                  |  6 +-----
 srcpkgs/qdirstat/template              |  6 +-----
 srcpkgs/qgo/template                   |  6 +-----
 srcpkgs/qml-box2d/template             |  6 +-----
 srcpkgs/qmltermwidget/template         |  2 +-
 srcpkgs/qoauth-qt5/template            |  6 +-----
 srcpkgs/qownnotes/template             |  7 +------
 srcpkgs/qpdfview/template              |  2 +-
 srcpkgs/qscintilla-qt5/template        |  6 +-----
 srcpkgs/qt5-styleplugins/template      |  2 +-
 srcpkgs/qt5-webengine/template         |  7 +------
 srcpkgs/qt5-webview/template           |  2 +-
 srcpkgs/qt5ct/template                 |  6 +-----
 srcpkgs/qt5pas/template                |  6 +-----
 srcpkgs/qtav/template                  |  2 +-
 srcpkgs/qtcreator/template             | 10 +++-------
 srcpkgs/qtfm/template                  |  5 +----
 srcpkgs/quiterss/template              |  2 +-
 srcpkgs/qwt/template                   |  6 +-----
 srcpkgs/qxmledit/template              |  6 +-----
 srcpkgs/radeon-profile-daemon/template |  5 +----
 srcpkgs/radeon-profile/template        |  5 +----
 srcpkgs/retroshare/template            |  3 +--
 srcpkgs/rssguard/template              |  5 +----
 srcpkgs/shotcut/template               |  5 +----
 srcpkgs/signon-ui/template             |  2 +-
 srcpkgs/smtube/template                |  2 +-
 srcpkgs/stremio-shell/template         |  4 ----
 srcpkgs/texmaker/template              |  6 +-----
 srcpkgs/texstudio/template             |  5 +----
 srcpkgs/textosaurus/template           |  6 +-----
 srcpkgs/touchegg/template              |  6 +-----
 srcpkgs/vapoursynth-editor/template    |  6 +-----
 srcpkgs/vokoscreen/template            |  4 ----
 srcpkgs/wkhtmltopdf/template           |  7 +------
 srcpkgs/wpa_gui/template               |  2 +-
 srcpkgs/xaos/template                  |  2 +-
 srcpkgs/ykpers-gui/template            |  6 +-----
 srcpkgs/zrandr/template                |  5 +----
 85 files changed, 89 insertions(+), 324 deletions(-)

diff --git a/srcpkgs/2048-qt/template b/srcpkgs/2048-qt/template
index b8ce1f21fe8..79b1342ff91 100644
--- a/srcpkgs/2048-qt/template
+++ b/srcpkgs/2048-qt/template
@@ -3,7 +3,7 @@ pkgname=2048-qt
 version=0.1.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-declarative-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-quickcontrols xdg-utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 8558f283538..cfff3296010 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -3,7 +3,7 @@ pkgname=FeatherPad
 version=0.17.2
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-tools-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel hunspell-devel"
 short_desc="Lightweight Qt5 plain-text editor for Linux"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
@@ -11,7 +11,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
 checksum=2e706beeec7d2664b888bc908febae1e4bfe014b3c1d22aece6088a8d023d45c
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"
-fi
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index ea09c1b8d44..d97ab1654a5 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -5,7 +5,7 @@ revision=5
 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
 wrksrc="fritzing-app-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel libgit2-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Software for electronics prototyping"
@@ -17,10 +17,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.g
 checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8
  2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-serialport-devel qt5-svg-devel"
-fi
-
 post_extract() {
 	# looks for libgit2 and boost in the source tree
 	# make it use the system libraries
diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template
index 26202b4a8b5..3a5224f907e 100644
--- a/srcpkgs/LibreCAD/template
+++ b/srcpkgs/LibreCAD/template
@@ -3,7 +3,7 @@ pkgname=LibreCAD
 version=2.1.3
 revision=3
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config ImageMagick"
+hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel boost-devel muparser-devel librsvg-devel"
 short_desc="2D Computer-aided design (CAD) software"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
@@ -13,7 +13,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
 checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
 	configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr"
 fi
 
diff --git a/srcpkgs/QLC+/template b/srcpkgs/QLC+/template
index 0331d187d37..38322eb305c 100644
--- a/srcpkgs/QLC+/template
+++ b/srcpkgs/QLC+/template
@@ -4,8 +4,7 @@ version=4.12.3
 revision=1
 wrksrc=qlcplus-QLC-_$version
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools
- qt5-multimedia-devel qt5-script-devel"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="eudev-libudev-devel qt5-devel qt5-multimedia-devel
  qt5-script-devel alsa-lib-devel libftdi1-devel libusb-compat-devel
  libsndfile-devel libmad-devel"
diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template
index ba5ae9dda41..5ce8215f0cc 100644
--- a/srcpkgs/UEFITool/template
+++ b/srcpkgs/UEFITool/template
@@ -4,7 +4,7 @@ version=A56
 revision=1
 build_wrksrc="UEFITool"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="UEFI firmware image viewer and editor"
 maintainer="Kacper Słomiński <kacper.slominski72@gmail.com>"
diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template
index e22b11bffdd..e49b201e684 100644
--- a/srcpkgs/YACReader/template
+++ b/srcpkgs/YACReader/template
@@ -4,9 +4,7 @@ version=9.7.1
 revision=1
 wrksrc=yacreader-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-script-devel qt5-declarative-devel
- qt5-quickcontrols qt5-multimedia-devel poppler-qt5-devel
- libunarr-devel"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-script-devel qt5-declarative-devel qt5-quickcontrols
  qt5-multimedia-devel poppler-qt5-devel qrencode-devel
  glu-devel libunarr-devel"
diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index 1c7c52d8fbc..f11a0e97069 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -15,10 +15,6 @@ distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pk
 checksum="8140eaeff215e49df2c0abb7c10f84c4c721adaced6a756d30e584348078b29b
  f6980e5bf3cadcc050d70a359fae7813d3d3b1805935a57dea564caed67b3192"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 post_extract() {
 	mv ../${pkgname}_Z80-${_z80_githash} resource
 	vsed -i ${pkgname}.pro -e "s;/opt/\$\${TARGET}/bin;/usr/libexec/${pkgname};"
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index bd14f268aae..e520d1eac99 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -3,7 +3,7 @@ pkgname=actiona
 version=3.10.1
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake"
+hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"
 makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
  qt5-multimedia-devel qt5-script-devel qt5-speech-devel qt5-tools-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel"
@@ -15,11 +15,6 @@ homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-multimedia-devel qt5-script-devel qt5-speech-devel"
-	hostmakedepends+=" qt5-tools-devel qt5-x11extras-devel qt5-xmlpatterns-devel"
-fi
-
 post_build() {
 	lrelease-qt5 locale/*.ts
 }
diff --git a/srcpkgs/biblioteq/template b/srcpkgs/biblioteq/template
index 742e7b01291..23f62e225ce 100644
--- a/srcpkgs/biblioteq/template
+++ b/srcpkgs/biblioteq/template
@@ -4,6 +4,7 @@ version=2020.01.01
 revision=1
 build_style=qmake
 configure_args="-o Makefile"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libpqxx-devel qt5-devel poppler-cpp-devel poppler-qt5-devel
  sqlite-devel yaz-devel"
 depends="qt5-plugin-sqlite"
@@ -21,9 +22,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" biblioteq.pro" ;;
 esac
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel poppler-cpp-devel"
-fi
 
 pre_configure() {
 	sed -i -e 's|biblioteq.conf|/etc/biblioteq.conf|' \
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 7aec8859d72..f69730b3a9f 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -7,8 +7,10 @@ _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
 _serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
- libcommuni-devel pkg-config"
+configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
  qtkeychain-qt5-devel"
@@ -34,10 +36,14 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 post_extract() {
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/"* lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/"* lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/"* lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/"* lib/serialize/
+	rmdir lib/signals
+	rmdir lib/settings
+	rmdir lib/humanize
+	rmdir lib/serialize
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
+	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
 }
 
 pre_configure() {
diff --git a/srcpkgs/chessx/template b/srcpkgs/chessx/template
index 774af4b4818..5caec7718d7 100644
--- a/srcpkgs/chessx/template
+++ b/srcpkgs/chessx/template
@@ -3,7 +3,7 @@ pkgname=chessx
 version=1.5.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-tools"
+hostmakedepends="qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-speech-devel pulseaudio-devel"
 short_desc="Open Source chess database"
 maintainer="cipr3s <cipr3s@gmx.com>"
@@ -12,10 +12,6 @@ homepage="https://chessx.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum=d09a4b534a909c5f1a398c64065049a2fdf30497bc81ccbdf0d940412364d205
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-speech-devel qt5-svg-devel"
-fi
-
 do_install() {
 	vinstall unix/${pkgname}.desktop 644 usr/share/applications
 	vinstall data/images/${pkgname}.png 644 usr/share/pixmaps
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index d67d4a3c13c..b234229ac80 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -4,6 +4,7 @@ version=3.9.6
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-webengine-devel qt5-webchannel-devel
  qt5-location-devel qt5-devel qt5-quickcontrols2-devel
  qt5-declarative-devel"
@@ -15,12 +16,6 @@ homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
 checksum=d6b42ed8687d3ca49b0b4b6e4312f0161cf2dbcd33e286e96be797bc30730d6d
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends=" qt5-location-devel qt5-quickcontrols2-devel
-	 qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel
-	 qt5-host-tools qt5-devel"
-fi
-
 do_install() {
 	vbin clipgrab
 	vinstall icon.png 644 usr/share/pixmaps clipgrab.png
diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template
index 83ee03b44e4..4960f3645c9 100644
--- a/srcpkgs/cmst/template
+++ b/srcpkgs/cmst/template
@@ -3,7 +3,7 @@ pkgname=cmst
 version=2020.11.01
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="connman"
 short_desc="Qt GUI for Connman"
@@ -13,10 +13,6 @@ homepage="https://github.com/andrew-bibb/cmst"
 distfiles="https://github.com/andrew-bibb/cmst/archive/${version}.tar.gz"
 checksum=0e445f81afdb51cd288653bc1597488d64846de9cc552f265c5b806716402adb
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense text/LICENSE
 }
diff --git a/srcpkgs/cool-retro-term/template b/srcpkgs/cool-retro-term/template
index 04e8ea5e5af..797d4bbc86e 100644
--- a/srcpkgs/cool-retro-term/template
+++ b/srcpkgs/cool-retro-term/template
@@ -3,7 +3,7 @@ pkgname=cool-retro-term
 version=1.1.1
 revision=1
 build_style=qmake
-hostmakedepends="automake qt5-qmake qt5-declarative-devel"
+hostmakedepends="automake qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-declarative-devel"
 depends="qt5-graphicaleffects qt5-quickcontrols qmltermwidget qt5-plugin-sqlite"
 short_desc="Good looking terminal emulator which mimics the old cathode display"
diff --git a/srcpkgs/cutechess-gui/template b/srcpkgs/cutechess-gui/template
index e3a5ccd6fcc..aba0a87b0c4 100644
--- a/srcpkgs/cutechess-gui/template
+++ b/srcpkgs/cutechess-gui/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 wrksrc=cutechess-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel"
 short_desc="GUI for playing chess"
 maintainer="Imran Khan <imrankhan@teknik.io>"
@@ -13,10 +13,6 @@ homepage="https://github.com/cutechess/cutechess"
 distfiles="https://github.com/cutechess/cutechess/archive/${version}.tar.gz"
 checksum=d0e1b2c9c2eaccf0f8c4d5e5fe7e169358f5de9606bd27de3f9d1ce4ddcdb0bc
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel"
-fi
-
 do_install() {
 	vbin projects/gui/cutechess
 	vinstall dist/linux/cutechess.desktop 644 usr/share/applications
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index ed82d82ac9c..7142c048f53 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -5,8 +5,7 @@ revision=2
 build_wrksrc=src
 build_style=qmake
 configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
-hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
- qt5-svg-devel qt5-tools-devel radare2"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2"
 makedepends="capstone-devel python3-devel qt5-declarative-devel
  qt5-location-devel qt5-svg-devel radare2"
 short_desc="GUI for radare2 written in C++ and QT"
diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template
index 2c7f488cbf3..bdf95c2ad45 100644
--- a/srcpkgs/dialogbox/template
+++ b/srcpkgs/dialogbox/template
@@ -3,7 +3,7 @@ pkgname=dialogbox
 version=1.0
 revision=2
 build_style=qmake
-hostmakedepends="qt5-host-tools qt5-devel"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
 short_desc="Scriptable engine with customizable GUI for shell scripts"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template
index 85655e4ce90..6b5c1b6b7f7 100644
--- a/srcpkgs/eqonomize/template
+++ b/srcpkgs/eqonomize/template
@@ -3,6 +3,7 @@ pkgname=eqonomize
 version=1.5.0
 revision=1
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-charts-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Personal accounting software, with focus on efficiency and ease of use"
@@ -12,7 +13,3 @@ homepage="http://eqonomize.github.io"
 changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog"
 distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=6ca5383d49f65aa521faf4103b7d2910bad9dd277319a1ce4d92669d2d490672
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-charts-devel"
-fi
diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template
index a17832fe13f..08d226569eb 100644
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@@ -23,8 +23,6 @@ if [ "$CROSS_BUILD" ]; then
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtGui"
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets"
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtXml"
-
-	hostmakedepends="qt5-x11extras-devel"
 fi
 
 # This one is needed even when out of cross-compilation
diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template
index a3d59f8c5e6..246dceb594d 100644
--- a/srcpkgs/fmit/template
+++ b/srcpkgs/fmit/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="CONFIG+=acs_qt CONFIG+=$(vopt_if alsa acs_alsa)
  CONFIG+=$(vopt_if jack acs_jack) CONFIG+=$(vopt_if portaudio acs_portaudio)"
-hostmakedepends="itstool pkg-config qt5-tools gettext"
+hostmakedepends="itstool pkg-config qt5-tools gettext qt5-qmake qt5-host-tools"
 makedepends="$(vopt_if alsa alsa-lib-devel) fftw-devel $(vopt_if jack jack-devel)
  $(vopt_if portaudio portaudio-devel) pulseaudio-devel qt5-multimedia-devel
  qt5-svg-devel"
@@ -19,7 +19,4 @@ checksum=8dc123c84c19d6a9a62b303015255718705d5b0b8448a330d3815dd7f9688b02
 
 build_options="alsa jack portaudio"
 build_options_default="alsa jack portaudio"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel qt5-svg-devel"
-fi
+desc_option_portaudio="Cross-platform audio API"
diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 9bb4a5e9c54..6fb6e7f9935 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -3,7 +3,7 @@ pkgname=focuswriter
 version=1.7.6
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="hunspell-devel pulseaudio-devel qt5-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,7 +11,3 @@ license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
 checksum=bbf70def7d86ee18cabe9f8ac3922ebbf4dfdb36893df3e6fa3e026acfcb2057
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template
index 2d30af7ff9d..5cb8bbcec9d 100644
--- a/srcpkgs/gede/template
+++ b/srcpkgs/gede/template
@@ -4,7 +4,7 @@ version=2.16.2
 revision=1
 build_wrksrc=src
 build_style=qmake
-hostmakedepends="python qt5-qmake"
+hostmakedepends="python qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="gdb ctags"
 short_desc="Graphical frontend (GUI) to GDB written in Qt"
@@ -14,10 +14,6 @@ homepage="http://acidron.com/gede"
 distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz"
 checksum=32c390099d9755ec54836a04ef82ffcd315bd6912525714f626b3eb87db248a1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 do_install() {
 	cd $wrksrc
 	python2 build.py install --prefix="${PKGDESTDIR}/usr" install
diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 1dae729b6d2..4219a7f13ae 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -3,8 +3,7 @@ pkgname=ghostwriter
 version=1.8.1
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-multimedia-devel qt5-svg-devel qt5-webengine-devel
- qt5-webchannel-devel qt5-location-devel qt5-declarative-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
  qt5-webengine-devel qt5-location-devel qt5-webchannel-devel qt5-declarative-devel"
 depends="hicolor-icon-theme qt5-svg"
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index ee79a69133f..7553e408d1a 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -19,10 +19,6 @@ checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde
 
 CXXFLAGS="-Wno-deprecated"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel qt5-webkit-devel qt5-host-tools qt5-svg-devel qt5-x11extras-devel"
-fi
-
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/goldendict.png
 }
diff --git a/srcpkgs/imagewriter/template b/srcpkgs/imagewriter/template
index 7b82d4f8db0..cd4d3c9af69 100644
--- a/srcpkgs/imagewriter/template
+++ b/srcpkgs/imagewriter/template
@@ -6,6 +6,7 @@ _commit=1d253d960a28f9de4468b0b091c231083f03c1c8
 wrksrc="${pkgname}-${_commit}"
 build_style=qmake
 configure_args="DEFINES=USEUDISKS2"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="desktop-file-utils hicolor-icon-theme udisks2"
 short_desc="Graphical utility for writing raw disk images & hybrid isos to USB keys"
@@ -14,8 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/openSUSE/imagewriter"
 distfiles="https://github.com/openSUSE/imagewriter/archive/${_commit}.tar.gz"
 checksum=7761ee45b16b5841c6b62b091c7f9d0b8c64b14b79d77e9909ca813e1dc9885d
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-devel"
-fi
-
diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index 1df45532ce1..098aa9e0d77 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -6,7 +6,7 @@ _version=r${version//./_}
 wrksrc=${pkgname}-${_version}
 build_style=qmake
 configure_args="Jamulus.pro"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel jack-devel"
 short_desc="Play music online. With friends. For free"
 maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
@@ -14,7 +14,3 @@ license="GPL-2.0-or-later"
 homepage="https://jamulus.io"
 distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
 checksum=6bea992f0e4b6a9d08104f8ad9d42b630d523da258e201f70418cecda1c11dac
-
-if [ "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index 1455af6d35b..a3690383d14 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -4,7 +4,7 @@ version=0.3
 revision=2
 build_wrksrc=src
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel"
 short_desc="Small-Internet Browser"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 34edc24474b..e8f6c43262a 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -16,11 +16,6 @@ distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
 checksum=79752525b5636009385864373618e5e747a9fa7047af46d7815e27934c9a3dfd
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel qt5-x11extras-devel
-	 kwindowsystem-devel"
-fi
-
 post_install() {
 	vdoc doc/Theme-Config.pdf
 	vdoc doc/Theme-Making.pdf
diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index fa8a093c6c0..9981eaeb367 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -5,7 +5,7 @@ revision=1
 _lib_version=20.03
 build_style=qmake
 configure_args="DISABLE_UPDATE_CHECK=1"
-hostmakedepends="qt5-tools-devel unzip"
+hostmakedepends="qt5-host-tools qt5-qmake unzip"
 makedepends="qt5-devel MesaLib-devel"
 short_desc="CAD program for creating virtual LEGO models"
 maintainer="teldra <teldra@rotce.de>"
diff --git a/srcpkgs/libcommuni/template b/srcpkgs/libcommuni/template
index af668a3628b..eb1dc92d319 100644
--- a/srcpkgs/libcommuni/template
+++ b/srcpkgs/libcommuni/template
@@ -4,7 +4,7 @@ version=3.5.0
 revision=1
 build_style=qmake
 configure_args="-config release"
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="Cross-platform IRC framework written with Qt"
 maintainer="John Regan <john@jrjrtech.com>"
@@ -14,10 +14,6 @@ changelog="https://raw.githubusercontent.com/communi/libcommuni/master/CHANGELOG
 distfiles="https://github.com/communi/libcommuni/archive/v${version}.tar.gz"
 checksum=cc0690129c7963578df9be2127ca5ba9f1e182bfe6c138d84612382e2dc80177
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index 68f1ba250f8..670b1bf77a1 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -12,7 +12,3 @@ license="GPL-3.0-or-later"
 homepage="https://librepcb.org"
 distfiles="https://download.librepcb.org/releases/${version}/${pkgname}-${version}-source.zip"
 checksum=f956dfa5b9ad1faffcab7f5dd03f158c2b97a7c82cfc9a09dc4066cbcf0db76a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
diff --git a/srcpkgs/lumina/template b/srcpkgs/lumina/template
index fb495107e0b..ed7ef97adfb 100644
--- a/srcpkgs/lumina/template
+++ b/srcpkgs/lumina/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=2
 build_style=qmake
 configure_args="QT5LIBDIR=/usr/lib/qt5 L_ETCDIR=/etc CONFIG+=WITH_I18N"
-hostmakedepends="qt5-host-tools"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel
  qt5-declarative-devel libXrender-devel libXcomposite-devel libXcursor-devel libXdamage-devel
  xcb-util-devel xcb-util-wm-devel xcb-util-image-devel pulseaudio-devel poppler-qt5-devel"
@@ -17,10 +17,6 @@ distfiles="https://github.com/lumina-desktop/lumina/archive/v${version}.tar.gz"
 checksum=f3512fca4d05e3cf3a6ac106f0f16c9618bda9fa546f1d23ffb0eab9a5ce7c8a
 replaces="lumina-git>=0"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel poppler-qt5-devel"
-fi
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 4bc96d225c7..17c8d5dc361 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -15,7 +15,3 @@ distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz
 checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a
 
 CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel qt5-webkit-devel"
-fi
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 23ef018ad9f..ab5cc659144 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -3,7 +3,7 @@ pkgname=minitube
 version=3.7
 revision=1
 build_style=qmake
-hostmakedepends="qt5-tools qt5-qmake git"
+hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
 makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel
  qt5-plugin-sqlite qt5-x11extras-devel mpv-devel"
 depends="virtual?phonon-qt5-backend desktop-file-utils hicolor-icon-theme"
@@ -14,10 +14,6 @@ homepage="http://flavio.tordini.org/minitube"
 distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
 checksum=a8dd0db3f3f8172abc1ea940d3bf533e87c9a4f8a1df2ce38ff2e0cda728107e
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel qt5-declarative-devel"
-fi
-
 pre_configure() {
 	# Provided by Gottox
 	local _api_key=AIzaSyBzMj41taMuHLAF95-y9cTXL4JpPGqMORk
diff --git a/srcpkgs/mpc-qt/template b/srcpkgs/mpc-qt/template
index 28651df5cf4..3e60cb06c89 100644
--- a/srcpkgs/mpc-qt/template
+++ b/srcpkgs/mpc-qt/template
@@ -4,7 +4,7 @@ version=18.08
 revision=1
 build_style=qmake
 configure_args="MPCQT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-qmake qt5-x11extras-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-x11extras-devel mpv-devel"
 short_desc="Clone of Media Player Classic reimplemented in Qt"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 5493688b12e..7d2c8641571 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -23,10 +23,6 @@ checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093
 build_options="jack"
 desc_option_jack="Enable support for the JACK sound server"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_install() {
 	vlicense LICENSE
 	vmkdir usr/lib/mumble
diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template
index 12ab7b5fd1f..8a16e31d31e 100644
--- a/srcpkgs/notepadqq/template
+++ b/srcpkgs/notepadqq/template
@@ -3,7 +3,7 @@ pkgname=notepadqq
 version=1.4.8
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -13,10 +13,6 @@ license="GPL-3.0-or-later"
 distfiles="https://github.com/notepadqq/notepadqq/archive/v${version}.tar.gz"
 checksum=13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel qt5-webkit-devel"
-fi
-
 post_install() {
 	# no need for upstream's weird magic, leads to segfaults anyway
 	rm "${DESTDIR}/usr/bin/notepadqq"
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index f6bfc401a7f..135429b0117 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -3,7 +3,7 @@ pkgname=octoxbps
 version=0.3.0
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"
 depends="curl sudo"
 short_desc="Qt-based XBPS front-end"
@@ -14,10 +14,6 @@ changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
 distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
 checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
-
 post_configure() {
 	local qmake_args
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 6ae58b4b100..11468a8b04c 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -3,7 +3,7 @@ pkgname=olive
 version=0.1.2
 revision=2
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel pkg-config"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 49fed1660be..5e846402ddd 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -3,7 +3,7 @@ pkgname=openscad
 version=2019.05
 revision=3
 build_style=qmake
-hostmakedepends="bison flex pkg-config gettext qt5-qmake"
+hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
  qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
 short_desc="Solid 3D CAD modeller"
@@ -12,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="http://www.openscad.org"
 distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
 checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template
index 0348a824fc6..d69f2ff04dd 100644
--- a/srcpkgs/orion/template
+++ b/srcpkgs/orion/template
@@ -3,7 +3,7 @@ pkgname=orion
 version=1.6.7
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel mpv-devel"
 depends="qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects qt5-svg"
 short_desc="Qt-based client for Twitch.tv"
@@ -13,10 +13,6 @@ homepage="https://github.com/alamminsalo/orion"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=19d9c170d0bcf21d47947704d8c8e927cff5140f94cb840b51d2b8574b0149fb
 
-if [ "$CROSS_BUILD" ];then
-	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel qt5-quickcontrols2-devel"
-fi
-
 do_install() {
 	vbin orion
 	vinstall distfiles/Orion.desktop 644 usr/share/applications/
diff --git a/srcpkgs/pencil2d/template b/srcpkgs/pencil2d/template
index 435c39a01a9..048dad18db9 100644
--- a/srcpkgs/pencil2d/template
+++ b/srcpkgs/pencil2d/template
@@ -4,7 +4,7 @@ version=0.6.5
 revision=1
 wrksrc=pencil-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"
 depends="hicolor-icon-theme ffmpeg qt5-svg qt5-xmlpatterns"
 short_desc="Easy, intuitive tool to make 2D hand-drawn animations"
@@ -14,7 +14,3 @@ homepage="https://pencil2d.org/"
 changelog="https://raw.githubusercontent.com/pencil2d/pencil/master/ChangeLog.md"
 distfiles="https://github.com/${pkgname}/pencil/archive/v${version}.tar.gz"
 checksum=31903c54c8f0a79385cc5f519b380d26524219984e619204820b946c96fc2482
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/phototonic/template b/srcpkgs/phototonic/template
index 2c438541181..77ae8bf6a44 100644
--- a/srcpkgs/phototonic/template
+++ b/srcpkgs/phototonic/template
@@ -3,7 +3,7 @@ pkgname=phototonic
 version=2.1
 revision=3
 build_style=qmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel exiv2-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-imageformats"
 short_desc="Lightweight image viewer and organizer for Qt5"
@@ -12,7 +12,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/oferkv/phototonic"
 distfiles="https://github.com/oferkv/phototonic/archive/v${version}.tar.gz"
 checksum=a8b2dbc81750efabb65a4732b1704641afd4a4f772ef9c90817871ca2a52f5ef
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template
index 1859404c5e4..3c415a06cdd 100644
--- a/srcpkgs/plume-creator/template
+++ b/srcpkgs/plume-creator/template
@@ -21,12 +21,6 @@ checksum="
  f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c
  7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1"
 
-if [  "$CROSS_BUILD" ]; then
-	hostmakedepends+="
- qt5-multimedia-devel qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel hunspell-devel
- libzip-devel quazip-devel"
-fi
-
 post_extract() {
 	mv -f ${wrksrc}/../debian ${wrksrc}/
 	mv -f ${wrksrc}/../resources/themes ${wrksrc}/
diff --git a/srcpkgs/qarma/template b/srcpkgs/qarma/template
index 73ff50d6df8..40351ba5c36 100644
--- a/srcpkgs/qarma/template
+++ b/srcpkgs/qarma/template
@@ -5,6 +5,7 @@ revision=1
 build_style=qmake
 provides="zenity-${version}_${revision}"
 replaces="zenity>=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-x11extras-devel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Tool to create dialog boxes, based on Qt"
@@ -13,10 +14,6 @@ license="GPL-2"
 distfiles="https://github.com/luebking/qarma/archive/${version}.tar.gz"
 checksum=ebce381d2884e4109998bc4a966f1eb08cc549b2725b0f4c5525b30849754794
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
-
 post_install() {
 	ln -s /usr/bin/qarma ${DESTDIR}/usr/bin/zenity
 }
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index fad8bda9e40..6c634902225 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -4,7 +4,7 @@ version=0.5.3
 revision=1
 build_style=qmake
 configure_args="qcas.pro"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
 short_desc="The QT frontend to Giac/Xcas"
@@ -14,10 +14,6 @@ homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
 distfiles="https://git.tuxfamily.org/qcas/qcas.git/snapshot/qcas-${version}.tar.gz"
 checksum=06bc5aca9f6e367e75181c633a7d1f3e199f8c7b336c1d43bcafdf41f2cb807c
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_install() {
 	vbin qcas
 	vinstall debian/qcas.desktop 644 usr/share/applications
diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 4baa801f60b..070bd37742b 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -3,7 +3,7 @@ pkgname=qdirstat
 version=1.7
 revision=2
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
 short_desc="Qt-based directory statistics (KDirStat without any KDE)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -12,10 +12,6 @@ homepage="https://github.com/shundhammer/qdirstat"
 distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
 checksum=9a8ec22a19290794147f727bca27deb7e02b4d9c537deb2fd0d3e647621f8c4a
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vman man/qdirstat.1
 }
diff --git a/srcpkgs/qgo/template b/srcpkgs/qgo/template
index be485430202..82e76ecfafb 100644
--- a/srcpkgs/qgo/template
+++ b/srcpkgs/qgo/template
@@ -3,7 +3,7 @@ pkgname=qgo
 version=2.1.1
 revision=1
 build_style=qmake
-hostmakedepends="git qt5-qmake qt5-tools"
+hostmakedepends="git qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel pulseaudio-devel"
 short_desc="Go/Weiqi/Baduk client that supports the IGS, GTP and SGF protocols"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -11,7 +11,3 @@ license="GPL-2"
 homepage="https://github.com/pzorin/qgo"
 distfiles="https://github.com/xelxebar/${pkgname}/archive/v${version}.tar.gz"
 checksum="e4a36f92abded9536e2bedb5748fd3aba6d150248b1b26a6985763dc4c15434e"
-
-if [ -n "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/qml-box2d/template b/srcpkgs/qml-box2d/template
index 99d599a1b35..2c213c732db 100644
--- a/srcpkgs/qml-box2d/template
+++ b/srcpkgs/qml-box2d/template
@@ -5,6 +5,7 @@ revision=1
 _commit=b7212d5640701f93f0cd88fbd3a32c619030ae62
 wrksrc="qml-box2d-${_commit}"
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="Box2D QML plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,11 +13,6 @@ license="Zlib"
 homepage="https://github.com/qml-box2d/qml-box2d"
 distfiles="https://github.com/qml-box2d/qml-box2d/archive/${_commit}.tar.gz"
 checksum=a9071d2a85aafe74cb431e12888cfb92bd19cb91f4f577edd73cd9692d5e152f
-nocross='some things do get wrongly installed into $DESTDIR/$XBPS_CROSS_BASE'
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template
index 60de10dfef8..8a5b2fa230e 100644
--- a/srcpkgs/qmltermwidget/template
+++ b/srcpkgs/qmltermwidget/template
@@ -3,7 +3,7 @@ pkgname=qmltermwidget
 version=0.2.0
 revision=1
 build_style=qmake
-hostmakedepends="qt5-declarative-devel qt5-qmake"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel"
 short_desc="QML port of qtermwidget"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
diff --git a/srcpkgs/qoauth-qt5/template b/srcpkgs/qoauth-qt5/template
index f9fcb6da905..d5f3f388e1e 100644
--- a/srcpkgs/qoauth-qt5/template
+++ b/srcpkgs/qoauth-qt5/template
@@ -5,7 +5,7 @@ revision=1
 _gitrev=4b01e9fa5198f9e175f5e8e19868b32101f22b98
 wrksrc="qoauth-${_gitrev}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qca-qt5-devel"
 short_desc="Support with OAuth-powered network services"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -16,10 +16,6 @@ checksum=9eef13bd6095d68ba7902514b300c23cb81a69a090ba82ced9d7cdf76a65d8e4
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/Qca-qt5/QtCrypto"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 pre_configure() {
 	sed -i src/src.pro tests/*/*.pro \
 		-e 's|lib64|lib|' \
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index 2e580449151..6b6744b7687 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -3,7 +3,7 @@ pkgname=qownnotes
 version=20.12.0
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="botan-devel qt5-declarative-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-websockets-devel qt5-x11extras-devel"
 depends="qt5-plugin-sqlite"
@@ -15,11 +15,6 @@ changelog="https://www.qownnotes.org/changelog/QOwnNotes"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
 checksum=c21352a876fb3cb6cb58fb05536f78ab061b79fec8ced055ff7c9a285674898d
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel
-	 qt5-xmlpatterns-devel qt5-websockets-devel qt5-x11extras-devel"
-fi
-
 pre_build() {
 	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
 }
diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d..19cb2bb34ad 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -4,7 +4,7 @@ version=0.4.18
 revision=2
 build_style=qmake
 configure_args="qpdfview.pro"
-hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index e7eac8a82f4..5bc6c853075 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="QScintilla_gpl-${version}"
 build_wrksrc=Qt4Qt5
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Qt5 port of Neil Hodgson's Scintilla C++ editor class"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
@@ -14,10 +14,6 @@ homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
 checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-devel"
-fi
-
 qscintilla-qt5-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index be8a125b466..98991b16fa3 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -5,7 +5,7 @@ revision=15
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
 depends="qt5-core>=5.15.2<5.15.3"
 short_desc="Additional style plugins for Qt5"
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index b49665122bb..edc84557bd3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -12,7 +12,7 @@ configure_args="--
  -webengine-kerberos -no-webengine-embedded-build"
 # Rely on auto detection (fails if forced for cross builds) -webengine-alsa
 hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config
- which perl python protobuf"
+ which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
 makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
  libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
@@ -36,11 +36,6 @@ if [ "$build_option_sndio" ]; then
 	configure_args+=" -sndio"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" nss-devel libevent-devel qt5-location-devel
-	 qt5-declarative-devel"
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
diff --git a/srcpkgs/qt5-webview/template b/srcpkgs/qt5-webview/template
index fc2265296fc..807f4d0504c 100644
--- a/srcpkgs/qt5-webview/template
+++ b/srcpkgs/qt5-webview/template
@@ -4,7 +4,7 @@ version=5.15.2
 revision=1
 wrksrc="qtwebview-everywhere-src-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake perl qt5-declarative-devel"
+hostmakedepends="qt5-qmake perl qt5-host-tools"
 makedepends="qt5-location-devel qt5-webchannel-devel qt5-tools-devel qt5-declarative-devel
  $(vopt_if webengine qt5-webengine-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 4dc23eb2181..02f6e9442fe 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -3,7 +3,7 @@ pkgname=qt5ct
 version=1.1
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-tools"
+hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
 depends="qt5-svg"
 short_desc="Qt5 Configuration Tool"
@@ -13,10 +13,6 @@ homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
 checksum=af77c4dbf7f9ba97fe0218648167395bca7bcb2b9c1886a9c98b1e343127ddd2
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense COPYING
 	vinstall ${FILESDIR}/qt5ct.sh 644 etc/profile.d
diff --git a/srcpkgs/qt5pas/template b/srcpkgs/qt5pas/template
index 0d8c75b9240..93113c71703 100644
--- a/srcpkgs/qt5pas/template
+++ b/srcpkgs/qt5pas/template
@@ -4,7 +4,7 @@ version=2.6~beta
 revision=2
 wrksrc=cbindings
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-x11extras-devel"
 short_desc="Qt5 interface bindings for Pascal"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,10 +13,6 @@ homepage="https://svn.freepascal.org/svn/lazarus/trunk/lcl/interfaces/qt5/cbindi
 distfiles="${DEBIAN_SITE}/main/libq/libqtpas/libqtpas_${version}.orig.tar.xz"
 checksum=fcc5f695d60d5f72bf501b2fa779e8a1a2636c8d991270b5b3fef3d0e990365c
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-x11extras-devel"
-fi
-
 post_install() {
 	vinstall qt5.pas 0644 usr/share/pascal/qt5
 }
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 5687942f7f5..0d85ec07648 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -4,7 +4,7 @@ version=1.13.0
 revision=1
 wrksrc="QtAV-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools qt5-svg-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel libass-devel libopenal-devel
  libva-glx-devel libXv-devel pulseaudio-devel
  qt5-declarative-devel qt5-svg-devel
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index cb7bdd6cf53..6080b0da508 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -5,9 +5,10 @@ revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
-hostmakedepends="clang llvm perl pkg-config python3 which"
+hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
+ qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols"
+ qt5-quickcontrols clang llvm"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -18,11 +19,6 @@ checksum=ef6fdcbaebb0d3d37cfdbc68f8b9e94ffeb6f63194564da5ce77760bb7790367
 replaces="qtcreator-data>=0"
 python_version=3
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
-	makedepends+=" clang llvm"
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
diff --git a/srcpkgs/qtfm/template b/srcpkgs/qtfm/template
index f7d177a9339..fad60da4d10 100644
--- a/srcpkgs/qtfm/template
+++ b/srcpkgs/qtfm/template
@@ -4,6 +4,7 @@ version=6.2.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="hicolor-icon-theme"
 short_desc="Lightweight file manager for Linux desktops based on pure Qt"
@@ -13,7 +14,3 @@ homepage="https://github.com/rodlie/qtfm"
 changelog="https://raw.githubusercontent.com/rodlie/qtfm/master/ChangeLog"
 distfiles="https://github.com/rodlie/qtfm/archive/${version}.tar.gz"
 checksum=58c6af502b606e63f96e8aec96b65ca9125be18ecdd5e4680ccaf50e9c40b064
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
diff --git a/srcpkgs/quiterss/template b/srcpkgs/quiterss/template
index 1072961760f..3c655713acd 100644
--- a/srcpkgs/quiterss/template
+++ b/srcpkgs/quiterss/template
@@ -3,7 +3,7 @@ pkgname=quiterss
 version=0.19.4
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-webkit-devel qt5-multimedia-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="sqlite-devel qt5-webkit-devel qt5-multimedia-devel"
 short_desc="Open-source cross-platform RSS/Atom news feeds reader"
 maintainer="toluschr <toluschr@protonmail.com>"
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index d3b3645dcc9..0e96184000e 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -3,7 +3,7 @@ pkgname=qwt
 version=6.1.4
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-svg-devel"
 short_desc="Qt Widgets for Technical Applications"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
@@ -12,10 +12,6 @@ homepage="http://qwt.sourceforge.net/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel"
-fi
-
 pre_configure() {
 	sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
 		-e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
diff --git a/srcpkgs/qxmledit/template b/srcpkgs/qxmledit/template
index 64dd9adcac2..7b025b26cab 100644
--- a/srcpkgs/qxmledit/template
+++ b/srcpkgs/qxmledit/template
@@ -9,6 +9,7 @@ configure_args="QXMLEDIT_INST_DATA_DIR=/usr/share/qxmledit
  QXMLEDIT_INST_LIB_DIR=/usr/lib
  QXMLEDIT_INST_TRANSLATIONS_DIR=/usr/share/qxmledit/translations
  QXMLEDIT_INST_INCLUDE_DIR=/usr/include/qxmledit"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="glu-devel qt5-devel qt5-declarative-devel qt5-scxml-devel
  qt5-script-devel qt5-svg-devel qt5-xmlpatterns-devel"
 short_desc="Simple XML Editor"
@@ -18,11 +19,6 @@ homepage="https://qxmledit.org/"
 distfiles="https://github.com/lbellonda/qxmledit/archive/${version}.tar.gz"
 checksum=e86443d640b2d2486b8278a200e098425c52607f82908a1b5676c42af057caa8
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-declarative-devel qt5-scxml-devel
-	 qt5-script-devel qt5-svg-devel qt5-xmlpatterns-devel"
-fi
-
 post_install() {
 	vlicense external/qwtplot3d/license.txt
 	vmkdir usr/share/appdata
diff --git a/srcpkgs/radeon-profile-daemon/template b/srcpkgs/radeon-profile-daemon/template
index 63adcb66672..3e69062fdee 100644
--- a/srcpkgs/radeon-profile-daemon/template
+++ b/srcpkgs/radeon-profile-daemon/template
@@ -4,6 +4,7 @@ version=20190603
 revision=1
 build_wrksrc=radeon-profile-daemon
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Daemon for radeon-profile GUI"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -12,10 +13,6 @@ homepage="https://github.com/marazmista/radeon-profile-daemon"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=bb0145c3dcbced094e28fe993d8f7e77defcfa5dcef3146badcd82d9fb627700
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
-
 do_install() {
 	vbin target/radeon-profile-daemon
 	vsv radeon-profile-daemon
diff --git a/srcpkgs/radeon-profile/template b/srcpkgs/radeon-profile/template
index 82621b8d1b9..256cf963bdf 100644
--- a/srcpkgs/radeon-profile/template
+++ b/srcpkgs/radeon-profile/template
@@ -4,6 +4,7 @@ version=20200824
 revision=1
 build_wrksrc=radeon-profile
 build_style=qmake
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-charts-devel libdrm-devel libXrandr-devel"
 short_desc="Application to read current clocks of ATi Radeon cards"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/marazmista/radeon-profile"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=8d378d8ba249f2655783798b8e86ce1eb7a9a1dcd12d29784ba40366583b47af
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-charts-devel"
-fi
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 6f95e893761..870bad191a3 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -5,8 +5,7 @@ revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools
- qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
  libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
  pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index bc5f4ad4ed6..ab7b3a9918d 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -4,6 +4,7 @@ version=3.9.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel kdeclarative-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Simple (yet powerful) Qt5 feed reader"
@@ -13,10 +14,6 @@ homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
 checksum=79ca9cccc6173e3a1f58ff49a5d9896d87e009ecd831619ce4ebe2e4e476d7a4
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel kdeclarative-devel"
-fi
-
 post_install() {
 	# Install rssguard icon manually
 	vinstall resources/graphics/rssguard.png 644 usr/share/pixmaps
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index dab37cf9ed5..27849fb2723 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -4,7 +4,7 @@ version=21.01.29
 revision=1
 build_style=qmake
 configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt-devel mlt-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
  qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
@@ -19,9 +19,6 @@ checksum=2e55e36d95344758f220b081b1f25f90eb3d0131b0a4af9d65871798079ee961
 
 CXXFLAGS="-DHAVE_LOCALE_H=1"
 
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/292589547#L1332
-	https://travis-ci.org/voidlinux/void-packages/jobs/292589548#L1337"
-
 post_configure() {
 	# Hack to  make sure that the build_style does not override the
 	# value of LINK when calling the translations Makefile
diff --git a/srcpkgs/signon-ui/template b/srcpkgs/signon-ui/template
index c5473780089..81209631fe0 100644
--- a/srcpkgs/signon-ui/template
+++ b/srcpkgs/signon-ui/template
@@ -3,7 +3,7 @@ pkgname=signon-ui
 version=0.15
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-webkit-devel qt5-host-tools"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="libaccounts-qt5-devel libnotify-devel libproxy-devel
  qt5-webkit-devel qt5-x11extras-devel signond-devel"
 short_desc="Online Accounts Sign-on UI"
diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template
index 2f1a8117a07..92bea100cf0 100644
--- a/srcpkgs/smtube/template
+++ b/srcpkgs/smtube/template
@@ -8,7 +8,7 @@ make_build_args="
  DATA_PATH=\\\"/usr/share/smtube\\\"
  TRANSLATION_PATH=\\\"/usr/share/smtube/translations\\\"
  DOC_PATH=\\\"/usr/share/doc/smtube\\\""
-hostmakedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Small youtube browser"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index e26d066c062..0dacf7511c7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -26,10 +26,6 @@ checksum="b039dd247af3f0f662ea7915919f3889c97dd5cead7e22198d88a86e386c986a
  d035141496ad41352490464c3fff6492d13fee146edb88afeefc15d07662e89e"
 skip_extraction="server.js stremio.asar"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 post_extract() {
 	rmdir deps/singleapplication
 	mv ../SingleApplication-${_singleapplication_hash} deps/singleapplication
diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index 4b322e37697..bd07f0b84ce 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -3,7 +3,7 @@ pkgname=texmaker
 version=5.0.4
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="poppler-qt5-devel qt5-webkit-devel qt5-script-devel"
 short_desc="Free cross-platform LaTeX editor"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,7 +11,3 @@ license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
 checksum=1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-webkit-devel qt5-script-devel"
-fi
diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 601a7d048be..b70789d6e23 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -4,6 +4,7 @@ version=3.1.1
 revision=1
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/quazip5
  $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel
@@ -24,10 +25,6 @@ desc_option_poppler="build with poppler (=internal pdf preview)"
 
 build_options_default="phonon poppler"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	aarch64*|ppc*)
diff --git a/srcpkgs/textosaurus/template b/srcpkgs/textosaurus/template
index 6a1f255ad53..5223d1f5566 100644
--- a/srcpkgs/textosaurus/template
+++ b/srcpkgs/textosaurus/template
@@ -4,7 +4,7 @@ version=0.9.11
 revision=1
 _scommit=b6e583c42b596523aad85906152eb2bcf068f625
 build_style=qmake
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Simple cross-platform text editor based on Qt and Scintilla"
@@ -17,10 +17,6 @@ distfiles="${homepage}/archive/${version}.tar.gz
 checksum="82093b6c8725d104498ce4a66e4cf5a3aa1f057b34600bd5d67413dce9bff2cf
  fad739e3493dea0f7435114ac936dc255d3b1471bd61c7e7349845ab626b95d9"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 post_extract() {
 	cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla
 }
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index 69e831d6800..e245c3fb195 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -4,7 +4,7 @@ version=1.1.1
 revision=5
 build_wrksrc=touchegg
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libXtst-devel geis-devel qt5-devel qt5-x11extras-devel"
 short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
 checksum=daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
diff --git a/srcpkgs/vapoursynth-editor/template b/srcpkgs/vapoursynth-editor/template
index 731fa409529..19903b77a6e 100644
--- a/srcpkgs/vapoursynth-editor/template
+++ b/srcpkgs/vapoursynth-editor/template
@@ -5,7 +5,7 @@ revision=1
 _bitbucket_hash=8019bb5a8099
 wrksrc="mystery_keeper-${pkgname}-${_bitbucket_hash}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="vapoursynth-devel qt5-devel qt5-websockets-devel"
 depends="vapoursynth"
 short_desc="Cross-platform editor for VapourSynth script"
@@ -15,10 +15,6 @@ homepage="https://bitbucket.org/mystery_keeper/vapoursynth-editor"
 distfiles="${homepage}/get/r${version}.tar.gz"
 checksum=41e09a6c1411536f7a223a16263145b31de4715189cfe2ebe62b4ad69d6ec342
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-websockets-devel"
-fi
-
 pre_configure() {
 	mv pro/pro.pro .
 }
diff --git a/srcpkgs/vokoscreen/template b/srcpkgs/vokoscreen/template
index 5063c45df7e..94e4012dfcc 100644
--- a/srcpkgs/vokoscreen/template
+++ b/srcpkgs/vokoscreen/template
@@ -13,8 +13,4 @@ homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"
 distfiles="https://github.com/vkohaupt/vokoscreen/archive/${version}.tar.gz"
 checksum=7f5d9abfa3b4a1f7ce657838f5169cd80a590be490dacd0ad1751853a38f4245
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
-
 CFLAGS="-fcommon"
diff --git a/srcpkgs/wkhtmltopdf/template b/srcpkgs/wkhtmltopdf/template
index 3aad19995a2..5703f69fc0c 100644
--- a/srcpkgs/wkhtmltopdf/template
+++ b/srcpkgs/wkhtmltopdf/template
@@ -3,7 +3,7 @@ pkgname=wkhtmltopdf
 version=0.12.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 configure_args="INSTALLBASE=/usr"
 makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel"
 depends="qt5-svg"
@@ -14,11 +14,6 @@ homepage="https://wkhtmltopdf.org"
 distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz"
 checksum=adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0
 
-if [ "$CROSS_BUILD" ]; then
-	# make qmake happy
-	hostmakedepends+=" ${makedepends}"
-fi
-
 libwkhtmltopdf_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
diff --git a/srcpkgs/wpa_gui/template b/srcpkgs/wpa_gui/template
index 379b5d2a6aa..6f741912316 100644
--- a/srcpkgs/wpa_gui/template
+++ b/srcpkgs/wpa_gui/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="wpa_supplicant-${version}"
 build_wrksrc="wpa_supplicant/wpa_gui-qt4"
 build_style=qmake
-hostmakedepends="qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="wpa_supplicant desktop-file-utils"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant -- Graphical User Interface"
diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template
index 1b4c9dfd831..5bc0a547464 100644
--- a/srcpkgs/xaos/template
+++ b/srcpkgs/xaos/template
@@ -4,7 +4,7 @@ version=4.2.1
 revision=1
 wrksrc="XaoS-release-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel which"
+hostmakedepends="qt5-qmake qt5-host-tools which"
 makedepends="qt5-devel gsl-devel"
 short_desc="Fast interactive real-time fractal zoomer/morpher"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/ykpers-gui/template b/srcpkgs/ykpers-gui/template
index 309b98b9f8e..43ae33b4301 100644
--- a/srcpkgs/ykpers-gui/template
+++ b/srcpkgs/ykpers-gui/template
@@ -5,7 +5,7 @@ version=3.1.25
 revision=1
 wrksrc="${_realname}-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-devel libusb-compat-devel libyubikey-devel libykpers-devel"
 depends="hicolor-icon-theme"
 short_desc="Yubikey Personalization Tools GUI"
@@ -15,10 +15,6 @@ homepage="https://developers.yubico.com/${_realname}/"
 distfiles="https://developers.yubico.com/${_realname}/Releases/${_realname}-${version}.tar.gz"
 checksum=680b8ba8251c828847ffddd520165ac14927c2c6ee4ae39cfa9022ad7dd9dece
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense COPYING LICENSE
 	vbin build/release/${_realname} ykpers-gui
diff --git a/srcpkgs/zrandr/template b/srcpkgs/zrandr/template
index 27f35145f84..ac972af7e40 100644
--- a/srcpkgs/zrandr/template
+++ b/srcpkgs/zrandr/template
@@ -3,6 +3,7 @@ pkgname=zrandr
 version=0.3.2
 revision=1
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="desktop-file-utils hicolor-icon-theme xrandr"
 short_desc="Simple Qt5 front end for xrandr"
@@ -12,10 +13,6 @@ homepage="https://github.com/fralonra/zrandr"
 distfiles="https://github.com/fralonra/zrandr/archive/v${version}.tar.gz"
 checksum=04ba7dabbec63f3946ee4e1c8970f90a731928017d930c39ad21119775061a51
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
-
 pre_configure() {
 	lrelease -verbose zrandr.pro
 }

From b9b94990649599b06cdf7eb3c9f38627e8520fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 3 Mar 2021 21:42:43 +0700
Subject: [PATCH 3/3] qbittorrent: build-style is gnu-configure

---
 srcpkgs/qbittorrent/template | 66 ++++++------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b3a5b7fb58a..2598ea2d282 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -3,7 +3,10 @@ pkgname=qbittorrent
 version=4.3.3
 revision=2
 create_wrksrc=yes
-build_style=qmake
+build_style=gnu-configure
+build_helper=qmake
+configure_args="--disable-systemd --with-boost=${XBPS_CROSS_BASE}/usr
+ --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
@@ -15,10 +18,6 @@ changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=5966fdceab877fa3fedd9776a5f8ec6ce55308048e1d4a16b819d9b650dbc137
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_extract() {
 	local n=${pkgname}-${version}
 	mkdir -p build-nox build-x11
@@ -27,57 +26,12 @@ do_extract() {
 }
 
 do_configure() {
-	local opts="--prefix=/usr" build opts
-	opts+=" --disable-systemd"
-	opts+=" --with-boost=${XBPS_CROSS_BASE}/usr"
-	opts+=" --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
-	if [ "$CROSS_BUILD" ]; then
-		opts+=" --host=${XBPS_CROSS_TRIPLET}"
-	fi
-	for f in build-x11:--enable-gui:--disable-webui \
-		build-nox:--disable-gui:--enable-webui; do
-		build=${f%%:*}
-		f=${f#*:}
-		opts+=" ${f/:/ }"
-		cd ${wrksrc}/${build}
-		./bootstrap.sh
-		./configure ${opts}
-		echo "[Paths]" > qt.conf
-		echo "Sysroot=${XBPS_CROSS_BASE}" >> qt.conf
-		echo "Prefix=${XBPS_CROSS_BASE}/usr" >> qt.conf
-		echo "ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5" >> qt.conf
-		echo "Data=${XBPS_CROSS_BASE}/usr/share/qt5" >> qt.conf
-		echo "Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5" >> qt.conf
-		echo "Headers=${XBPS_CROSS_BASE}/usr/include/qt5" >> qt.conf
-		echo "Libraries=${XBPS_CROSS_BASE}/usr/lib" >> qt.conf
-		echo "LibraryExecutables=/usr/lib/qt5/libexec" >> qt.conf
-		echo "Binaries=/usr/lib/qt5/bin" >> qt.conf
-		echo "Tests=${XBPS_CROSS_BASE}/usr/tests" >> qt.conf
-		echo "Plugins=/usr/lib/qt5/plugins" >> qt.conf
-		echo "Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports" >> qt.conf
-		echo "Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml" >> qt.conf
-		echo "Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations" >> qt.conf
-		echo "Settings=${XBPS_CROSS_BASE}/etc/xdg" >> qt.conf
-		echo "Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples" >> qt.conf
-		echo "HostPrefix=/usr" >> qt.conf
-		echo "HostData=/usr/lib/qt5" >> qt.conf
-		echo "HostBinaries=/usr/lib/qt5/bin" >> qt.conf
-		echo "HostLibraries=/usr/lib" >> qt.conf
-		echo "Spec=linux-g++" >> qt.conf
-		echo "TargetSpec=linux-g++" >> qt.conf
-		qmake-qt5 \
-			PREFIX=/usr \
-			LIB=/usr/lib \
-			QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
-			QMAKE_CFLAGS="${CFLAGS}" \
-			QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LFLAGS="${LDFLAGS}" \
-			-qtconf qt.conf
-		if [ "${XBPS_CROSS_BASE}" ]; then
-			vsed -i src/Makefile \
-				-e "s; /usr/lib/libQt5; ${XBPS_CROSS_BASE}/usr/lib/libQt5;g"
-		fi
-	done
+	cd ${wrksrc}/build-x11
+	./bootstrap.sh
+	QT_QMAKE=${XBPS_WRAPPERDIR} ./configure ${configure_args} --enable-gui --disable-webui
+	cd ${wrksrc}/build-nox
+	./bootstrap.sh
+	QT_QMAKE=${XBPS_WRAPPERDIR} ./configure ${configure_args} --disable-gui --enable-webui
 }
 
 do_build() {