[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtspeech/

[Ionen Wolkens]

commit:     944df3924e64523fb0a736f67a635a02ca22d0cc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 12:46:22 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944df392

dev-qt/qtspeech: make qml optional in 6.6+

No longer a hard dependency.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtspeech/metadata.xml             | 1 +
 dev-qt/qtspeech/qtspeech-6.6.9999.ebuild | 5 +++--
 dev-qt/qtspeech/qtspeech-6.9999.ebuild   | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml
index fa0f657a4256..b51b2479697c 100644
--- a/dev-qt/qtspeech/metadata.xml
+++ b/dev-qt/qtspeech/metadata.xml
@@ -12,6 +12,7 @@
        </upstream>
        <use>
                <flag name="flite">Enable text-to-speech synthesizer plugin 
using <pkg>app-accessibility/flite</pkg> engine</flag>
+               <flag name="qml">Build QML/QtQuick bindings and imports</flag>
                <flag name="speechd">Enable text-to-speech synthesizer plugin 
using <pkg>app-accessibility/speech-dispatcher</pkg> engine</flag>
        </use>
        <slots>

diff --git a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild 
b/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild
index 94803ab4eff3..e242ec0db59d 100644
--- a/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.6.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64"
 fi
 
-IUSE="flite +speechd"
+IUSE="flite qml +speechd"
 # can build with neither, but then it is just mock tts and may be confusing
 REQUIRED_USE="|| ( flite speechd )"
 
@@ -25,17 +25,18 @@ RESTRICT="test"
 
 RDEPEND="
        ~dev-qt/qtbase-${PV}:6
-       ~dev-qt/qtdeclarative-${PV}:6
        flite? (
                app-accessibility/flite
                ~dev-qt/qtmultimedia-${PV}:6
        )
+       qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
        speechd? ( app-accessibility/speech-dispatcher )
 "
 DEPEND="${RDEPEND}"
 
 src_configure() {
        local mycmakeargs=(
+               $(cmake_use_find_package qml Qt6Qml)
                $(qt_feature flite)
                $(qt_feature speechd)
 

diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild 
b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
index 94803ab4eff3..e242ec0db59d 100644
--- a/dev-qt/qtspeech/qtspeech-6.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64"
 fi
 
-IUSE="flite +speechd"
+IUSE="flite qml +speechd"
 # can build with neither, but then it is just mock tts and may be confusing
 REQUIRED_USE="|| ( flite speechd )"
 
@@ -25,17 +25,18 @@ RESTRICT="test"
 
 RDEPEND="
        ~dev-qt/qtbase-${PV}:6
-       ~dev-qt/qtdeclarative-${PV}:6
        flite? (
                app-accessibility/flite
                ~dev-qt/qtmultimedia-${PV}:6
        )
+       qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
        speechd? ( app-accessibility/speech-dispatcher )
 "
 DEPEND="${RDEPEND}"
 
 src_configure() {
        local mycmakeargs=(
+               $(cmake_use_find_package qml Qt6Qml)
                $(qt_feature flite)
                $(qt_feature speechd)