gentoo resync : 28.04.2021

10 files changed, 2 insertions, 501 deletions

diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index f772ca0a44e6..5c5c9ba8789d 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,10 +1,4 @@
 AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68e0420034dd9f48d508e9f250bded341bcaa223ae12edd202d6185c9ac14cb00f9ce43c4c805e473dafb5d06185255646 SHA512 f2eb669767c9db9c5c5a8836491d8174bfc13b53b7de575a4dfa34bcdee428fce6d3d65829a523bd96b297015f7fa5815e93f119e91bfc7ae21cff7c274961a7
-AUX flite-1.4-fix-parallel-builds.patch 599 BLAKE2B 0176441ade2c4290f8e1f700d98b9fd2a15329fdcd68c5c877c60e632c829f25f81924c0f8367009a354bb5e1f4b735a80b964192014755d13d16d06cb0ac207 SHA512 5adf675aadc3493ad70b1e7f447a1d7c0ff9c11a7dce90afbc6ccc7c811cc7226a7b1591a1a819209b26e93bf48c11cdaa8db1cfd55eb884a66b054c79590509
-AUX flite-1.4-ldflags.patch 1488 BLAKE2B 8c245691783f0c573fbed6759a59379c32eaf14d369cb04be5072f1ab8ffb97a6aa6c1faa938362454794059ed0aeca2e2517eff60ee64085e2d4b888a92310e SHA512 3672edd25ec7062b3736fa297a5805d85854c0a1668c2648b93a07d8e09c970f0f8147f788a916221e8e6a20decb8b8681e8315e07b335cb89a185f0b65f805c
-AUX flite-1.4-respect-destdir.patch 1902 BLAKE2B 115d000bfb5f1a2a5764fa47c934889312bf1b3d955c15b089b1bebe3085af8d20b176611c8428f3788b46ca80f793f9610d3562128cfa59d1df985754f44dd8 SHA512 acc37971361eda4ce91cf605e3ff7878842d605d12973c37ab80451e6a1f9dea96b54cbd39a9ca281f36f6ed6ec1e79af712692639f541c59a7cedad2af47de7
-AUX flite-2.1-Improve-internal-linking.patch 4241 BLAKE2B 9dddba5c2373d3f3bec6180bce7f702bc924a2f5704c372a680283dfdcd4fda7edc939ddd6ac0b7ba0f00678c2666bb6948d9cacd2e348d876d9af75f0c55ee4 SHA512 37b94898d0193c6ee5d5363b6902a0ba0c85d3bedef9ac6c8146f5328ba4841dad7dc5d034168186fb5d94685b81770938c450cba3f2c2c40962d4ba3f4e0b58
-AUX flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch 1796 BLAKE2B 7eaba62d5f4f72c74ff0d09615593a1d2a0ef8bdbf5005487777411ff9123e5d7c5fa1494e0131bffce206423c18e3e6bfda687e8f04a00b9c3b1ca3548b346e SHA512 9faeda9461c2545ae0d26d5b1eeefc6deea891204b92339aa1e46462feab5e3b9c479f6d40bbaa923066c994084e8a85a650e5a57eb64cbf2d4ae5e482bd23af
-AUX flite-2.1-prototype.patch 518 BLAKE2B c2d84c095d2cecc5b78d34d442981d71bead028d259b14bfe252b231ed3162974a8f4910dcf2cc1796d3515fbb9fee8562aebe602b1a50285a0abc82b365b305 SHA512 ad4b6c42a867f6d3b3fef6bfd0a663f54fb656fc3cbc8641b7d6d9eeef4297a2d418a01fd131d20b02bb6f76ce3b71b7d9ce80f3839c653035b5e6a0dc7cd2d1
 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
