gentoo auto-resync : 09:03:2023 - 06:01:36

3 files changed, 98 insertions, 3 deletions

diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 091d3f0b3344..7b26f53342ee 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,4 +1,5 @@
 AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68e0420034dd9f48d508e9f250bded341bcaa223ae12edd202d6185c9ac14cb00f9ce43c4c805e473dafb5d06185255646 SHA512 f2eb669767c9db9c5c5a8836491d8174bfc13b53b7de575a4dfa34bcdee428fce6d3d65829a523bd96b297015f7fa5815e93f119e91bfc7ae21cff7c274961a7
+AUX flite-2.2-backport-pr30.patch 3410 BLAKE2B 931a99eebd5deae787db3745366ca0763f6927cd5fe1d8ff7051c5cf6c88dfe8b6abee777030d18e09864ece3f18c51c60a3fa9754f2520924f7f72bf6adda2c SHA512 9eefd2f714c14514821b99c1b1b6214652cefb02539108a0df475f99078294d251bbea87451d0931a3d47a6c29eb65e6ba80c90cf81bd1b20aaf2d964a64ab94
 DIST cmu_indic_ben_rm.flitevox 8868578 BLAKE2B 2c916a142809999ed69a0cc6bf94ee11380f5a6d5362f347fac5c83ddd25861b7b42d2c4071c1646a26cb5bfef86552ed51d0f708b998c7e3d02fc2815df9445 SHA512 26b6bb62cd00a2c2f51abd04fc8917a2b44472abf99b09b156218fa90499056c96652a984ee9fac4820db513cd2fdba396c1ceb5d26a67e312505b73d1d2b3d1
 DIST cmu_indic_guj_ad.flitevox 11368818 BLAKE2B 972e01ab3e06d830435645eadc34bcefde9c3fdd4c302271847e2f66d5e179c88456ce80164ee1a8e2145b123af634a70929e6d9340e59189ea7e03e405c1a3e SHA512 e309cabdc2f8bd049c7b43e48a55898d1adeefbfedf2dc28785c57d9606030fd9c00769f88955d514e537f5ecdac49fd4297fb2cde5a575f2927a98b38b92829
 DIST cmu_indic_guj_dp.flitevox 10235186 BLAKE2B e609657306b1f8a99850b9d69ee6ad7d037f60537a7b5e63c8e9962001cf0c4b87771574f29570f8a58c7684d8b7293e54aba35e931c54c5a825ad59b8c6d595 SHA512 8ad73d24ebf6026daae701549b783441c522bbb0e2db958b139553446a8b488f068dc14c6136e3e98f564f27a4a62b086aa45d8dfb3cadd440d08db9e9faef3b
@@ -31,5 +32,5 @@ DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 532ce8a72455a3d15728b799b8d9c15fcc7bc06
 DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f SHA512 f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44
 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41
 DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
-EBUILD flite-2.2.ebuild 4138 BLAKE2B 07ac657e28414e0310d3e9b6ff1503ba217d132fe14691f05f832849427ddf0582cd335940a2cba02290923e70449f7b302a0374a6b6253d77bc9e806022d267 SHA512 bbce757cac2644cd872946bb41f4a59bb80d456e32b5d35473bfad47cdba9412e764abf6e2ba15d5b0082d2e88252db59a075f07c679dc13a42baa63e052bf65
+EBUILD flite-2.2.ebuild 4245 BLAKE2B 24e89208fd9e429b128ce1729a5e8a3c63e0fa90abc0d7d09d134e294f19e976eac81bbaff6e13a2dbf15ebe9af47b9b8bdd17d433e22f269c5c719a6dfc7e32 SHA512 d51d752c94fc4c94f5f201c68c4b79fd4ee0229e5c01094cf3dc0a508f385549198f5b21f1547151e57a2a0c95fe764c37b5e235b5ead2ef9f06882c31957996
 MISC metadata.xml 517 BLAKE2B e91b1a0a5e78284d318a97b13637c13666520a280afa818bb7bacabd73d0f8406a6da66899ea4607d1ef3c13f858242e2239eb176dfe24e859c391d16ebed018 SHA512 e9fcd43288f59205389fa9cd35be1da34f014bdbf078891b1f1c51154262562e6ff986a6367035d9ddbfa856c198ba96ed2240b085cdb12ecb746d6b67ad271f
