gentoo resync : 27.03.2018

4 files changed, 59 insertions, 59 deletions

diff --git a/app-accessibility/julius/Manifest b/app-accessibility/julius/Manifest
index cdb2c5a3579a..c5cf9e4b611f 100644
--- a/app-accessibility/julius/Manifest
+++ b/app-accessibility/julius/Manifest
@@ -1,5 +1,5 @@
-AUX julius-4.2.2-install.patch 9771 BLAKE2B e4e68e10633bc6e06e55758d9f24d3988c9e8aa4bde64a179aecfa80576c869e4250dd6e48f69e502346623ed25108d7c5f9ad848107e11f4def8bfc65cee0d8 SHA512 5a25ce1fcee2c1a4bb8c029729e962f8889099a3c5452f769e9d86ed465a28e951b657afd8664f2721b42727ccf73f4c443d1087edc2103f54505045f8b936b4
-AUX julius-4.2.2-ldflags.patch 261 BLAKE2B 5dba2c37b37f01493a80c8b7c2e7ec2e5dc12b870ea04ec3bab278436d8a2a741c09c96dc1bcf7721635bbe9f1a3045fa37a1dbad9108fe1feea07276839d654 SHA512 76158c7beee64247c1b4923f79f3bc608324afdab179a0c8eebab3a77d34ca73911f473498c705ea7601976fbeccb8a22a2e4736d631182c51281069a2e8f461
+AUX julius-4.2.2-install.patch 9287 BLAKE2B 8cb38d56d664996354e8489f9bdc37b696e03f86bac18dd9f521e2512a228afd1a95bbb738d1d5318de10fb847a0135db0573a3e6b315225bf288cdc0f428e00 SHA512 d757ac3ec1643ec441c54938c201eb88eebb27e084e753bd5555f91e94421398fc8085810e600314dd7942867298b4170e8abcd0f67960a8971bb397e147a01c
+AUX julius-4.2.2-ldflags.patch 239 BLAKE2B e7b89f42b368df7142e412296e3c652f186f66d21244f9fa1fe6bad6411d1e79fa0df4887afc388078bd810783eedf897a60f93fb14a89afd60de297bac079c7 SHA512 23a4855af3abad321c96642b8e63004a30f262044b3f8debe936c39b855d3be7b600910f29553c0e077960546d9db336ab737987e4e226a2fc2c2253ca6bb67e
 DIST julius-4.2.2.tar.gz 1720888 BLAKE2B c43fe54a6eb8ad48d1ddf8634115f85369062289516b7ae79ce2dbf7b8bc8610b0fea1cff5716c3ce532f9d5b522cb8e94996c9236a337a3e2d73fd0932d9797 SHA512 c1d6c4016cf326becc2e8945c08cbab9b5acefd0e648b6e35b3078850b1746b5bbdb994fccc66c0adab175fb45fc86c25b8a655047a97c130a2f8e922d3d1c0f
-EBUILD julius-4.2.2.ebuild 1371 BLAKE2B 053390f4cd89214a6c8f2cb696e24a072d334a7972c7b7619ec4e132b08b6f5daca55fe2e100de8228061af41bc86b84215c4035a56c1ccd589a7a70fff24e7b SHA512 76519014651dfbcbd88b5c8015ef786bd455bb8bf67ccc564be27aedd3fb66588aac306bee75bde53b658f4b3329a5ea4f40289712d024861c6a1bac9f986ff8
+EBUILD julius-4.2.2.ebuild 1364 BLAKE2B ea3df00050b3a902a19bdceaecde21b65f03e59e7c2f6657d336316217869b7cb3bbf6d304c4826c09df4dde58b8507b5f05197676c75557bf79df6bd5538130 SHA512 0af4108ebdc711022ea44b7bbdabf2894f56af8f7927e9d874d6fb72f905b37ad1cdd4fce175a1d5114a0167febdfb868c322a7f9a8a7426aaf2c9772043c003
 MISC metadata.xml 348 BLAKE2B ea499c45e21fd6e63288ae466663a68608aee34c183e9a5094060798422047141b5cbb4210ad791d74daf4b2937b27f32bc43af41e5699cf87dc729393242446 SHA512 a537f387dfb607d6f90321336e8002f6bb49169bb6fbbbdfc0135a9c110180529b84c69efbe68f9ed682321d03f65737ad2041fc5a98a97cd72fe1a68b771c1c
diff --git a/app-accessibility/julius/files/julius-4.2.2-install.patch b/app-accessibility/julius/files/julius-4.2.2-install.patch
index d40b6c69fdcc..e8260d9ef0c6 100644
--- a/app-accessibility/julius/files/julius-4.2.2-install.patch
+++ b/app-accessibility/julius/files/julius-4.2.2-install.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Mar 31 20:38:49 UTC 2013
 Subject: respect DESTDIR
 
---- julius-4.2.2/libsent/Makefile.in
-+++ julius-4.2.2/libsent/Makefile.in
+--- a/libsent/Makefile.in
++++ b/libsent/Makefile.in
 @@ -144,16 +144,16 @@
  install: install.lib install.include install.bin
  
