gentoo resync : 28.04.2021

6 files changed, 0 insertions, 285 deletions

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 */