@@ -36,10 +30,6 @@ DIST cmu_us_rms.flitevox 12845352 BLAKE2B eb48a7bd29e70d9782e16de8ac28030639f336
 DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 532ce8a72455a3d15728b799b8d9c15fcc7bc06e14bc8559fe9f8ce5ff537bfb6465f3069083ce45ff023c413ae6e7b7f19c1b19e010900f60bbdfb427d2370f SHA512 6f742bf4a94f72fb1383c60b2917f8001638c8ec2696b989c5ab2dd192cf4a08256e54fd5f8431a10ba164272e5bbfab474213b09d2dd3a2acf4bb4bdaca554e
 DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f SHA512 f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44
 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41
-DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
-DIST flite-2.1-release.tar.bz2 14816327 BLAKE2B a23db51594ec94131112e0f007e1a9e4ee7170eaeda37ecc461c08a0e4defa0bfcde87ca01df765f0bc7b85cc6b3d4ec355830eae7dcb47d243d08b04772217b SHA512 e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2
 DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
-EBUILD flite-1.4-r4.ebuild 1671 BLAKE2B a8fcd30f8638103c895476213d5b772a40b18a3c5f5f18c4c6ca1aa7b64118c05c10bd5505718a10893722b5e33c4e2eb9ffaef4f7b7f27407d8865e66ef97b8 SHA512 cf4a609fd4e685f951210ffd921f48abedc8b15795a789a7f7082dc3c2393261df8ac74680fe1073d6cd13b9be71c4be36b7186a9cf5ac8aa43918321feac593
-EBUILD flite-2.1.ebuild 4297 BLAKE2B 9acbfcc4a4ac73336cf207e41e03d86d4190a250aa83141a5062b26da9b1dedd564c14612615052a979e42fd332a7e9b2f3ff1e09b37a7c2ec28faf171a7cd05 SHA512 b5ba1519e4862f418e743493956725a3f31d0bc265925ec83483d75fdfc873446426220c0ff6986b743c80733725c9c7cc58459f48f4de2cf18292e2e6f02d41
-EBUILD flite-2.2.ebuild 4111 BLAKE2B de0e2913e613606466f53f863904b4f6d835775bdae67fcf1b00518c4a066945c2cf6bb3ca7e0c3d8e6aa01aa5af70ca16315d468c528ded66c8449479c4930f SHA512 9b2727c1b509dfea1fd9e36fff1f45073a652517761fa59a90a086943f9e49cc0298ec454a565320934cb0c99dbf211cb8b32f97d1af0c7cb5a786ccb844eb72
+EBUILD flite-2.2.ebuild 4104 BLAKE2B 7c002a9807cb490fcac82b095906a199c32c14debf8a60132119c06866abdad6ddb29297a3ea24de07788f8da98e73da92435a004e00a085f2a853489c8b68d2 SHA512 b8579b9eddc237159acee8506191905045c6dee7b39244fb36eb1374617e6b4fc2bda8de251d5364628def1c1224d984fb6362b48bf30849cf24ef4a39f22021
 MISC metadata.xml 516 BLAKE2B 3c9a2d75594c79d5ca8193c7e493e0c8b95f7af38311f8f71111733625a7ac56007d22da5fdceeb4dcc6e196c38ce95bd06052f6f9e147de46e955acfb5ea552 SHA512 1903fc594e99c15ef53d71ff7b632af7556a2056eff707042d63befae89204d7f02ad506a1990ee6e982f564bac5420f1490d5a15795c46c0d49dff520e8a8ac
diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
deleted file mode 100644
index 270395877c53..000000000000
--- a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Fri, 1 Jan 2010 12:59:59 -0600
-Subject: [PATCH] fix parallel builds
-
----
- main/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 0513e59..e4d04fe 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -81,6 +81,8 @@ else
- shared_libs: nothing
- endif
- 
-+.NOTPARALLEL: $(ALL)
-+
- $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps)
- 	$(TOP)/tools/make_voice_list $(VOICES)
- 	rm -f flite_voice_list.o
--- 
-1.6.4.4
-
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch
deleted file mode 100644
index fd8f49059e76..000000000000
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -68,7 +68,7 @@
- 
- FLITELIBS = $(BUILDDIR)/lib/libflite.a
- FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite 
--LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
-+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
- 
- FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
- ifdef SHFLAGS
-@@ -123,7 +123,7 @@
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -62,9 +62,9 @@
- LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
- 
- $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) 
--	$(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
- $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
--	$(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
- makescripts:
- 	@ cp -p $(SCRIPTS) $(TOP)/bin
- 
diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
deleted file mode 100644
index d54771423e1f..000000000000
--- a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Thu, 31 Dec 2009 12:57:18 -0600
-Subject: [PATCH] respect destdir
-
----
- Makefile      |   10 +++++-----
- main/Makefile |   10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2d3ff09..26b2386 100644
---- a/Makefile
-+++ b/Makefile
-@@ -106,11 +106,11 @@ tags:
- 
- install:
- 	@echo Installing 
--	mkdir -p $(INSTALLBINDIR)
--	mkdir -p $(INSTALLLIBDIR)
--	mkdir -p $(INSTALLINCDIR)
--	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
--	@ $(MAKE) -C main --no-print-directory install
-+	mkdir -p $(DESTDIR)$(INSTALLBINDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLINCDIR)
-+	$(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
-+	@ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install
- 
- time-stamp :
- 	@ echo $(PROJECT_NAME) >.time-stamp
-diff --git a/main/Makefile b/main/Makefile
-index 8163e40..0513e59 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps)
- 
- install:
- #       The basic binaries
--	@ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
-+	@ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
- 	@ for i in $(VOICES) ; \
- 	do \
--	   $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
-+	   $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
- 	done
--	$(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
-+	$(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
- #       The libraries: static and shared (if built)
--	cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
-+	cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
- ifdef SHFLAGS
--	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
-+	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
- endif
- 
--- 
-1.6.4.4
-
diff --git a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
deleted file mode 100644
index 4b377e80c331..000000000000
--- a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 19:58:18 +0100
-Subject: [PATCH] Improve internal linking
-
-Building packages in Debian uses a tool to link libraries together at the
-package level. It emits warnings when unknonw symbols are found. E.g:
-
-dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries
----
- config/common_make_rules |  2 +-
- main/Makefile            | 16 ++++++++++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_make_rules b/config/common_make_rules
-index 7a03785..34434fd 100644
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
-diff --git a/main/Makefile b/main/Makefile
-index ff422e0..47b6344 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -54,7 +54,8 @@ ALL = shared_libs \
- VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
-+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
-+flite_LIBS = flite $(flite_MODS)
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
-@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
- # so make clean can remove them
- SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
- SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
-+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
-+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so
-+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so  $(LIBDIR)/libflite_cmu_indic_lex.so
-+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
- 
-@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
-               flite_voice_list.c
- 
- ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
-+$(SHAREDMODS): $(LIBDIR)/libflite.so
-+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
-+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
-+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
-+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
-+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
-+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
-+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
- shared_libs: $(SHAREDLIBS)
- else
- shared_libs: nothing
--- 
-2.24.1
-
-From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
-From: Alan W Black <awb@cs.cmu.edu>
-Date: Sun, 4 Mar 2018 08:55:40 -0500
-Subject: [PATCH] get libs in the right order
-
----
- main/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 47b6344..1da18a8 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -55,7 +55,7 @@ VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
- flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
--flite_LIBS = flite $(flite_MODS)
-+flite_LIBS = $(flite_MODS) flite
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
--- 
-2.24.1
diff --git a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
deleted file mode 100644
index 5ddaecd65903..000000000000
--- a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 06:20:03 +0100
-Subject: [PATCH] Only write audio data to a temporariy file in debug builds
-
-This isn't useful in regular builds and is actually a security concern,
-although it seems (see discussion in [Bug-Debian]) that this is most likely
-only reached during testsuite calls.
-
-CVE-2014-0027
-
-Original patch from Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 6 Jan 2014 13:45:00 +0000
-Bug-Debian: http://bugs.debian.org/734746
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678
-Source: https://bugzilla.redhat.com/attachment.cgi?id=846118
----
- src/audio/auserver.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/audio/auserver.c b/src/audio/auserver.c
-index 800c27d..cfcad7d 100644
---- a/src/audio/auserver.c
-+++ b/src/audio/auserver.c
-@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
-     int q,i,n,r;
-     unsigned char bytes[CST_AUDIOBUFFSIZE];
-     short shorts[CST_AUDIOBUFFSIZE];
-+#ifdef DEBUG
-     cst_file fff;
- 
-     fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
-+#endif
- 
-     if ((audio_device = audio_open(header->sample_rate,1,
- 				   (header->encoding == CST_SND_SHORT) ?
-@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	for (q=r; q > 0; q-=n)
- 	{
- 	    n = audio_write(audio_device,shorts,q);
-+#ifdef DEBUG
- 	    cst_fwrite(fff,shorts,2,q);
-+#endif
- 	    if (n <= 0)
- 	    {
- 		audio_close(audio_device);
-@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	}
-     }
-     audio_close(audio_device);
-+#ifdef DEBUG
-     cst_fclose(fff);
-+#endif
- 
-     return CST_OK_FORMAT;
- 
--- 
-2.24.1
-
diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch
deleted file mode 100644
index 2fe301774d0c..000000000000
--- a/app-accessibility/flite/files/flite-2.1-prototype.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
-index e0ae73f..f48ffe6 100644
---- a/lang/cmu_indic_lex/cmu_indic_lex.c
-+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
-@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char)
-     return cmu_indic_offset_char[c].type;
- }
- 
-+int indic_digit_to_offset(const char *ind_digit);
-+
- static int indic_text_splitable(const char *s,int i,int len1)
- {
-     /* Returns true only if this and next chars are not both digits */
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
deleted file mode 100644
index 7ba4e221b442..000000000000
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
-SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="alsa oss"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-release
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
-	"${FILESDIR}"/${PN}-1.4-respect-destdir.patch
-	"${FILESDIR}"/${PN}-1.4-ldflags.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-)
-
-get_audio() {
-	if use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README
-
-	find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "you have built flite without audio support."
-		ewarn "If you want audio support, re-emerge"
-		ewarn "flite with alsa or oss in your use flags."
-	fi
-}
diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.1.ebuild
deleted file mode 100644
index 0ecace3285d0..000000000000
--- a/app-accessibility/flite/flite-2.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
-SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2
-	voices? (
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox
-	)"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa oss pulseaudio voices"
-
-DEPEND="
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	!pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${P}-Improve-internal-linking.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-	"${FILESDIR}"/${P}-prototype.patch
-)
-
-S=${WORKDIR}/${P}-release
-
-get_audio() {
-	if use pulseaudio; then
-		echo pulseaudio
-	elif use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_unpack() {
-	for file in ${A}; do
-		case "${file}" in
-			*.flitevox)
-				cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}"
-				;;
-			*)
-				unpack "${file}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	mv configure.{in,ac} || die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README.md
-
-	rm -rf "${D}"/usr/lib*/*.a
-
-	if use voices; then
-		insinto /usr/share/flite
-		doins "${WORKDIR}"/*.flitevox
-	fi
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "flite is built without audio support. Enable the"
-		ewarn "alsa, oss, or pulseaudio USE flags for audio support."
-	fi
-}
diff --git a/app-accessibility/flite/flite-2.2.ebuild b/app-accessibility/flite/flite-2.2.ebuild
index ccb52bbc91ce..46870556132a 100644
--- a/app-accessibility/flite/flite-2.2.ebuild
+++ b/app-accessibility/flite/flite-2.2.ebuild
@@ -43,7 +43,7 @@ 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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="alsa oss pulseaudio voices"
 
 DEPEND="