From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1516298-garchives=archives.gentoo.org@lists.gentoo.org>
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 ECAD315ACFC
	for <garchives@archives.gentoo.org>; Sat,  6 May 2023 14:18:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3B60FE0843;
	Sat,  6 May 2023 14:18:15 +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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 0FB44E0843
	for <gentoo-commits@lists.gentoo.org>; Sat,  6 May 2023 14:18:15 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 01B203412A4
	for <gentoo-commits@lists.gentoo.org>; Sat,  6 May 2023 14:18:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B0888AC
	for <gentoo-commits@lists.gentoo.org>; Sat,  6 May 2023 14:18:12 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1683382626.66e2bdfde3832e2a163613bba148ebdb6bae472d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-dispatcher/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-accessibility/speech-dispatcher/metadata.xml app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r1.ebuild app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
X-VCS-Directories: app-accessibility/speech-dispatcher/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 66e2bdfde3832e2a163613bba148ebdb6bae472d
X-VCS-Branch: master
Date: Sat,  6 May 2023 14:18:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a48af48e-1049-4db2-8633-c945dbe42fd5
X-Archives-Hash: 8b2b14107da7c9e6cbd80508cd65d99e

commit:     66e2bdfde3832e2a163613bba148ebdb6bae472d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 13:56:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 14:17:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e2bdfd

app-accessibility/speech-dispatcher: make USE=espeak enable app-accessibility/espeak-ng instead

'espeak' is the standard USE flag for espeak so having USE=espeak mean
app-accessibility/espeak (which is deprecated and can't be installed a lot of
the time because other packages rightly now hard-depend on app-accessibility/espeak-ng)
leads to confusing/poor UX.

Finally drop app-accessibility/espeak support entirely in favour of app-accessibility/espeak-ng
and make USE=espeak enable espeak-ng.

Bug: https://bugs.gentoo.org/877221
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-accessibility/speech-dispatcher/metadata.xml              |  3 +--
 ...tcher-0.11.4.ebuild => speech-dispatcher-0.11.4-r1.ebuild} | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 4df386ee0a85..506de2e0ba7d 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -13,8 +13,7 @@
     <name>Gentoo Sound project</name>
   </maintainer>
   <use>
-    <flag name="espeak">Adds support for espeak speech engine</flag>
-    <flag name="espeak-ng">Adds support for espeak-ng speech engine</flag>
+    <flag name="espeak">Adds support for espeak-ng speech engine</flag>
     <flag name="flite">Adds support for flite speech engine</flag>
   </use>
   <upstream>

diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r1.ebuild
similarity index 92%
rename from app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
rename to app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r1.ebuild
index 95fa8f646009..1b0b5acf3017 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
+IUSE="alsa ao +espeak flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -24,8 +24,7 @@ DEPEND="python? ( ${PYTHON_DEPS} )
 	>=media-libs/libsndfile-1.0.2
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
-	espeak? ( app-accessibility/espeak )
-	espeak-ng? ( app-accessibility/espeak-ng )
+	espeak? ( app-accessibility/espeak-ng )
 	flite? ( app-accessibility/flite )
 	nas? ( media-libs/nas )
 	pulseaudio? ( media-sound/pulseaudio )"
@@ -59,10 +58,10 @@ src_configure() {
 		--with-kali=no
 		--with-pico=no
 		--with-voxin=no
+		--with-espeak=no
 		$(use_with alsa)
 		$(use_with ao libao)
-		$(use_with espeak)
-		$(use_with espeak-ng)
+		$(use_with espeak espeak-ng)
 		$(use_with flite)
 		$(use_with nas)
 		$(use_with pulseaudio pulse)
@@ -109,7 +108,7 @@ src_install() {
 
 pkg_postinst() {
 	local editconfig="n"
-	if ! use espeak-ng; then
+	if ! use espeak; then
 		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
 		ewarn "default speech synthesizer."
 		ewarn