9 files changed, 223 insertions, 43 deletions
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 91e6994d4162..fababf233a56 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,2 +1,4 @@
-DIST qtspeech-everywhere-src-5.14.1.tar.xz 101072 BLAKE2B 53aaec0f74f516ddffb154401dfcad334e96f5ab7935e4aeb69d2ad20012c3006ef355b7733023ddd871fdb866aeabbbac809c03dd7d304cc303118e34e482ae SHA512 8249e374735a4a3de6b8795a5c09c9bc285eff8fc7e98e0a2446eb6b7306da1decd657bf92d5b8d195b042e7459097ce9129c8f6e4a23326f698c6e7010c46a1
-DIST qtspeech-everywhere-src-5.14.2.tar.xz 101100 BLAKE2B d37d08a2f7e6d40c7f6e68f9c4e301cdf9762ad9088a3fa0f9568af7211a2842b035e8f5eb001538aaa84385104d112cd6e550e32119099acee922f2dd13db36 SHA512 d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f
+DIST qtspeech-5.15.13-gentoo-kde-1.tar.xz 1048 BLAKE2B 93b16166dd8fd83eb9d7ce84cd3fff2dd330cc4060327e107b12a084aa47b7dc2d237bbf0852d207d2b4fbe9a5688d0236ebc5e7c1e6a42da84fd92fbd912050 SHA512 8eb6b865663b9fb837e88f859c1f407c4fab5d0976630e29bb0c3f2e2d01f225f3a614cba6c20495c56429d37427c75e314194d0c74c69296ab3e5df128290c6
+DIST qtspeech-everywhere-opensource-src-5.15.13.tar.xz 104612 BLAKE2B 3c35098f0d4f4b4f804808f3d11abc0c0d189e3883cb1d15ea9b350948e061125299df1207ad44ed7af207c417980b0360ab6b44733efbbe7e5bdac6fe2402b5 SHA512 43b97ddc333d1c4a9715b1c306ced0506eb8faf69f1d22500b74e509d33b5a5cb9d0c166b9211a32a78eaba57925195d8ba0c39c8ae6a15551f841426294c75f
+DIST qtspeech-everywhere-src-6.7.0.tar.xz 261732 BLAKE2B a7e99c3c9efdaa7aa5d44537b9aaaed87af0607daa6b6ab21d602594081f5bcc5ead4da9eebbee15a7cc735a36e80cfa312452f2cdfa5ce4136bd0c06797eba2 SHA512 10d086633da8cc478619023baa4d2495bb394aa30e7ba7141b0e698ade5a4a723f5643a5df64e9920b90251e89722598b7d5b720d7b8d3a04449e94fd5984f82
+DIST qtspeech-everywhere-src-6.7.1.tar.xz 261772 BLAKE2B a776930705b7ad7a127997d35046c0101a8c40111b5cec50779944b2db9aaff8ddce3d0d7a25152d4a13360a5c30c2b9993fe17ff931180ecb32845de90be7b3 SHA512 b97fc36601c77e9c594077e15be658f6307a2d89cc1c23594143827eb92b72182a671e418e3f83d3e072465068546d626a4cfc09ee03738f8c5a244984587b67
diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml
index 32568f62fb8e..b51b2479697c 100644
--- a/dev-qt/qtspeech/metadata.xml
+++ b/dev-qt/qtspeech/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
@@ -8,7 +8,13 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtspeech</remote-id>
 	</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>
 		<subslots>
 			Must only be used by packages that are known to use private parts of the Qt API.
