gentoo resync : 06.04.2022

7 files changed, 24 insertions, 187 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 760d6ca0833c..1852164a7060 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 f2daba358c9e..75afad68b3e2 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,8 +1,7 @@
 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
-EBUILD espeak-ng-1.50-r1.ebuild 1898 BLAKE2B a384af7522e1d9d48d91544986bb93f90bdafb63982ae6d10de94aa45891e921ad61d51f75397d9b31e475b180d1cc4353cd312e5495f95a3aedb9a7031ab20d SHA512 bec76f91cb05ac7395b8af13c26dbc3eae16146488e74c0191bc0b664666a67f25a89cf467f5f188d4718e057e53f10ec791be97e7628530db9d62cfde097327
-EBUILD espeak-ng-1.50-r2.ebuild 1992 BLAKE2B d72d4eedf8462cabdc1d8fb457ac63531c30e4351a73e314bce6ce423806b0d0a81b553cee06e1166cf7e61ecde4d8936be9532ea357e3e0496fe2000c31f347 SHA512 17d2b986304f39ed6463df5c30e404ee5640c2db3c561f32808f739f2c0b45ac934eca30d3089c6c426bf9c7fd65be1912e4343cb1718bc37ad1d62ef88ff5cb
-EBUILD espeak-ng-1.50-r3.ebuild 2006 BLAKE2B c203ea4c7198fc339d237ff67c0268d33e214ad535027e17336c5ce83e415e2f641a6700a3a92342405802e1d8e05a1a289e4cff89c6445f034686cb7c1ed179 SHA512 f275d8ab856f05c6552ad25d1697bdeee3a8cc6e742c55cd43d1f11c1d6a2336b9badc35bcb0abe9d7a54a72762e5a032452791de0584eb64361f43957d49865
-EBUILD espeak-ng-1.50.ebuild 1848 BLAKE2B c853ba207b5e6e119dd070486482eb136989866eae777ffe404f3780ea6c5484bdf6b16e763fba52602389f61620010d55b93be3ef4d2aad47071aa449268feb SHA512 3c4dbf0255ad975c69e373e20497b3eeaa9946931ab92f97b0b455a76a0d9a57c75717b109902b07471ee9cf342758a30d4556c5ea4087196831a991d1dfd3b8
-EBUILD espeak-ng-9999.ebuild 1671 BLAKE2B 78b9b4df33c646806087bf397236adfebe88ab586fff70fbff275b47f92ad7299d9cd23331deb776073eab23b0e41fc4a80bf9bffe2dc3debc2300bc081a76bc SHA512 69dbb52ceeac40e0a55696a3680b46c69e760c24f629cd00453ed7d342bba63bc9ddfad3e57a73473e7824c48e6236022adb32a05a195f484370fd8800c9c50d
+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 45347ced4af7cee43b8e095f59f9be1107af9d89706158320bd406969145ad942720ce13cc5bf7e7d750904784ab2d15eec39ff031c891fad4b4e42e10d44436 SHA512 7269f0158153e71ba55f81ca2fc8b4b057851cee481bf73536214173c5fbd9a52598cbf2dec28d0461eec1c87a416479feb602536534ee66fa8e872a7eec4423
+EBUILD espeak-ng-9999.ebuild 1731 BLAKE2B 0bc66d542234ffd5aea3f7353c12623273d4f8223e209c498e7241c0fc9cdf9c76bd09e94479a0b97306f260c7b8b049acea71d524d4bd0f803752ed79a9a08a SHA512 8782b8dad5ed22eb9342a105db1690112e97578d38dc359e32f195adecfe7b5347de5902c73078c1b824404a9fc1c03f26c22198af00003d5ee4372bde68b3d7
 MISC metadata.xml 959 BLAKE2B cf593df0a2ac774e7ba15f77fc8b9cda2907d9d721c61fa602df8653f4019ed46fdadc39353c7ca4f1dbc46245ff28c922fe2844d49c5346a1b7fa7f02005c3b SHA512 4dce4bcbaf2dbd3bbfd0f6503884dc47690d648ce04c489688818aaef15e555fb76e33a49a484e8197631b2885297541f4ef80d0074d44d3f44aeb923a3ea698
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild
deleted file mode 100644
index 5e780ba05fea..000000000000
--- a/app-accessibility/espeak-ng/espeak-ng-1.50-r2.ebuild
+++ /dev/null
@@ -1,85 +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="~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() {
-	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/vimfiles install -j1
-	rm "${ED}"/usr/lib*/*.la || die
-}
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
index 016fdf386418..c3240b2d2dd3 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r3.ebuild
@@ -51,6 +51,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/836646
+	export PULSE_SERVER=""
+
 	local econf_args
 	econf_args=(
 		$(use_with async)
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
deleted file mode 100644
index c9289793f7fa..000000000000
--- a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
+++ /dev/null
@@ -1,82 +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"
-
-LICENSE="GPL-3+ Turkowski unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 )
-"
-
-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() {
-	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/vimfiles install -j1
-	rm "${ED}"/usr/lib*/*.la || die
-}
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
index 9b3280273ec1..a9ea01fea59e 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
@@ -9,9 +9,9 @@ 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"
 
-LICENSE="GPL-3+ Turkowski unicode"
+LICENSE="GPL-3+ unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
 COMMON_DEPEND="
@@ -40,24 +40,25 @@ src_prepare() {
 		-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() {
 	local econf_args
+
+	# https://bugs.gentoo.org/836646
+	export PULSE_SERVER=""
+
 	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 l10n_zh extdict-cmn)
+		$(use_with l10n_zh extdict-yue)
 		$(use_with mbrola)
 		$(use_with sound pcaudiolib)
 		--without-libfuzzer
+		--without-speechplayer
 		--without-sonic
 		--disable-rpath
 		--disable-static
@@ -66,17 +67,14 @@ src_configure() {
 }
 
 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
+	emake
 }
 
 src_test() {
-	emake check -j1
+	emake check
 }
 
 src_install() {
-	emake DESTDIR="${D}" VIMDIR=/usr/share/vimfiles install -j1
-	rm "${ED}"/usr/lib*/*.la || die
+	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-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index d55d1a306616..4dc30d2b5348 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
@@ -51,6 +51,10 @@ src_prepare() {
 
 src_configure() {
 	local econf_args
+
+	# https://bugs.gentoo.org/836646
+	export PULSE_SERVER=""
+
 	econf_args=(
 		$(use_with async)
 		$(use_with klatt)