diff --git a/app-accessibility/flite/files/flite-2.2-backport-pr30.patch b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch
new file mode 100644
index 000000000000..7c859a5bb03e
--- /dev/null
+++ b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch
@@ -0,0 +1,91 @@
+https://bugs.gentoo.org/896106
+https://github.com/festvox/flite/pull/90
+
+From 56ef01e5a7cd8d8606b4ccd13b4366039269f9d7 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Fri, 24 Feb 2023 14:25:16 -0500
+Subject: [PATCH] Expose automated tests under "make check"
+
+The following unit tests can be run automatically without specifying any
+user-provided arguments:
+hrg_test lex_test multi_thread nums_test regex_test token_test
+
+Fix up the Makefiles to expose the ability to run these tests via "make
+check" or "make test", since it is currently broken (exposed at the top
+level, but missing the "test" target in testsuite/).
+---
+ Makefile           |  2 +-
+ testsuite/Makefile | 22 ++++++++++++----------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 511f8cf..1b627b2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -129,6 +129,6 @@ voices: ./bin/flite_cmu_us_awb ./bin/flite_cmu_us_rms ./bin/flite_cmu_us_rms
+ 	./bin/flite_cmu_us_rms -voicedump voices/cmu_us_rms.flitevox
+ 	./bin/flite_cmu_us_slt -voicedump voices/cmu_us_slt.flitevox
+ 
+-test:
++check test:
+ 	@ $(MAKE) --no-print-directory -C testsuite test
+ 
+diff --git a/testsuite/Makefile b/testsuite/Makefile
+index b60e98a..275a3e8 100644
+--- a/testsuite/Makefile
++++ b/testsuite/Makefile
+@@ -49,15 +49,17 @@ SRCS = token_test_main.c hrg_test_main.c \
+        bin2ascii_main.c record_in_noise_main.c \
+        compare_wave_main.c rfc_main.c lpc_resynth_main.c \
+        by_word_main.c flite_test_main.c \
+-       dcoffset_wave_main.c tris1_main.c
++       dcoffset_wave_main.c tris1_main.c \
++       multi_thread_main.c
+ FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck
+-OTHERS = kal_test_main.c multi_thread_main.c 
++OTHERS = kal_test_main.c
+ 
+ FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC)
+ 
+ LOCAL_INCLUDES = -I$(TOP)/lang/usenglish
+ 
+ MAIN_EXECS = $(SRCS:_main.c=$(EXEEXT))
++AUTO_EXECS = hrg_test lex_test multi_thread nums_test regex_test token_test
+ lex_test_LIBS = -lflite_cmulex
+ nums_test_LIBS = -lflite_usenglish
+ utt_test_LIBS = -lflite_cmulex
+@@ -65,6 +67,7 @@ lex_lookup_LIBS = -lflite_cmulex
+ ldom_time_LIBS = -L/home/awb/data/ldom/time_flite/flite/lib -lcmu_time_awb -lflite_usenglish -lflite_cmulex
+ flite_test_LIBS = -lflite_usenglish -lflite_cmulex
+ by_word_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex
++multi_thread_LIBS = -lflite_cmu_us_slt -lflite_cmulex -lflite_usenglish -lflite -lm -lasound -lgomp
+ #kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \
+ #	          /home/awb/src/malloc/gmalloc.o
+ 
+@@ -73,19 +76,18 @@ LOCAL_CLEAN = $(MAIN_EXECS)
+ 
+ include $(TOP)/config/common_make_rules
+ 
++multi_thread : CFLAGS += -fopenmp
++
+ MAIN_O = $(SRCS:%=%_main.o)
+ $(MAIN_O) : %_main.o : %_main.c
+ 	$(CC) $(CFLAGS) -o $@ $< 
+ $(MAIN_EXECS) : %$(EXEEXT) : %_main.o $(FLITELIBS)
+ 	$(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS)
+ 
+-multi_thread: multi_thread_main.c
+-	gcc -fopenmp -o multi_thread multi_thread_main.c \
+-		$(CFLAGS) -I$(TOP)/include $(FLITELIBFLAGS) $(LDFLAGS) \
+-		-l flite_cmu_us_slt -lflite_cmulex -lflite_usenglish \
+-		-lflite -lm -lasound -lgomp
+-do_thread_test: multi_thread
+-#	This shouldn't segfault
+-	export OMP_NUM_THREADS=100 && ./multi_thread
++check test: $(patsubst %, run_%, $(AUTO_EXECS))
+ 
++run_%: %
++	./$<
+ 
++run_multi_thread: multi_thread
++	OMP_NUM_THREADS=100 ./$<
diff --git a/app-accessibility/flite/flite-2.2.ebuild b/app-accessibility/flite/flite-2.2.ebuild
index 0b4c34e70ff8..5833e0487797 100644
--- a/app-accessibility/flite/flite-2.2.ebuild
+++ b/app-accessibility/flite/flite-2.2.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
@@ -44,7 +44,9 @@ SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa oss pulseaudio voices"
+IUSE="alsa oss pulseaudio test voices"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( alsa )"
 
 DEPEND="
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -54,6 +56,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
+	"${FILESDIR}"/${PN}-2.2-backport-pr30.patch
 )
 
 get_audio() {