bump?

Signed-off-by: Vadim A. Misbakh-Soloviov <git@mva.name>

14 files changed, 26 insertions, 625 deletions

diff --git a/app-accessibility/julius/ChangeLog b/app-accessibility/julius/ChangeLog
deleted file mode 100644
index 47f97ff..0000000
--- a/app-accessibility/julius/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for app-accessibility/julius
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  17 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> julius-4.1.ebuild:
-  QA quotes around EAPI version
-
-  26 Mar 2009; Tiago Cunha <tcunha@gentoo.org> julius-4.1.ebuild:
-  Add missing die to emake.
-
-  19 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-  julius-4.1.ebuild:
-  Add suggested RDEPEND=${DEPEND}
-
-  30 Dec 2008; Erik Hahn (a_b) <erik_hahn@gmx.de> julius-4.1.ebuild:
-  Install japanese docs, remove USE flags with no matching configure switch
-  and dependencies on gtk-1 and glibc
-
-  14 Nov 2008; Daniel Pinto dos Santos (danielpi) <danielpi@gmx.net>
-  +julius-4.1.ebuild, +files/julius-4.1-makefile.patch,
-  +files/julius-4.1-mkfacrash.patch, +files/julius-4.1-newParam.patch,
-  +metadata.xml:
-  New ebuild for julius, see bug #245475. Thanks to idl0r and Tommy.
-
diff --git a/app-accessibility/julius/Manifest b/app-accessibility/julius/Manifest
deleted file mode 100644
index b5ccac2..0000000
--- a/app-accessibility/julius/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST julius-4.3.1.tar.gz 1761555 SHA256 4bf77c7b91f4bb0686c375c70bd4f2077e7de7db44f60716af9f3660f65a6253 SHA512 67dca6b1c9e2b18b08cd9ea2c7b1a751c3a26285d59de7e78bd709737c0c44ab8dc3cf78440bc5e603df6a7e7e881ee4cdb8aa10c829f20e4780ffda4b37619b WHIRLPOOL 5f5f411ca74894ca467d7388b764323be2168c525c09ce849466ae0dc33bc793b3584e1d3c06cfb9333cb0dbf0a087cbbfd11d8b8dc59c0c4d0b7b87cfb8869a
diff --git a/app-accessibility/julius/files/julius-4.1-makefile.patch b/app-accessibility/julius/files/julius-4.1-makefile.patch
deleted file mode 100644
index 6de5f31..0000000
--- a/app-accessibility/julius/files/julius-4.1-makefile.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -Naur working/dists/julius-4.1/adinrec/Makefile.in working/dists/julius-4.1_mod/adinrec/Makefile.in
---- adinrec/Makefile.in	2008-10-02 21:57:01.000000000 +1300
-+++ adinrec/Makefile.in	2008-11-10 15:27:34.000000000 +1300
-@@ -37,7 +37,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/adintool/Makefile.in working/dists/julius-4.1_mod/adintool/Makefile.in
---- adintool/Makefile.in	2008-10-02 21:57:01.000000000 +1300
-+++ adintool/Makefile.in	2008-11-10 15:27:52.000000000 +1300
-@@ -37,7 +37,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/generate-ngram/Makefile.in working/dists/julius-4.1_mod/generate-ngram/Makefile.in
---- generate-ngram/Makefile.in	2008-10-02 21:57:01.000000000 +1300
-+++ generate-ngram/Makefile.in	2008-11-10 15:28:13.000000000 +1300
-@@ -33,7 +33,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	$(RM) $(OBJ) *~ core
-diff -Naur working/dists/julius-4.1/gramtools/accept_check/Makefile.in working/dists/julius-4.1_mod/gramtools/accept_check/Makefile.in
---- gramtools/accept_check/Makefile.in	2008-10-02 21:57:02.000000000 +1300
-+++ gramtools/accept_check/Makefile.in	2008-11-10 15:28:35.000000000 +1300
-@@ -36,7 +36,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/gramtools/dfa_determinize/Makefile.in working/dists/julius-4.1_mod/gramtools/dfa_determinize/Makefile.in
---- gramtools/dfa_determinize/Makefile.in	2008-10-02 21:57:02.000000000 +1300
-+++ gramtools/dfa_determinize/Makefile.in	2008-11-10 15:28:53.000000000 +1300
-@@ -35,7 +35,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/gramtools/dfa_minimize/Makefile.in working/dists/julius-4.1_mod/gramtools/dfa_minimize/Makefile.in
---- gramtools/dfa_minimize/Makefile.in	2008-10-02 21:57:02.000000000 +1300
-+++ gramtools/dfa_minimize/Makefile.in	2008-11-10 15:29:15.000000000 +1300
-@@ -35,7 +35,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/gramtools/generate/Makefile.in working/dists/julius-4.1_mod/gramtools/generate/Makefile.in
---- gramtools/generate/Makefile.in	2008-10-02 21:57:02.000000000 +1300
-+++ gramtools/generate/Makefile.in	2008-11-10 15:29:35.000000000 +1300
-@@ -35,7 +35,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/gramtools/gram2sapixml/Makefile.in working/dists/julius-4.1_mod/gramtools/gram2sapixml/Makefile.in
---- gramtools/gram2sapixml/Makefile.in	2007-12-18 21:45:47.000000000 +1300
-+++ gramtools/gram2sapixml/Makefile.in	2008-11-10 15:29:55.000000000 +1300
-@@ -18,7 +18,7 @@
- 
- install.bin:
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	echo nothing to do
-diff -Naur working/dists/julius-4.1/gramtools/mkdfa/Makefile.in working/dists/julius-4.1_mod/gramtools/mkdfa/Makefile.in
---- gramtools/mkdfa/Makefile.in	2007-12-18 21:45:47.000000000 +1300
-+++ gramtools/mkdfa/Makefile.in	2008-11-10 15:30:26.000000000 +1300
-@@ -19,12 +19,12 @@
- install:
- 	(cd $(SUBDIR); $(MAKE) install)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- install.bin:
- 	(cd $(SUBDIR); $(MAKE) install.bin)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	(cd $(SUBDIR); $(MAKE) clean)
-diff -Naur working/dists/julius-4.1/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in working/dists/julius-4.1_mod/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
---- gramtools/mkdfa/mkfa-1.44-flex/Makefile.in	2007-12-18 21:45:47.000000000 +1300
-+++ gramtools/mkdfa/mkfa-1.44-flex/Makefile.in	2008-11-10 15:30:47.000000000 +1300
-@@ -44,7 +44,7 @@
- 
- install.bin:
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	$(RM) *.o *~ core
-diff -Naur working/dists/julius-4.1/gramtools/nextword/Makefile.in working/dists/julius-4.1_mod/gramtools/nextword/Makefile.in
---- gramtools/nextword/Makefile.in	2008-10-02 21:57:02.000000000 +1300
-+++ gramtools/nextword/Makefile.in	2008-11-10 15:31:09.000000000 +1300
-@@ -36,7 +36,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/gramtools/yomi2voca/Makefile.in working/dists/julius-4.1_mod/gramtools/yomi2voca/Makefile.in
---- gramtools/yomi2voca/Makefile.in	2007-12-18 21:45:48.000000000 +1300
-+++ gramtools/yomi2voca/Makefile.in	2008-11-10 15:31:25.000000000 +1300
-@@ -18,7 +18,7 @@
- 
- install.bin:
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	echo nothing to do
-diff -Naur working/dists/julius-4.1/jclient-perl/Makefile.in working/dists/julius-4.1_mod/jclient-perl/Makefile.in
---- jclient-perl/Makefile.in	2008-10-02 21:57:03.000000000 +1300
-+++ jclient-perl/Makefile.in	2008-11-10 15:31:57.000000000 +1300
-@@ -18,7 +18,7 @@
- 
- install.bin:
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	echo nothing to do
-diff -Naur working/dists/julius-4.1/jcontrol/Makefile.in working/dists/julius-4.1_mod/jcontrol/Makefile.in
---- jcontrol/Makefile.in	2008-10-02 21:57:03.000000000 +1300
-+++ jcontrol/Makefile.in	2008-11-10 15:32:12.000000000 +1300
-@@ -32,7 +32,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	$(RM) $(OBJ)
-diff -Naur working/dists/julius-4.1/julius/Makefile.in working/dists/julius-4.1_mod/julius/Makefile.in
---- julius/Makefile.in	2008-10-02 21:57:03.000000000 +1300
-+++ julius/Makefile.in	2008-11-10 15:32:37.000000000 +1300
-@@ -26,10 +26,10 @@
- ## install
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
--mandir=@mandir@
-+bindir=$(DESTDIR)/@bindir@
-+libdir=$(DESTDIR)/@libdir@
-+includedir=$(DESTDIR)/@includedir@
-+mandir=$(DESTDIR)/@mandir@
- INSTALL=@INSTALL@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -Naur working/dists/julius-4.1/libjulius/Makefile.in working/dists/julius-4.1_mod/libjulius/Makefile.in
---- libjulius/Makefile.in	2008-10-03 04:01:59.000000000 +1300
-+++ libjulius/Makefile.in	2008-11-10 15:33:17.000000000 +1300
-@@ -26,9 +26,9 @@
- ## install
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
-+bindir=$(DESTDIR)/@bindir@
-+libdir=$(DESTDIR)/@libdir@
-+includedir=$(DESTDIR)/@includedir@
- INSTALL=@INSTALL@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -Naur working/dists/julius-4.1/libsent/Makefile.in working/dists/julius-4.1_mod/libsent/Makefile.in
---- libsent/Makefile.in	2008-10-03 04:01:59.000000000 +1300
-+++ libsent/Makefile.in	2008-11-10 15:33:37.000000000 +1300
-@@ -25,9 +25,9 @@
- ## install
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
-+bindir=$(DESTDIR)/@bindir@
-+libdir=$(DESTDIR)/@libdir@
-+includedir=$(DESTDIR)/@includedir@
- INSTALL=@INSTALL@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -Naur working/dists/julius-4.1/man/Makefile.in working/dists/julius-4.1_mod/man/Makefile.in
---- man/Makefile.in	2008-10-03 04:01:59.000000000 +1300
-+++ man/Makefile.in	2008-11-10 15:48:22.000000000 +1300
-@@ -19,16 +19,16 @@
- install: install.man install.man.ja
- 
- install.man:
--	${INSTALL} -d @mandir@/man1
-+	${INSTALL} -d $(DESTDIR)@mandir@/man1
- 	for f in *.1; do \
--	  @INSTALL_DATA@ $$f @mandir@/man1/$$f; \
-+	  @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/man1/$$f; \
- 	done
- 
- install.man.ja:
--	${INSTALL} -d @mandir@/man1/ja
-+	${INSTALL} -d $(DESTDIR)@mandir@/man1/ja
- 	cd ja;
- 	for f in *.1; do \
--	  @INSTALL_DATA@ $$f @mandir@/man1/ja/$$f; \
-+	  @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/man1/ja/$$f; \
- 	done
- 	cd ..
- 
-diff -Naur working/dists/julius-4.1/mkbingram/Makefile.in working/dists/julius-4.1_mod/mkbingram/Makefile.in
---- mkbingram/Makefile.in	2008-10-02 21:57:03.000000000 +1300
-+++ mkbingram/Makefile.in	2008-11-10 15:34:25.000000000 +1300
-@@ -33,7 +33,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- clean:
- 	$(RM) $(OBJ)
-diff -Naur working/dists/julius-4.1/mkbinhmm/Makefile.in working/dists/julius-4.1_mod/mkbinhmm/Makefile.in
---- mkbinhmm/Makefile.in	2008-10-02 21:57:04.000000000 +1300
-+++ mkbinhmm/Makefile.in	2008-11-10 15:34:43.000000000 +1300
-@@ -33,7 +33,7 @@
- 
- install.bin: mkbinhmm mkbinhmmlist
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ mkbinhmm mkbinhmmlist @bindir@
-+	@INSTALL_PROGRAM@ mkbinhmm mkbinhmmlist $(DESTDIR)/@bindir@
- 
- clean:
- 	$(RM) mkbinhmm.o mkbinhmmlist.o
-diff -Naur working/dists/julius-4.1/mkgshmm/Makefile.in working/dists/julius-4.1_mod/mkgshmm/Makefile.in
---- mkgshmm/Makefile.in	2008-10-02 21:57:04.000000000 +1300
-+++ mkgshmm/Makefile.in	2008-11-10 15:35:07.000000000 +1300
-@@ -24,7 +24,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
-diff -Naur working/dists/julius-4.1/mkss/Makefile.in working/dists/julius-4.1_mod/mkss/Makefile.in
---- mkss/Makefile.in	2008-10-02 21:57:04.000000000 +1300
-+++ mkss/Makefile.in	2008-11-10 15:35:22.000000000 +1300
-@@ -37,7 +37,7 @@
- 
- install.bin: $(TARGET)
- 	${INSTALL} -d @bindir@
--	@INSTALL_PROGRAM@ $(TARGET) @bindir@
-+	@INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@
- 
- ############################################################
- 
diff --git a/app-accessibility/julius/files/julius-4.1-mkfacrash.patch b/app-accessibility/julius/files/julius-4.1-mkfacrash.patch
deleted file mode 100644
index 906e793..0000000
--- a/app-accessibility/julius/files/julius-4.1-mkfacrash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur working/dists/julius-4.1/gramtools/mkdfa/mkfa-1.44-flex/triplet.c working/dists/julius-4.1_mod2/gramtools/mkdfa/mkfa-1.44-flex/triplet.c
---- gramtools/mkdfa/mkfa-1.44-flex/triplet.c	2007-12-18 21:45:47.000000000 +1300
-+++ gramtools/mkdfa/mkfa-1.44-flex/triplet.c	2008-11-10 15:40:09.000000000 +1300
-@@ -150,7 +150,7 @@
-     FAQ *newFAQ;
- 
-     if( fa != NULL ){
--	if( (newFAQ = malloc( sizeof(newFAQ) )) == NULL ){
-+	if( (newFAQ = malloc( sizeof(FAQ) )) == NULL ){
- 	    errMes( "Can't malloc queue for breadth-first search of triplet list" );
- 	}
- 	newFAQ->fa = fa;
diff --git a/app-accessibility/julius/files/julius-4.1-newParam.patch b/app-accessibility/julius/files/julius-4.1-newParam.patch
deleted file mode 100644
index 6f545ee..0000000
--- a/app-accessibility/julius/files/julius-4.1-newParam.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur julius-4.1/libjulius/include/julius/extern.h julius-4.1_new/libjulius/include/julius/extern.h
---- libjulius/include/julius/extern.h        2008-09-25 07:00:05.000000000 +0200
-+++ libjulius/include/julius/extern.h    2008-11-03 10:22:19.000000000 +0100
-@@ -109,9 +109,9 @@
- void malloc_wordtrellis(RecogProcess *r);
- void free_wordtrellis(StackDecode *dwrk);
- void scan_word(NODE *now, HTK_Param *param, RecogProcess *r);
--void next_word(NODE *now, NODE *new, NEXTWORD *nword, HTK_Param *param, RecogProcess *r);
--void start_word(NODE *new, NEXTWORD *nword, HTK_Param *param, RecogProcess *r);
--void last_next_word(NODE *now, NODE *new, HTK_Param *param, RecogProcess *r);
-+void next_word(NODE *now, NODE *newParam, NEXTWORD *nword, HTK_Param *param, RecogProcess *r);
-+void start_word(NODE *newParam, NEXTWORD *nword, HTK_Param *param, RecogProcess *r);
-+void last_next_word(NODE *now, NODE *newParam, HTK_Param *param, RecogProcess *r);
- 
- /* wav2mfcc.c */
- boolean wav2mfcc(SP16 speech[], int speechlen, Recog *recog);
-diff -Naur julius-4.1/libsent/include/sent/htk_hmm.h julius-4.1_new/libsent/include/sent/htk_hmm.h
---- libsent/include/sent/htk_hmm.h   2008-09-30 05:58:18.000000000 +0200
-+++ libsent/include/sent/htk_hmm.h       2008-11-03 10:22:19.000000000 +0100
-@@ -428,16 +428,16 @@
- char *get_cov_str(short covtype);
- char *get_dur_str(short durtype);
- /* rdhmmdef_trans.c */
--void trans_add(HTK_HMM_INFO *hmm, HTK_HMM_Trans *new);
-+void trans_add(HTK_HMM_INFO *hmm, HTK_HMM_Trans *newParam);
- HTK_HMM_Trans *get_trans_data(FILE *, HTK_HMM_INFO *);
- void def_trans_macro(char *, FILE *, HTK_HMM_INFO *);
- /* rdhmmdef_state.c */
- HTK_HMM_State *get_state_data(FILE *, HTK_HMM_INFO *);
- void def_state_macro(char *, FILE *, HTK_HMM_INFO *);
- HTK_HMM_State *state_lookup(HTK_HMM_INFO *hmm, char *keyname);
--void state_add(HTK_HMM_INFO *hmm, HTK_HMM_State *new);
-+void state_add(HTK_HMM_INFO *hmm, HTK_HMM_State *newParam);
- /* rdhmmdef_mpdf.c */
--void mpdf_add(HTK_HMM_INFO *hmm, HTK_HMM_PDF *new);
-+void mpdf_add(HTK_HMM_INFO *hmm, HTK_HMM_PDF *newParam);
- HTK_HMM_PDF *mpdf_lookup(HTK_HMM_INFO *hmm, char *keyname);
- HTK_HMM_PDF *get_mpdf_data(FILE *fp, HTK_HMM_INFO *hmm, int mix_num, short stream_id);
- void def_mpdf_macro(char *name, FILE *fp, HTK_HMM_INFO *hmm);
- -445,22 +445,22 @@
- HTK_HMM_Dens *get_dens_data(FILE *, HTK_HMM_INFO *);
- void def_dens_macro(char *, FILE *, HTK_HMM_INFO *);
- HTK_HMM_Dens *dens_lookup(HTK_HMM_INFO *hmm, char *keyname);
--void dens_add(HTK_HMM_INFO *hmm, HTK_HMM_Dens *new);
-+void dens_add(HTK_HMM_INFO *hmm, HTK_HMM_Dens *newParam);
- /* rdhmmdef_var.c */
- HTK_HMM_Var *get_var_data(FILE *, HTK_HMM_INFO *);
- void def_var_macro(char *, FILE *, HTK_HMM_INFO *);
--void var_add(HTK_HMM_INFO *hmm, HTK_HMM_Var *new);
-+void var_add(HTK_HMM_INFO *hmm, HTK_HMM_Var *newParam);
- /* rdhmmdef_streamweight.c */
- HTK_HMM_StreamWeight *get_streamweight_data(FILE *fp, HTK_HMM_INFO *hmm);
- void def_streamweight_macro(char *, FILE *, HTK_HMM_INFO *);
--void sw_add(HTK_HMM_INFO *hmm, HTK_HMM_StreamWeight *new);
-+void sw_add(HTK_HMM_INFO *hmm, HTK_HMM_StreamWeight *newParam);
- /* rdhmmdef_data.c */
- void def_HMM(char *, FILE *, HTK_HMM_INFO *);
- HTK_HMM_Data *htk_hmmdata_new(HTK_HMM_INFO *);
--void htk_hmmdata_add(HTK_HMM_INFO *hmm, HTK_HMM_Data *new);
-+void htk_hmmdata_add(HTK_HMM_INFO *hmm, HTK_HMM_Data *newParam);
- /* rdhmmdef_tiedmix.c */
- void tmix_read(FILE *fp, HTK_HMM_PDF *mpdf, HTK_HMM_INFO *hmm);
--void codebook_add(HTK_HMM_INFO *hmm, GCODEBOOK *new);
-+void codebook_add(HTK_HMM_INFO *hmm, GCODEBOOK *newParam);
- /* rdhmmdef_regtree.c */
- void def_regtree_macro(char *name, FILE *fp, HTK_HMM_INFO *hmm);
- /* rdhmmdef_hmmlist.c */
\ No newline at end of file
diff --git a/app-accessibility/julius/julius-4.3.1.ebuild b/app-accessibility/julius/julius-4.3.1.ebuild
deleted file mode 100644
index 898a2b4..0000000
--- a/app-accessibility/julius/julius-4.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MAGIC=60273
-
-inherit eutils
-
-DESCRIPTION="High-performance, two-pass large vocabulary continuous speech recognition"
-HOMEPAGE="http://julius.sourceforge.jp/en_index.php"
-SRC_URI="mirror://sourceforge.jp/${PN}/${MAGIC}/${P}.tar.gz"
-
-LICENSE="julius"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-LANGS="ja"
-
-DOCS=( 00readme.txt Release.txt )
-
-for LNG in ${LANGS}; do
-	IUSE="${IUSE} l10n_${LNG}"
-done
-
-DEPEND="
-	>=sys-libs/readline-4.1
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	sys-libs/zlib
-"
-RDEPEND=${DEPEND}
-
-src_install() {
-	local l
-	for l in ${LINGUAS}; do
-		DOCS+=( 00readme-${l}.txt Release-${l}.txt )
-	done
-	default
-}
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
deleted file mode 100644
index f9d4a98..0000000
--- a/app-accessibility/julius/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/rhvoice/rhvoice-9999.ebuild b/app-accessibility/rhvoice/rhvoice-9999.ebuild
index 1c097e5..7c04c53 100644
--- a/app-accessibility/rhvoice/rhvoice-9999.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-9999.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit scons-utils eutils toolchain-funcs multilib git-r3
+inherit python-any-r1 scons-utils eutils toolchain-funcs multilib git-r3
 
 DESCRIPTION="A speech synthesizer for Russian (and similar) language"
 HOMEPAGE="https://github.com/Olga-Yakovleva/RHVoice"
 EGIT_REPO_URI="https://github.com/Olga-Yakovleva/RHVoice"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND="
 	${RDEPEND}
-	dev-lang/python
 	app-accessibility/flite
 	dev-libs/libunistring
 	dev-libs/expat
@@ -29,12 +27,12 @@ DOCS=(README)
 # TODO: multilib support (just in case)
 
 src_compile() {
-	escons prefix=/usr sysconfdir=/etc libdir=/usr/$(get_libdir)
+	escons prefix=/usr sysconfdir=/etc libdir=/usr/"$(get_libdir)"
 }
 
 src_install() {
 	# Dirty hack, since it fails to install with multijob
 	SCONSOPTS=""
-	escons DESTDIR="${D}" prefix=/usr sysconfdir=/etc libdir=/usr/$(get_libdir) install
+	escons DESTDIR="${D}" prefix=/usr sysconfdir=/etc libdir=/usr/"$(get_libdir)" install
 	einstalldocs
 }
diff --git a/app-accessibility/svox/svox-9999.ebuild b/app-accessibility/svox/svox-9999.ebuild
index c1adc7c..4bec518 100644
--- a/app-accessibility/svox/svox-9999.ebuild
+++ b/app-accessibility/svox/svox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools git-r3
 
@@ -12,18 +12,15 @@ HOMEPAGE="https://android.googlesource.com/platform/external/svox/+/master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="+pipe"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/patches")
+PATCHES=("${FILESDIR}/patches/conditional/pipe.patch")
 
 S="${WORKDIR}/${P}/pico"
 
 src_prepare() {
-	use pipe && PATCHES+=("${FILESDIR}/patches/conditional/pipe.patch")
 	default
 	eautoreconf
 }
diff --git a/dev-embedded/lm4tools/lm4tools-9999.ebuild b/dev-embedded/lm4tools/lm4tools-9999.ebuild
index d87d32a..ece5beb 100644
--- a/dev-embedded/lm4tools/lm4tools-9999.ebuild
+++ b/dev-embedded/lm4tools/lm4tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ HOMEPAGE="https://github.com/utzig/lm4tools"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0"
-IUSE=""
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
deleted file mode 100644
index b1823e2..0000000
--- a/dev-embedded/openocd/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>dev-embedded</herd>
-	<maintainer>
-		<email>fercerpav@gmail.com</email>
-		<name>Paul Fertser</name>
-		<description>Upstream contact. CC him on bugs</description>
-	</maintainer>
-	<use>
-		<flag name="blaster">Enable support for Altera USE-Blaster</flag>
-		<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
-		<flag name="dummy">Build the dummy port driver</flag>
-		<flag name="minidriver">Build the dummy minidriver</flag>
-		<flag name="ftd2xx">Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-		<flag name="parport">Enable support for parport JTAG devices</flag>
-		<flag name="presto">Enable support for AXIS PRESTO devices</flag>
-		<flag name="segger">Enable support for the Segger J-Link JTAG</flag>
-		<flag name="stlink">Enable building support for the ST-Link JTAG Programmer</flag>
-		<flag name="versaloon">Enable building support for the Versallon-lInk JTAG</flag>
-		<flag name="verbose-io">Verbose IO and comm JTAG and USB messages</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">openocd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
deleted file mode 100644
index 5f112f4..0000000
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev autotools git-r3
-EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-EGIT_SUBMODULES=("-*libjaylink" "-jimtcl")
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND="
-	>=dev-lang/jimtcl-0.76
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( >=dev-embedded/libjaylink-0.1.0 )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	>=sys-apps/texinfo-5
-"
-
-src_prepare() {
-	default
-
-	AT_NO_RECURSIVE=yes eautoreconf
-}
-
-src_configure() {
-	# Here are some defaults
-	local myconf=(
-		--enable-buspirate
-		--disable-werror
-		--disable-internal-jimtcl
-		--disable-internal-libjaylink
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-arm-jtag-ew
-		--enable-sysfsgpio
-		--enable-bcm2835gpio
-	)
-
-	# Adapters requiring usb/libusb-1.X support
-	if use usb; then
-		myconf+=(
-			--enable-aice
-			--enable-usb-blaster-2
-			--enable-ftdi
-			--enable-ti-icdi
-			--enable-ulink
-			--enable-osbdm
-			--enable-opendous
-			--enable-usbprog
-			--enable-rlink
-			--enable-stlink
-			--enable-vsllink
-			--enable-armjtagew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	else
-		myconf+=(
-			--disable-aice
-			--disable-usb-blaster-2
-			--disable-ftdi
-			--disable-ti-icdi
-			--disable-ulink
-			--disable-osbdm
-			--disable-opendous
-			--disable-usbprog
-			--disable-jlink
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use jlink; then
-		myconf+=(
-			--enable-jlink
-		)
-	else
-		myconf+=(
-			--disable-jlink
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb_blaster
-			--enable-openjtag
-			--enable-presto
-		)
-	else
-		myconf+=(
-			--disable-openjtag
-			--disable-presto
-			--disable-usb_blaster
-		)
-	fi
-
-	econf \
-		$(use_enable dummy) \
-		$(use_enable cmsis-dap) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
-	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
-}
-
-pkg_postinst() {
-    elog "To access openocd devices as user you must be in the plugdev group"
-}
diff --git a/media-gfx/sweethome3d-bin/metadata.xml b/media-gfx/sweethome3d-bin/metadata.xml
new file mode 100644
index 0000000..475bbb3
--- /dev/null
+++ b/media-gfx/sweethome3d-bin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mva@gentoo.org</email>
+    <name>Vadim A. Misbakh-Soloviov</name>
+  </maintainer>
+  <use>
+    <flag name="gtk3">Use GTK3 interface bindings</flag>
+    <flag name="system-java">Don't use bundled JRE packages</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Ultimaker/Cura</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild b/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild
index cfb80c7..44de6bb 100644
--- a/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild
+++ b/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
 	system-java? ( app-eselect/eselect-java )
 "
-
 RDEPEND="
 	system-java? ( virtual/jre:* )
 "
@@ -57,6 +56,6 @@ src_install() {
 	exeinto /usr/share/"${PF}"
 	doins -r *
 	doexe "${MY_PN}"
-	dosym /usr/share/${PF}/"${MY_PN}" /usr/bin/"${MY_PN}"
+	dosym ../../usr/share/"${PF}"/"${MY_PN}" /usr/bin/"${MY_PN}"
 	make_desktop_entry "${MY_PN}" "${MY_PN}"
 }