@@ -27,8 +27,8 @@ Subject: respect DESTDIR
  
  clean:
  	$(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ 
---- julius-4.2.2/libjulius/Makefile.in
-+++ julius-4.2.2/libjulius/Makefile.in
+--- a/libjulius/Makefile.in
++++ b/libjulius/Makefile.in
 @@ -90,16 +90,16 @@
  install: install.lib install.include install.bin
  
@@ -52,8 +52,8 @@ Subject: respect DESTDIR
  
  depend:
  	makedepend -- $(CFLAGS) -- $(OBJSENT)
---- julius-4.2.2/julius/Makefile.in
-+++ julius-4.2.2/julius/Makefile.in
+--- a/julius/Makefile.in
++++ b/julius/Makefile.in
 @@ -61,8 +61,8 @@
  install: install.bin
  
@@ -65,8 +65,8 @@ Subject: respect DESTDIR
  
  depend:
  	makedepend -- $(CFLAGS) -- $(OBJSENT)
---- julius-4.2.2/mkbingram/Makefile.in
-+++ julius-4.2.2/mkbingram/Makefile.in
+--- a/mkbingram/Makefile.in
++++ b/mkbingram/Makefile.in
 @@ -32,8 +32,8 @@
  install: install.bin
  
@@ -78,8 +78,8 @@ Subject: respect DESTDIR
  
  clean:
  	$(RM) $(OBJ)
---- julius-4.2.2/mkbinhmm/Makefile.in
-+++ julius-4.2.2/mkbinhmm/Makefile.in
+--- a/mkbinhmm/Makefile.in
++++ b/mkbinhmm/Makefile.in
 @@ -32,8 +32,8 @@
  install: install.bin
  
@@ -91,8 +91,8 @@ Subject: respect DESTDIR
  
  clean:
  	$(RM) mkbinhmm.o mkbinhmmlist.o
---- julius-4.2.2/adinrec/Makefile.in
-+++ julius-4.2.2/adinrec/Makefile.in
+--- a/adinrec/Makefile.in
++++ b/adinrec/Makefile.in
 @@ -36,8 +36,8 @@
  install: install.bin
  
@@ -104,8 +104,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/adintool/Makefile.in
-+++ julius-4.2.2/adintool/Makefile.in
+--- a/adintool/Makefile.in
++++ b/adintool/Makefile.in
 @@ -36,8 +36,8 @@
  install: install.bin
  
@@ -117,8 +117,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/mkgshmm/Makefile.in
-+++ julius-4.2.2/mkgshmm/Makefile.in
+--- a/mkgshmm/Makefile.in
++++ b/mkgshmm/Makefile.in
 @@ -23,8 +23,8 @@
  install: install.bin
  
@@ -130,8 +130,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/mkss/Makefile.in
-+++ julius-4.2.2/mkss/Makefile.in
+--- a/mkss/Makefile.in
++++ b/mkss/Makefile.in
 @@ -36,8 +36,8 @@
  install: install.bin
  
@@ -143,8 +143,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/jcontrol/Makefile.in
-+++ julius-4.2.2/jcontrol/Makefile.in
+--- a/jcontrol/Makefile.in
++++ b/jcontrol/Makefile.in
 @@ -31,19 +31,19 @@
  install: install.bin
  
@@ -169,8 +169,8 @@ Subject: respect DESTDIR
 +	$(RM) $(TARGET) $(TARGET).exe jucontrol
  	$(RM) config.status
  	$(RM) Makefile
---- julius-4.2.2/gramtools/accept_check/Makefile.in
-+++ julius-4.2.2/gramtools/accept_check/Makefile.in
+--- a/gramtools/accept_check/Makefile.in
++++ b/gramtools/accept_check/Makefile.in
 @@ -36,8 +36,8 @@
  install: install.bin
  
@@ -182,8 +182,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/gramtools/dfa_determinize/Makefile.in
-+++ julius-4.2.2/gramtools/dfa_determinize/Makefile.in
+--- a/gramtools/dfa_determinize/Makefile.in
++++ b/gramtools/dfa_determinize/Makefile.in
 @@ -35,8 +35,8 @@
  install: install.bin
  
@@ -195,8 +195,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/gramtools/dfa_minimize/Makefile.in
-+++ julius-4.2.2/gramtools/dfa_minimize/Makefile.in
+--- a/gramtools/dfa_minimize/Makefile.in
++++ b/gramtools/dfa_minimize/Makefile.in
 @@ -34,8 +34,8 @@
  install: install.bin
  
@@ -208,8 +208,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/gramtools/generate/Makefile.in
-+++ julius-4.2.2/gramtools/generate/Makefile.in
+--- a/gramtools/generate/Makefile.in
++++ b/gramtools/generate/Makefile.in
 @@ -35,8 +35,8 @@
  install: install.bin
  
@@ -221,8 +221,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/gramtools/gram2sapixml/Makefile.in
-+++ julius-4.2.2/gramtools/gram2sapixml/Makefile.in
+--- a/gramtools/gram2sapixml/Makefile.in
++++ b/gramtools/gram2sapixml/Makefile.in
 @@ -17,8 +17,8 @@
  install: install.bin
  
@@ -234,8 +234,8 @@ Subject: respect DESTDIR
  
  clean:
  	echo nothing to do
---- julius-4.2.2/gramtools/mkdfa/Makefile.in
-+++ julius-4.2.2/gramtools/mkdfa/Makefile.in
+--- a/gramtools/mkdfa/Makefile.in
++++ b/gramtools/mkdfa/Makefile.in
 @@ -18,13 +18,13 @@
  
  install:
@@ -254,8 +254,8 @@ Subject: respect DESTDIR
  
  clean:
  	(cd $(SUBDIR); $(MAKE) clean)
---- julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
-+++ julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
+--- a/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
++++ b/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in
 @@ -43,8 +43,8 @@
  install: install.bin
  
@@ -267,8 +267,8 @@ Subject: respect DESTDIR
  
  clean:
  	$(RM) *.o *~ core
---- julius-4.2.2/gramtools/nextword/Makefile.in
-+++ julius-4.2.2/gramtools/nextword/Makefile.in
+--- a/gramtools/nextword/Makefile.in
++++ b/gramtools/nextword/Makefile.in
 @@ -36,8 +36,8 @@
  install: install.bin
  
@@ -280,8 +280,8 @@ Subject: respect DESTDIR
  
  ############################################################
  
---- julius-4.2.2/gramtools/yomi2voca/Makefile.in
-+++ julius-4.2.2/gramtools/yomi2voca/Makefile.in
+--- a/gramtools/yomi2voca/Makefile.in
++++ b/gramtools/yomi2voca/Makefile.in
 @@ -17,8 +17,8 @@
  install: install.bin
  
@@ -293,8 +293,8 @@ Subject: respect DESTDIR
  
  clean:
  	echo nothing to do
---- julius-4.2.2/generate-ngram/Makefile.in
-+++ julius-4.2.2/generate-ngram/Makefile.in
+--- a/generate-ngram/Makefile.in
++++ b/generate-ngram/Makefile.in
 @@ -33,8 +33,8 @@
  install: install.bin
  
@@ -306,8 +306,8 @@ Subject: respect DESTDIR
  
  clean:
  	$(RM) $(OBJ) *~ core
---- julius-4.2.2/jclient-perl/Makefile.in
-+++ julius-4.2.2/jclient-perl/Makefile.in
+--- a/jclient-perl/Makefile.in
++++ b/jclient-perl/Makefile.in
 @@ -17,8 +17,8 @@
  install: install.bin
  
@@ -319,8 +319,8 @@ Subject: respect DESTDIR
  
  clean:
  	echo nothing to do
---- julius-4.2.2/man/Makefile.in
-+++ julius-4.2.2/man/Makefile.in
+--- a/man/Makefile.in
++++ b/man/Makefile.in
 @@ -19,16 +19,16 @@
  install: install.man install.man.ja
  
diff --git a/app-accessibility/julius/files/julius-4.2.2-ldflags.patch b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch
index a5c3645a52f1..716b7bbfb021 100644
--- a/app-accessibility/julius/files/julius-4.2.2-ldflags.patch
+++ b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch
@@ -1,5 +1,5 @@
---- julius-4.2.2/jcontrol/Makefile.in
-+++ julius-4.2.2/jcontrol/Makefile.in
+--- a/jcontrol/Makefile.in
++++ b/jcontrol/Makefile.in
 @@ -14,7 +14,7 @@
  CC=@CC@
  CFLAGS=@CFLAGS@
diff --git a/app-accessibility/julius/julius-4.2.2.ebuild b/app-accessibility/julius/julius-4.2.2.ebuild
index 7cf68ebb5a72..6c41e4be6171 100644
--- a/app-accessibility/julius/julius-4.2.2.ebuild
+++ b/app-accessibility/julius/julius-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Large Vocabulary Continuous Speech Recognition Engine"
 HOMEPAGE="http://julius.sourceforge.jp/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/julius/56549/${P}.tar.gz"
 LICENSE="julius"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+alsa oss portaudio pulseaudio sndfile"
+IUSE="+alsa l10n_ja oss portaudio pulseaudio sndfile"
 REQUIRED_USE="^^ ( alsa oss portaudio pulseaudio )"
 
 RDEPEND="
@@ -27,15 +27,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.2-install.patch
+	"${FILESDIR}"/${PN}-4.2.2-ldflags.patch
+)
+
 pkg_setup() {
 	tc-export CC CXX
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-}
-
 src_configure() {
 	local mymic i
 	for i in alsa oss portaudio pulseaudio ; do
@@ -49,7 +49,7 @@ src_configure() {
 
 src_install() {
 	default
-	if ! has ja ${LINGUAS} ; then
+	if ! use l10n_ja ; then
 		rm -r "${ED}"/usr/share/man/ja || die
 	fi
 }