From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7BFA158089 for ; Wed, 13 Sep 2023 16:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 820252BC01D; Wed, 13 Sep 2023 16:42:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 669132BC01D for ; Wed, 13 Sep 2023 16:42:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64FAF335CEA for ; Wed, 13 Sep 2023 16:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8C4611A7 for ; Wed, 13 Sep 2023 16:42:03 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694623218.944df3924e64523fb0a736f67a635a02ca22d0cc.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtspeech/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtspeech/metadata.xml dev-qt/qtspeech/qtspeech-6.6.9999.ebuild dev-qt/qtspeech/qtspeech-6.9999.ebuild X-VCS-Directories: dev-qt/qtspeech/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 944df3924e64523fb0a736f67a635a02ca22d0cc X-VCS-Branch: master Date: Wed, 13 Sep 2023 16:42:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: faa071f1-295a-4491-aa4f-390b13891e5c X-Archives-Hash: a0fe968c5b68089b60e4c099e53f2cff commit: 944df3924e64523fb0a736f67a635a02ca22d0cc Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 13 12:46:22 2023 +0000 Commit: Ionen Wolkens gentoo 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 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 @@ Enable text-to-speech synthesizer plugin using app-accessibility/flite engine + Build QML/QtQuick bindings and imports Enable text-to-speech synthesizer plugin using app-accessibility/speech-dispatcher engine 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)