diff --git a/dev-qt/qtspeech/qtspeech-5.14.1.ebuild b/dev-qt/qtspeech/qtspeech-5.14.1.ebuild
deleted file mode 100644
index ce5caf530389..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.14.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild b/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
deleted file mode 100644
index ce5caf530389..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtspeech/qtspeech-5.15.13.ebuild b/dev-qt/qtspeech/qtspeech-5.15.13.ebuild
new file mode 100644
index 000000000000..07a269a79b0d
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.15.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=1
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+IUSE="alsa flite"
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	=dev-qt/qtcore-${QT5_PV}*
+	flite? (
+		>=app-accessibility/flite-2[alsa?]
+		=dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
+		alsa? ( media-libs/alsa-lib )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_config flite flite \
+		src/plugins/tts/tts.pro
+
+	qt_use_disable_config alsa flite_alsa \
+		src/plugins/tts/flite/flite.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/qtspeech-6.7.0.ebuild b/dev-qt/qtspeech/qtspeech-6.7.0.ebuild
new file mode 100644
index 000000000000..4a4f7916dee2
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-6.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests are kind of flaky, sometimes hang, and also fail with clang
+# (not that it's unusable with clang) -- may be worth revisiting
+# eventually given qtspeech is still somewhat new (added in 6.4.0)
+QT6_RESTRICT_TESTS=1
+
+inherit qt6-build
+
+DESCRIPTION="Text-to-speech library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86"
+fi
+
+IUSE="flite qml +speechd"
+# can build with neither, but then it is just mock tts and may be confusing
+REQUIRED_USE="|| ( flite speechd )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtmultimedia-${PV}:6
+	flite? ( app-accessibility/flite )
+	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)
+
+		# flite_alsa was likely to work around old issues in flite, it does
+		# nothing but add -lasound (no code change, and is unneeded)
+		-DQT_FEATURE_flite_alsa=OFF
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
new file mode 100644
index 000000000000..c012be997560
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests are kind of flaky, sometimes hang, and also fail with clang
+# (not that it's unusable with clang) -- may be worth revisiting
+# eventually given qtspeech is still somewhat new (added in 6.4.0)
+QT6_RESTRICT_TESTS=1
+
+inherit qt6-build
+
+DESCRIPTION="Text-to-speech library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+IUSE="flite qml +speechd"
+# can build with neither, but then it is just mock tts and may be confusing
+REQUIRED_USE="|| ( flite speechd )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtmultimedia-${PV}:6
+	flite? ( app-accessibility/flite )
+	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)
+
+		# flite_alsa was likely to work around old issues in flite, it does
+		# nothing but add -lasound (no code change, and is unneeded)
+		-DQT_FEATURE_flite_alsa=OFF
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
new file mode 100644
index 000000000000..c012be997560
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests are kind of flaky, sometimes hang, and also fail with clang
+# (not that it's unusable with clang) -- may be worth revisiting
+# eventually given qtspeech is still somewhat new (added in 6.4.0)
+QT6_RESTRICT_TESTS=1
+
+inherit qt6-build
+
+DESCRIPTION="Text-to-speech library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+IUSE="flite qml +speechd"
+# can build with neither, but then it is just mock tts and may be confusing
+REQUIRED_USE="|| ( flite speechd )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtmultimedia-${PV}:6
+	flite? ( app-accessibility/flite )
+	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)
+
+		# flite_alsa was likely to work around old issues in flite, it does
+		# nothing but add -lasound (no code change, and is unneeded)
+		-DQT_FEATURE_flite_alsa=OFF
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
new file mode 100644
index 000000000000..c012be997560
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests are kind of flaky, sometimes hang, and also fail with clang
+# (not that it's unusable with clang) -- may be worth revisiting
+# eventually given qtspeech is still somewhat new (added in 6.4.0)
+QT6_RESTRICT_TESTS=1
+
+inherit qt6-build
+
+DESCRIPTION="Text-to-speech library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+IUSE="flite qml +speechd"
+# can build with neither, but then it is just mock tts and may be confusing
+REQUIRED_USE="|| ( flite speechd )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6
+	~dev-qt/qtmultimedia-${PV}:6
+	flite? ( app-accessibility/flite )
+	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)
+
+		# flite_alsa was likely to work around old issues in flite, it does
+		# nothing but add -lasound (no code change, and is unneeded)
+		-DQT_FEATURE_flite_alsa=OFF
+	)
+
+	qt6-build_src_configure
+}