gentoo auto-resync : 04:03:2024 - 11:43:04

4 files changed, 72 insertions, 3 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 0ffd79a9659a..e4d88a39abfb 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 03bbd3b9ef22..74ae941a31a4 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,5 +1,6 @@
 AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68e0420034dd9f48d508e9f250bded341bcaa223ae12edd202d6185c9ac14cb00f9ce43c4c805e473dafb5d06185255646 SHA512 f2eb669767c9db9c5c5a8836491d8174bfc13b53b7de575a4dfa34bcdee428fce6d3d65829a523bd96b297015f7fa5815e93f119e91bfc7ae21cff7c274961a7
 AUX flite-2.2-backport-pr30.patch 3504 BLAKE2B 71a9441d6465dbc6dc903a6b83a8224c7c7a91f21c5f5040d46beba56e812ff1de7e6b5427b7b0ebc6d9f8a3f077bf9457c7c99b9982435dd1c057287d2d4921 SHA512 5e4eb2cd57ed71bf46fd1b3a8e41dabb3ddb2accd28556bbcea945c0e8e3a31e6ac60005cc6121bc92ce02268b5057cc24529d5b6476e195c75dd67425f2cdb8
+AUX flite-2.2-make-4.4.patch 2273 BLAKE2B f27c86987f481dca05f9838a571fc5a2992dd5a476adb68bd0cde33bd295d3e0f4a0c8140548f53de4f5fb6069149b29268a277e38962a915723d5eefd5972d8 SHA512 24da5c352ee3ab98e3bcdc803d35b6ab22fc51ccb69be53cea79d72a9e496be6136dea098d7ac6aa5a08f0e3754c3cfaca56873a6970fbf2543ffdbf8a45f465
 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
@@ -32,5 +33,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-r1.ebuild 4409 BLAKE2B 9ddd9bfd5259b3ac8f57181e039c3f99a6c425ed7a0a1cc733af24fdda45615be09c5b4cfe987be1093ed2635c8f68b4b5520dc6e60f6b943651aef50ff81646 SHA512 cdad52c76d584727f43811efcface7daad11a63a059f2a192145292de74cdff2a3577957a0b8cced319c026c8a2ca868a2ed642a3958c24354b39d0f2489626d
+EBUILD flite-2.2-r1.ebuild 4549 BLAKE2B ac7b566c232fef4685b541507faf80a5c084564553eb511d1f700cc4b1af96f72666f7e07143a21d614e089d41d0ae71a6541f82e59c00946a1749b2e4fd17e6 SHA512 9b41f9fdb285329bac07a14a119d3c3e1a0950f9e319425615686a6274bba39ebe0f3f0f746ec0f66729ef5f08ed0b7ca756448ab870d86cf7a515bd727c4e6f
 MISC metadata.xml 517 BLAKE2B e91b1a0a5e78284d318a97b13637c13666520a280afa818bb7bacabd73d0f8406a6da66899ea4607d1ef3c13f858242e2239eb176dfe24e859c391d16ebed018 SHA512 e9fcd43288f59205389fa9cd35be1da34f014bdbf078891b1f1c51154262562e6ff986a6367035d9ddbfa856c198ba96ed2240b085cdb12ecb746d6b67ad271f
diff --git a/app-accessibility/flite/files/flite-2.2-make-4.4.patch b/app-accessibility/flite/files/flite-2.2-make-4.4.patch
new file mode 100644
index 000000000000..21c2f866f5fc
--- /dev/null
+++ b/app-accessibility/flite/files/flite-2.2-make-4.4.patch
@@ -0,0 +1,60 @@
+https://github.com/festvox/flite/issues/86
+https://github.com/festvox/flite/pull/92
+
+From 14aa28529357ba13994a2bd90cfd11bfceeffcce Mon Sep 17 00:00:00 2001
+From: Moritz Barsnick <barsnick@gmx.net>
+Date: Thu, 23 Mar 2023 14:53:08 +0100
+Subject: [PATCH] fix implicit dependency on flite_voice_list.c
+
+Also make flite_lang_list a proper rule, so that it only builds once.
+
+Both C files were repeatedly being clobbered, as were their respective
+object files.
+
+Convert flite_voice_list.c is into an explicit dependency with a creation
+rule. flite_voice_list.o continues to be implicit from flite_voice_list.c.
+
+Convert flite_lang_list into a similar, proper object rule.
+
+Fixes https://github.com/festvox/flite/issues/86
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -106,21 +106,16 @@ endif
+ 
+ .NOTPARALLEL: $(ALL)
+ 
+-flite_lang_list: 
+-	rm -f flite_lang_list.c
++flite_lang_list.c:
+ 	$(TOP)/tools/make_lang_list $(LANGS) $(LEXES)
+-	$(MAKE) flite_lang_list.o
+ 
+-$(BINDIR)/flite$(EXEEXT): flite_main.o flite_lang_list $(flite_LIBS_deps)
++flite_voice_list.c:
+ 	$(TOP)/tools/make_voice_list $(VOICES)
+-	rm -f flite_voice_list.o
+-	$(MAKE) flite_voice_list.o
++
++$(BINDIR)/flite$(EXEEXT): flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps)
+ 	$(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS)
+ 
+-$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_lang_list $(flite_LIBS_deps)
+-	$(TOP)/tools/make_voice_list $(VOICES)
+-	rm -f flite_voice_list.o
+-	$(MAKE) flite_voice_list.o
++$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps)
+ 	$(CC) $(CFLAGS) -o $@ flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS)
+ 
+ $(BINDIR)/world$(EXEEXT): world_main.c
+@@ -144,10 +139,7 @@ each:
+ 	   $(MAKE) VOICE=$$i $(BINDIR)/flite_$$i ; \
+ 	done
+ 
+-$(BINDIR)/flite_${VOICE}: flite_main.o flite_lang_list $(flite_LIBS_deps)
+-	$(TOP)/tools/make_voice_list $(VOICE)
+-	rm -f flite_voice_list.o
+-	$(MAKE) flite_voice_list.o
++$(BINDIR)/flite_${VOICE}: flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps)
+ 	$(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS)
+ 
+ install:
diff --git a/app-accessibility/flite/flite-2.2-r1.ebuild b/app-accessibility/flite/flite-2.2-r1.ebuild
index 5c91935f7dc3..835c173da379 100644
--- a/app-accessibility/flite/flite-2.2-r1.ebuild
+++ b/app-accessibility/flite/flite-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
@@ -58,6 +58,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
 	"${FILESDIR}"/${PN}-2.2-backport-pr30.patch
+	"${FILESDIR}"/${PN}-2.2-make-4.4.patch
 )
 
 get_audio() {
@@ -105,6 +106,13 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+src_configure() {
+	# lto-type-mismatch
+	filter-lto
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--enable-shared