5 files changed, 15 insertions, 109 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index df4486d752a5..71b7005ee404 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest
index d13d09eb1612..8d1d1ec8281d 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,7 +1,4 @@
-DIST espeak-ng-1.50-ieee80.patch.xz 8128 BLAKE2B f9ae3b64d52f18b0dd4bb1ff1832d89fc22c319bccf3f7ada61628569857fded15a426703d035737b829fc8580707876ad09527380890f73df919740b40aa046 SHA512 4183fd13c902bdda27ac7e86fb4e4573ce85ca015aaea757aed27a869e4067a58c99b8f4d3e289710d1359d4fa289c2a4e6d5803845cd454c3dc59f79f4e2e80
-DIST espeak-ng-1.50.tar.gz 13665536 BLAKE2B c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f SHA512 297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c
 DIST espeak-ng-1.51.tar.gz 14260788 BLAKE2B 230e8860247bdd44a26ba7281fadb7486e7fff90de229c71fb883693badfc141d5ad883769d6cead150f43560a5c47152cada4fcb5a28c0b0384dacaad2c9d09 SHA512 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2
-EBUILD espeak-ng-1.50-r3.ebuild 2065 BLAKE2B c03a3740d332a0604ab6e62088f4768e1ac9bc82b8d9eca15a6b5a68e8638b8682e06be91893887e0831240bf767d1cadae4c4ac1241bacdb68b2d9bc9aaad2a SHA512 590dae6e6e7cc761bd59660a4de35a334e19bcb483705351c17bc5f20c38a0d39d859b9c47f511417c9b99b6828eb7748d82994f495870217038a294d9a907f7
-EBUILD espeak-ng-1.51.ebuild 1678 BLAKE2B 55a6f27bba7291765e3da13d67f6e530d6e36d9ea028159bf7c41d42143c0750be389c839ca261fe97e808d53b4870b410a17eeb6f60e69e1c4d68abc8213d0e SHA512 9d26d22ee5325b39c09abd07a77d83148139efc3c76a84cc0b57aaec58879d354e212692758c9c10219919c816a323d37b804c631668a040f39bee865a9f814b
-EBUILD espeak-ng-9999.ebuild 1731 BLAKE2B 0bc66d542234ffd5aea3f7353c12623273d4f8223e209c498e7241c0fc9cdf9c76bd09e94479a0b97306f260c7b8b049acea71d524d4bd0f803752ed79a9a08a SHA512 8782b8dad5ed22eb9342a105db1690112e97578d38dc359e32f195adecfe7b5347de5902c73078c1b824404a9fc1c03f26c22198af00003d5ee4372bde68b3d7
+EBUILD espeak-ng-1.51.ebuild 1617 BLAKE2B 227777cf3fb67faa231b9d7dde4fd034cc64e41254cb23343a100b3747c0c52d7eaa384bd6b2ade3943c9a81be8713de72644a1b1780ed8ce1c794114e2deece SHA512 3c28920c3b6ffc3f60acc2ffe4203f8adf5c3d97b8b6a0dad52129a38d3708ec270859c16f4a8e27ae86aa00529bb7fe7ca36c9baf399da198289beac814341f
+EBUILD espeak-ng-9999.ebuild 1654 BLAKE2B 4d4378683e00fa5d609d4b4509f6bcccaada42437d2b8e6737ad4c1935b6c6ce860f0ab3a3de6fd72e5601a663347ba00d85de933a3f1af8133a559259e94ac3 SHA512 08d08017df25ddd718f72c97248f7048a4ce13324b4e0c2f1b653a40c2241dd1955bbf1bfcbc18bf6aa6f7dba739eafa3faa67ade3ab9e1b0b49c87182b39f93
 MISC metadata.xml 973 BLAKE2B 4ed8ddc80cf8e8d9e0af832fcb018f998e1a9419e471948203f6980325d75e7bf079c6917091c5f6bd0858daaefb003a87859cca4d6f578de2200b91dd1f2514 SHA512 e47108d2113fda4b5bed680deb0682cbdf07b4a84075cbf7074b88effa60533fc0652d9cc1b5b68ce3258581b956243054b8f8a870c8ca93af483606bff705c2
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
deleted file mode 100644
index c3240b2d2dd3..000000000000
--- a/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Software speech synthesizer for English, and some other languages"
-HOMEPAGE="https://github.com/espeak-ng/espeak-ng"
-SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-ieee80.patch.xz"
-
-LICENSE="GPL-3+ unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
-
-COMMON_DEPEND="
-	!app-accessibility/espeak
-	mbrola? ( app-accessibility/mbrola )
-	sound? ( media-libs/pcaudiolib )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sound? ( media-sound/sox )
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? ( || ( app-text/ronn-ng app-text/ronn ) )
-"
-
-PATCHES=( "${WORKDIR}"/${P}-ieee80.patch )
-
-DOCS=( CHANGELOG.md README.md docs )
-
-src_prepare() {
-	default
-
-	# disable failing tests
-	rm tests/{language-pronunciation,translate}.test || die
-	sed -i \
-		-e "/language-pronunciation.check/d" \
-		-e "/translate.check/d" \
-		Makefile.am || die
-
-	# https://github.com/espeak-ng/espeak-ng/issues/699
-	# fixed in master
-	sed -i -e "s/int samplerate;/static int samplerate;/" src/espeak-ng.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/836646
-	export PULSE_SERVER=""
-
-	local econf_args
-	econf_args=(
-		$(use_with async)
-		$(use_with klatt)
-		$(use_with l10n_ru extdict-ru)
-		$(use_with l10n_zh extdict-zh)
-		$(use_with l10n_zh extdict-zhy)
-		$(use_with mbrola)
-		$(use_with sound pcaudiolib)
-		--without-libfuzzer
-		--without-sonic
-		--disable-rpath
-		--disable-static
-	)
-	econf "${econf_args[@]}"
-}
-
-src_compile() {
-	# see docs/building.md
-	# The -j1s from compile/test/install may be droppable in next release
-	# (after 1.50). Several bugs have been fixed upstream in git.
-	emake -j1
-}
-
-src_test() {
-	emake check -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" VIMDIR=/usr/share/vim/vimfiles install -j1
-	find "${ED}" -name '*.la' -delete  || die
-}
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
index b1bb63eb8365..19d3e39695fa 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,18 +14,17 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
-COMMON_DEPEND="
-	!app-accessibility/espeak
+DEPEND="
 	mbrola? ( app-accessibility/mbrola )
 	sound? ( media-libs/pcaudiolib )
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	!app-accessibility/espeak
 	sound? ( media-sound/sox )
 "
 BDEPEND="
 	virtual/pkgconfig
-	man? ( || ( app-text/ronn-ng app-text/ronn ) )
+	man? ( app-text/ronn-ng )
 "
 
 DOCS=( CHANGELOG.md README.md docs )
diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index 4dc30d2b5348..791939bee5a1 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Software speech synthesizer for English, and some other languages"
 HOMEPAGE="https://github.com/espeak-ng/espeak-ng"
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/espeak-ng/espeak-ng.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3+ unicode"
 SLOT="0"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
-COMMON_DEPEND="
-	!app-accessibility/espeak
+DEPEND="
 	mbrola? ( app-accessibility/mbrola )
 	sound? ( media-libs/pcaudiolib )
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	!app-accessibility/espeak
 	sound? ( media-sound/sox )
 "
 BDEPEND="
 	virtual/pkgconfig
-	man? ( || ( app-text/ronn-ng app-text/ronn ) )
+	man? ( app-text/ronn-ng )
 "
 
 DOCS=( CHANGELOG.md README.md docs )
@@ -66,7 +65,6 @@ src_configure() {
 		--without-libfuzzer
 		--without-sonic
 		--disable-rpath
-		--disable-static
 	)
 	econf "${econf_args[@]}"
 }