[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     07d2091e4df014f600972c225d8aebc149657855
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 14:33:51 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 14:34:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=07d2091e

dev-qt/qtbase: remove disable androiddeployqt from src_prepare()

There's a switch for it now, and this currently breaks configure.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.9999.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c0867b42..d6907aa7 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -103,14 +103,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-       qt6-build_src_prepare
-
-       # TODO: fails without QtGui
-       sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" 
\
-               -i src/tools/CMakeLists.txt || die
-}
-
 src_configure() {
        local mycmakeargs=(
                -DINSTALL_BINDIR=${QT6_BINDIR}
@@ -126,6 +118,7 @@ src_configure() {
                -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
                -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
                -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+               -DQT_FEATURE_androiddeployqt=OFF
                -DQT_FEATURE_zstd=ON
                $(qt_feature concurrent)
                $(qt_feature dbus)