gentoo resync : 25.08.2020

4 files changed, 213 insertions, 24 deletions

diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index df28655ea0ac..cf5abf17ffdb 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,5 +1,6 @@
-AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
+AUX cvoicecontrol-0.9_alpha-automake.patch 1547 BLAKE2B 3353ad34c10078f49eecb4fa3e4e8e56db7fde7219219744aa97f0dea7ba6db1ed8ce1500e0431568c194c6e558799e6342cc19ed63e865d021d00c9ac19a124 SHA512 04dc49ca1d4643d06eb9dd08f591f363bd451883944beeacf2070904a70335ee40a5fde96d88187f12fbce29529aac3f69b41c2401a8188be03337f4ce55209b
+AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 5403 BLAKE2B b9f010f8f005ab8a872dae734972ab5eb42e734a92b05ed3d5d467fb4695dd1db0e021e83042c813f379642bf7cc69fb51b753af1d51daeba47399d1e1a5b9d2 SHA512 89b9d6dcbddb2f67fe9fc8d19b64ccdc182898728819bda7c02960fe2f4f452169cc74ed7cab916bb07a616954cd60f7c28c8e1ea54cd883677a3b74881752a1
 AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 838 BLAKE2B ba19c65df0d3a7e4fb74a2d9467ec94a258d10b8d147d8c6d01ae491737ffce61a26fd78ff2c2b1a1f7a6d068a322a00896bdb4b6728d9fd7de978eb3208e46d SHA512 69b890eb0a16ddf8737e39d9fa1e419eaeab3ededb6bcd71e689fa964ac859e27037831bc7bba738783cdd4241f77a1efa9a9ead1b8d29b8f5f23a7e753fa18d
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 701 BLAKE2B a64013c1868acbbc04a2ab27adae52667d7289858b9455f7114b4de477b32c31829fddcc8efa201e5a08c7be60ce1eaa667d874ead813ad108750035259070d3 SHA512 edfaf8639f867abe24ad810879248a2c6ebddd3ac5b8f50a6a57e9e9512e5479c1644f7e345c057e6f9dddeed2e7d764816bf9502a279ccd7bcedd67b301a674
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index 0b0363c94bcb..a1d1238c92c2 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -14,27 +14,20 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo-2.patch"
-	"${FILESDIR}/${P}-tinfo.patch" #647166
+	"${FILESDIR}"/${P}-gentoo-2.patch
+	"${FILESDIR}"/${P}-tinfo.patch #64716
+	# Handle documentation with HTML_DOCS instead
+	"${FILESDIR}"/${P}-automake.patch
 )
 
 src_prepare() {
 	default
-	# Handle documentation with dohtml instead.
-	sed \
-		-e "s:SUBDIRS = docs:#SUBDIRS = docs:" \
-		-i cvoicecontrol/Makefile.am || die
-
-	eautoreconf #647166
-
-	sed \
-		-e "s/install-data-am: install-data-local/install-data-am:/" \
-		-i Makefile.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch
new file mode 100644
index 000000000000..e2d73cbc9846
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch
@@ -0,0 +1,33 @@
+--- a/cvoicecontrol/Makefile.am
++++ b/cvoicecontrol/Makefile.am
+@@ -11,7 +11,7 @@
+ model_editor_SOURCES = audio.c configuration.c keypressed.c mixer.c model.c ncurses_tools.c preprocess.c realfftf.c model_editor.c
+ model_editor_LDADD   = -lm ${LIBNCURSES}
+ 
+-SUBDIRS = docs
++#SUBDIRS = docs
+ 
+ EXTRA_DIST = audio.c audio.h bb_queue.c bb_queue.h configuration.c configuration.h keypressed.c keypressed.h microphone_config.c microphone_config.h mixer.c mixer.h model.c model.h model_editor.c model_editor.h ncurses_tools.c ncurses_tools.h preprocess.c preprocess.h queue.h realfftf.c realfftf.h score.c score.h semaphore.c semaphore.h cvoicecontrol.c cvoicecontrol.h
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,19 +8,3 @@
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+ AUTOMAKE_OPTIONS = foreign
+-
+-install-data-local:
+-	$(mkinstalldirs) $(prefix)/share/doc/cvoicecontrol
+-	$(INSTALL_DATA) AUTHORS $(prefix)/share/doc/cvoicecontrol/AUTHORS
+-	$(INSTALL_DATA) FAQ     $(prefix)/share/doc/cvoicecontrol/FAQ    
+-	$(INSTALL_DATA) BUGS    $(prefix)/share/doc/cvoicecontrol/BUGS   
+-	$(INSTALL_DATA) README  $(prefix)/share/doc/cvoicecontrol/README 
+-	$(INSTALL_DATA) COPYING $(prefix)/share/doc/cvoicecontrol/COPYING
+-
+-uninstall-local:
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/AUTHORS
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/FAQ    
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/BUGS   
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/README 
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/COPYING
+-	rmdir $(prefix)/share/doc/cvoicecontrol
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
index 7e1ae985b18d..2316e92ba96c 100644
--- a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
@@ -1,6 +1,40 @@
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c	2002-09-05 19:09:06.000000000 +0300
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2007-07-29 23:35:33.000000000 +0300
+--- a/cvoicecontrol/audio.c
++++ b/cvoicecontrol/audio.c
+@@ -32,6 +32,10 @@
+ 
+ int is_open = 0;
+ 
++int   fd_audio;
++char *dev_audio;
++signed short rec_level, stop_level, silence_level;
++
+ /********************************************************************************
+  * set name of audio device
+  ********************************************************************************/
+--- a/cvoicecontrol/audio.h
++++ b/cvoicecontrol/audio.h
+@@ -31,8 +31,8 @@
+ #define CONSECUTIVE_SPEECH_BLOCKS_THRESHOLD    3
+ #define CONSECUTIVE_NONSPEECH_BLOCKS_THRESHOLD 5
+ 
+-int   fd_audio;
+-char *dev_audio;
++extern int   fd_audio;
++extern char *dev_audio;
+ 
+ /********************************************************************************
+  * For now, microphone input level is used to start and stop recording
+@@ -43,7 +43,7 @@
+  * silence_level  average micro level of silence
+  ********************************************************************************/
+ 
+-signed short rec_level, stop_level, silence_level;
++extern signed short rec_level, stop_level, silence_level;
+ 
+ typedef struct
+ {
+--- a/cvoicecontrol/cvoicecontrol.c
++++ b/cvoicecontrol/cvoicecontrol.c
 @@ -38,6 +38,8 @@
  #include<sys/select.h>
  #endif
@@ -10,9 +44,62 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol
  #include "cvoicecontrol.h"
  
  #include "model.h"
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c	2000-02-19 14:08:47.000000000 +0200
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c	2007-07-29 23:36:08.000000000 +0300
+@@ -53,6 +55,10 @@
+ #include "mixer.h"
+ #include "preprocess.h"
+ 
++int adjust_window_width;
++int sloppy_corner;
++float float_max;
++
+ Model *model; /***** speaker model */
+ 
+ Queue queue1; /***** thread-safe queue used to hand data from 'recording' to 'preprocessing' */
+@@ -341,7 +347,7 @@
+  * calculate euklidian distance of two feature vectors
+  ********************************************************************************/
+ 
+-inline float euklid_distance(float *a, float *b)
++float euklid_distance(float *a, float *b)
+ {
+   float result = 0; /***** resulting distance */
+   int i;
+--- a/cvoicecontrol/cvoicecontrol.h
++++ b/cvoicecontrol/cvoicecontrol.h
+@@ -66,7 +66,7 @@
+  *
+  *       Legend:  w = adjust_window_width
+  */
+-int adjust_window_width;
++extern int adjust_window_width;
+ 
+ /*
+  * strictly speaking, time-alignment in the DTW matrix starts
+@@ -87,19 +87,19 @@
+  *
+  *    Legend: x = distance value,  o = (infinity)
+  */
+-int sloppy_corner;
++extern int sloppy_corner;
+ 
+ /*****
+   time alignment scores must stay below this value
+   otherwise the according samples are ignored in
+   the further evaluation process
+   *****/
+-float score_threshold;
++extern float score_threshold;
+ 
+ /*****
+   a (very high) float value that is considered "infinity"
+   *****/
+-float float_max;
++extern float float_max;
+ 
+ /***** these macros are used in the DTW warping function
+   to calculate the maximum/minimum of two or three
+--- a/cvoicecontrol/microphone_config.c
++++ b/cvoicecontrol/microphone_config.c
 @@ -1099,8 +1099,6 @@
        free(command);
      }
@@ -22,9 +109,84 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecon
    }
    else /***** couldn't retrieve home directory -> store results in /tmp/ */
    {
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c	2000-02-12 18:05:24.000000000 +0200
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c	2007-07-29 23:34:38.000000000 +0300
+--- a/cvoicecontrol/mixer.c
++++ b/cvoicecontrol/mixer.c
+@@ -30,6 +30,9 @@
+ 
+ char *dev_mixer = NULL;
+ 
++int mic_level;
++int igain_level;
++
+ /********************************************************************************
+  * set mixer device name
+  ********************************************************************************/
+--- a/cvoicecontrol/mixer.h
++++ b/cvoicecontrol/mixer.h
+@@ -37,7 +37,7 @@
+ #define MIXER_ERR -1
+ #define MIXER_OK  1
+ 
+-int mic_level;
+-int igain_level;
++extern int mic_level;
++extern int igain_level;
+ 
+ #endif
+--- a/cvoicecontrol/preprocess.c
++++ b/cvoicecontrol/preprocess.c
+@@ -23,6 +23,13 @@
+ 
+ int i,j; /***** counter variables */
+ 
++int   filter_banks[17];
++float power_spec[POWER_SPEC_SIZE];
++float hamming_window[HAMMING_SIZE];
++int   do_mean_sub;
++float channel_mean[FEAT_VEC_SIZE];
++float score_threshold;
++
+ /********************************************************************************
+  * initialize preprocessing s tuff
+  ********************************************************************************/
+--- a/cvoicecontrol/preprocess.h
++++ b/cvoicecontrol/preprocess.h
+@@ -51,12 +51,12 @@
+ /*****
+   used for reduction of short-time spectrum to mel scale coefficients
+   *****/
+-int   filter_banks[17];
++extern int   filter_banks[17];
+ 
+ /*****
+   contains the power spectrum
+   *****/
+-float power_spec[POWER_SPEC_SIZE];
++extern float power_spec[POWER_SPEC_SIZE];
+ 
+ /********************************************************************************
+  * Hamming window width = 16ms ! (256 Frames)
+@@ -68,15 +68,15 @@
+  * to reduce the number of artefacts in the power spectrum
+  ********************************************************************************/
+ 
+-float hamming_window[HAMMING_SIZE];
++extern float hamming_window[HAMMING_SIZE];
+ 
+ /*****
+   The characteristics of the recording channel
+   This is substracted from each feature vector to reduce
+   channel effects
+   *****/
+-int   do_mean_sub;
+-float channel_mean[FEAT_VEC_SIZE];
++extern int   do_mean_sub;
++extern float channel_mean[FEAT_VEC_SIZE];
+ 
+ 
+ int  initPreprocess();
+--- a/cvoicecontrol/semaphore.c
++++ b/cvoicecontrol/semaphore.c
 @@ -26,6 +26,7 @@
  ****************************************************************************/