gentoo resync : 27.03.2018

23 files changed, 150 insertions, 142 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index da62e3146dcc..73be54ee9cda 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 154b8d7fe01a..57f601c7eedc 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,9 +1,9 @@
 AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8
-AUX brltty-5.2-respect-AR.patch 433 BLAKE2B 20fc18a063bc568925646d6d21fe6c59c33105957f9de155ea9046cac95bf1319bdeab3cecf5d0016d72a5a2f484534bb6eec8aa9d4ae4f6f5d325a6ee6c27bd SHA512 ce778cded4ee6f9ac45faedd3727c58746e780cff944d2c39ff71f792905c7f214b104641aef72a233d07df74a92cc2a596ac6bac1b76873d82d2c1383e994e9
+AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce5c837b1d1358f405df9e485aab9041b8612dfffa78d30cf90814668e8234b947b43f933d80e8e00e5c618ae8e768 SHA512 2b8de99e98e257041d7a2131775a936166f183197dc02a242cb9efaebebc19afed45292defa9567f86f8ce71e32458743b8c2d3361b1b290f6c93df88e83b1ff
 AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
-AUX brltty-5.2-udev.patch 1208 BLAKE2B c8fc47d9ea27ca78c4634be47d43f406ba0875eb1b4a19048c264faa602918ac96024b03f56c642722cc9eabdbbe9a9f9005ca4de0d39538f746ed4ecadce3dd SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd
+AUX brltty-5.2-udev.patch 1025 BLAKE2B 8c83d2cf3dd09f4ee73d1dad104518449ca1136768945c879dfffa1774f7d11fac14dad53f3da840bebd77d72f10c2ed9ed6ebb69ab1ffb17bc69cc226296501 SHA512 3ef8e8ea2f7e03c88079b7cf91930ca0a86c0b383202d5e70c63419ead9e2e607812ad966e0eccce90615b3eed8600d71c63a0eabc1a01587ca959a29a484d8c
 AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
-EBUILD brltty-5.2-r1.ebuild 5112 BLAKE2B afc15556445260c79c2b3ff61bc4ff6ccaa9bcc80f06b5a036a3824d34bda1a7ed9f0e66b1c34b528dcf1ffa23a3c34797699eed9eaec4bf8552246d33927b8f SHA512 59f032ac4b272aaa9c89cf375e067e1070db2d3c462ba70197dd9ddd8ccb979bdf03df0e0587899a701a5e01b9f8ab0ef5ad5878199fa3767f6bed161319e44b
+EBUILD brltty-5.2-r1.ebuild 5229 BLAKE2B 9cda4dc74de430bd9f117e8dfd27c68a3aa726d251eec55a92dff78f763e7bbccc4bf53e00d561d85964fdd21858b1790c4ae58ec773703db9c3827dc6489593 SHA512 b3fd19b4318e1202b96ab46ecd5ac80601da4f9c8895e5f4b83db10c2294a4314683a7d4b023ef162d46f9c0914ae08599b3adf0a66e41a67bfc859b6bd94dec
 MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f9..3622819ef62d 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+	"${FILESDIR}"/${PN}-5.2-udev.patch
+	"${FILESDIR}"/${PN}-5.2-respect-AR.patch
+	"${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-		"${FILESDIR}"/${P}-udev.patch \
-		"${FILESDIR}"/${P}-respect-AR.patch \
-		"${FILESDIR}"/${P}-sysmacros.patch
+	default
 
 	java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
 	libdir="$(get_libdir)"
 	mkdir -p "${D}"/usr/${libdir}/
-	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
 	gen_usr_ldscript libbrlapi.so
 
-	cd Documents
-	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+	cd Documents || die
+	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
 	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-	dohtml -r Manual-BRLTTY
 	if use doc; then
-		dohtml -r Manual-BrlAPI
 		dodoc BrlAPI-*.txt
+		HTML_DOCS="Manual-BRLTTY" einstalldocs
 	fi
 
-	keepdir /var/lib/brlapi
-	rmdir "${D}/run/brltty"
-	rmdir "${D}/run"
+	keepdir /var/lib/BrlAPI
+	rmdir "${D}/run/brltty" || die
+	rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
 	elog
-	elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+	elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
 	elog
-	elog To make brltty start on boot, type this command as root:
+	elog "To make brltty start on boot, type this command as root:"
 	elog
-	elog rc-update add brltty boot
+	elog "rc-update add brltty boot"
 }
diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b77..c5698a2b9399 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
---- brltty-5.2/Programs/Makefile.in	2014-11-06 07:28:41.000000000 -0800
-+++ brltty-5.2-new/Programs/Makefile.in	2014-11-20 05:41:57.144219093 -0800
+--- a/Programs/Makefile.in
++++ b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
  	[ ! -f lib.def ] || mv lib.def $(API_DEF)
  
diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc29897662..e6d56603b013 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules brltty-5.2-new/Autostart/Udev/udev.rules
---- brltty-5.2/Autostart/Udev/udev.rules	2014-11-06 07:28:41.000000000 -0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules	2014-11-20 05:28:44.404885312 -0800
+--- a/Autostart/Udev/udev.rules
++++ b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index 0721e7b27c99..6a9e2fcc5f22 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 108 BLAKE2B 1cd107977e2ed79c26266edf888bb1e33945ac17170f8c7487dd9f2997c0cdbdcaba71f72b250b822aba5f5e152b5728570354be238cc5c68e82c33d38e56a23 SHA512 84afee5caf9c1703f10846e77c1bdc9e298a1d560ffe34b0d8f3b570001f45ca059b86860f62ebdf84ee811aaee7f2d2753db069bb7cb977abfb7ac2b3009829
-AUX epos-2.5.37-disable-tests.patch 579 BLAKE2B 0cf0c7365306ebd4816527c85c22b5e8e78ab34dffa76496d9cde000a414b3cffe24bcc280934f93a52e974fb3f79eaa9213d67619b1fd2d3d02ec3a42ed9851 SHA512 67ad549aa4de7f26a6cbd352d2229176b90cd9a7b4b5e2dbfc04fccba6769149355593b11d1921219a44c1fa9b5ce266ab3dca0a674cd7a8f7e2a849ceb2ca95
-AUX epos-2.5.37-gcc43.patch 504 BLAKE2B 652d125e1870eded0656bee6d675047f9775a5accaffff30347f813254a4054b49cdfe397eec4fe7eac42ac9ee59c343129c6c34b8853dae1055329483f397b0 SHA512 ea70a8e8240d57a3efbe8441200ca0318fec11c021b1c241ca96f5679488ad82b4efde8b88ae3d4bdfea564d14192137083cd1084f04ce45a7f49d499f9fe6d2
-AUX epos-2.5.37-gcc45.patch 503 BLAKE2B e3c97865c4bb011dd79ee253c24ff429537d5b355444e410b760ba9669e0d6e1f6f0bdf94c48622973a4330d16cd1fca65461a27fa0c0d6df90a686751527603 SHA512 318752841db38d35ea13e9a053e85251e9c777d6e6a1812c27ccc2310ee6d258b238d1f2915f34da1c84eac5cf6b4eee85d0d67b4dad7c83862ed9f291819d72
+AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea4101b4ac1e3756ce4950c66b07ee216a3e76afad903ea580b5bcdbebb2b2ee8a10214a22edf01eab5c51efff0144a7e9 SHA512 63e5026789e35b2dbf00479539ca2b7fd0567a9ff018337d14334f54f4840c0aa723e7fe44c29a6fa3709ba4130750da8fb886c65513d4d71cbf0bd026681e2e
+AUX epos-2.5.37-gcc43.patch 454 BLAKE2B 6a3db8a49d3368c50bc78b2f3eadd83e46e3408b84b5a2784849f72d073db59b322356e39962fed9c822b8c3baf62f958e0943cd58dbb77b50316467f6b05794 SHA512 34c0b51a722c75e088315202c62dbf42086bd4fa4da19b1c788c759f4c21fee26a6d7c1a414af34c4ec10d30ac8bf7ea7b65c9f3b96779dce5b40201e3611e4d
+AUX epos-2.5.37-gcc45.patch 507 BLAKE2B 03760db124cfc94c69512f710b3e84704c2bf910e54b632a4cc5a3c563fa15fbd2fcb244cdd770b34873ec7d42bf77ac3784f22a561250926aa85da98aa4636c SHA512 7dfd25ebab3bbe2cd91ccb61945d444215b7ae0f087637d47b5ce422a9b8ab6bf392a614983a49037ac937fdfcb0e6c3091fa39e443e6084348baa0c4f1fb360
 AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e071b3ce9d2b188c05dda89845f07d545f4b22fab9c74900ccb1c79310bc34dbf6363f6654bf1e184cb786571c4 SHA512 84a5d979fa59eaeef6f560494d67918580eb4574dada052cbf926440a0a960027c50b36284e0870f746b2a5f13f909946661174ce8d6f155d1ea0f6d202c334f
 AUX eposd 442 BLAKE2B ac420143183e28654de3289fe0d27c9582a2b53024048c7beb4fce4287d38ef0f585cd9a449f92d999bfcf4c382ea8f86d25750655d222e87e2f28416fad076d SHA512 3a60ab455b7c00ece42a759fb98bc3e9948134839f709ed16123e39a323f24fa166907f981f65510d83f2fcc52697a2535cfafb4e7ccbb0f3d8c116123f662ed
 DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef
-EBUILD epos-2.5.37-r2.ebuild 872 BLAKE2B 46fccc56e153e9500b45af1ba1519528b634de6c5537b7abfb24fb8d8c01aadec290a70db30ad88d41d872c67a1b3985e1e66e69151a9f7e5725f17697c08800 SHA512 edfd2cd42d240df8b0cc5c46db4ad09f753b78a3ea9edfc38f390a152759b14ac992776ae9a8c8ecd42ed4026ce697e2e201a7a0d8fac9d6d385addc88f97574
+EBUILD epos-2.5.37-r2.ebuild 898 BLAKE2B 2f8a3c0f61b7bb3a4a94bec5de3e0be4c7fbb2fa97a2c374d7eb0671adb4b32f6593dbf99735e1c4792a8b515dd1c9f6d2b6553bdc4c82e9618548f1bf4df954 SHA512 c911d5602f9de366b72e35dfa3d32b1b66cb1f2d5d0577c40eea233074231c442978ca637ef8cc2ecb1b0768849ba8b63cac52f49607df7263bd5a0f41143f6d
 MISC metadata.xml 343 BLAKE2B 77d619d13082c8c8248f671c4e29031867028a05373e9ae48950a1d88540f3b1e5529739ef6e1a1479e04e3e6abd4556d1fd8cf39e5f10481d97110ecb0373d6 SHA512 0a3cbb37dfe8c2627ad7082f9f910c949d9f2477068ad7c68bb17658f0331bc7c736e84c452afa2204eb7fbd01c2edd68583800fcaec6962e456743999b0457d
diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild
index 6f6c90eff6be..65a83ff55fef 100644
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="language independent text-to-speech system"
-HOMEPAGE="http://epos.ure.cas.cz/"
+HOMEPAGE="http://epos.ufe.cz/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,12 +18,15 @@ DEPEND=">=app-text/sgmltools-lite-3.0.3-r9
 	dev-util/byacc"
 RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc45.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-disable-tests.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.37-gcc43.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
+	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+)
 
+src_prepare() {
+	default
 	sed -i -e "s/CCC/#CCC/" configure.ac || die
 
 	eautoreconf
diff --git a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
index a877ca68486b..7556e7995a15 100644
--- a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
+++ b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
@@ -1,6 +1,5 @@
-diff -uNr epos-2.5.37.org/src/tests/Makefile.am epos-2.5.37/src/tests/Makefile.am
---- epos-2.5.37.org/src/tests/Makefile.am	2012-04-14 00:38:56.000000000 -0400
-+++ epos-2.5.37/src/tests/Makefile.am	2012-04-14 00:39:10.000000000 -0400
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
 @@ -1,11 +1,9 @@
  ##	Process this file with automake run in the top directory to yield Makefile.in
  
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
index 4a61b5ffd04b..c8b1dee857ad 100644
--- a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
@@ -1,5 +1,5 @@
---- epos-2.5.37.orig/src/nnet/neural.cc
-+++ epos-2.5.37/src/nnet/neural.cc
+--- a/src/nnet/neural.cc
++++ b/src/nnet/neural.cc
 @@ -38,7 +38,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -9,8 +9,8 @@
  #include <time.h>
  
  /*
---- epos-2.5.37.orig/arch/win/service/install.cpp
-+++ epos-2.5.37/arch/win/service/install.cpp
+--- a/arch/win/service/install.cpp
++++ b/arch/win/service/install.cpp
 @@ -23,7 +23,7 @@
  #include <winsvc.h>
  #include "service.h"
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
index 70af1db94407..cbc056dded9f 100644
--- a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5
 
 http://bugs.gentoo.org/show_bug.cgi?id=318585
 
---- src/nnet/neural_parse.yy
-+++ src/nnet/neural_parse.yy
+--- a/src/nnet/neural_parse.yy
++++ b/src/nnet/neural_parse.yy
 @@ -255,7 +255,7 @@
  
  int yyerror (char *s)
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 1e00aa7950c5..55b4187e0d26 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,8 +1,8 @@
-AUX flite-1.4-audio-interface.patch 520 BLAKE2B 065aed446b775ca66e8a637894a1e0c70f730bd2a3834552d7e7cbc67e114a63c9470764c641abadd6cb3c5f240bdb7c56c9c8461be010e1a46c151955872330 SHA512 06fea693abbb186e039cc371ce5cde2b77979964778a7c24d9d2d2de9994898fa8a8f2ff0a341fc97f813f61d6c9e7a011caa0963467398176ec04d69c750283
+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 1806 BLAKE2B 9244bb6bb2ccbd74240bad4557eeda0e05de0885429513fe56c6c2bda28c3d3ba220e92e8304877e52465bb65785c4caf7490404906c3296b60909cf30d6d54d SHA512 87c91fca91e3edb84ef6e6fcffcb67ab9043547fded84ac2f407d02b880350223e860d976564e273ae5efebd9990e303bdd6818291d03fd74118e86c12aa59c5
+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-1.4-tempfile.patch 1413 BLAKE2B 4e87ce5acc26a69148107b0c1d31c62871917a200d6235bb34516456d8a1f30ed17847298e8e002d83c076c08196c2dfe9da49058e68647d3ae52027feddcafb SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df
 DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
-EBUILD flite-1.4-r4.ebuild 1676 BLAKE2B 84e4515c0fd0f7b500468d078eb81cc841676b69bbf023807217aa64e5a995a3bd64ff1a46316c7cb281fa8c31fe671c8a7bf00e24791a9c810c41ffbaf54aaa SHA512 146158506c52445b1552fc0e5fc069acbfd561ca9864d4100b4c35c54d6a4c177aaed0e4bffffd0cce2fcd6b47b70f51c1c4f5388791ae79060a586398e52e99
+EBUILD flite-1.4-r4.ebuild 1713 BLAKE2B 2bf9fe611d3f02058525665658afe45e31a83a1e1fd3189a557b55d986a8c9ff8d928cf1f21cee9bbb9160a4d09161200b280ab797d721afea68285877cd02bc SHA512 169dc7d49d84ca0378b2392f0b21ff8d4d15d06bda1507eda3b742d00dbe55a63dfdfec44a1f488608ceca83c1a613cc09506fb41f9f0638feb9abb47f1e81c7
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
index bc8d25b89bc3..d50428edd5af 100644
--- a/app-accessibility/flite/files/flite-1.4-audio-interface.patch
+++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
@@ -1,5 +1,5 @@
---- configure.in	2009-08-15 06:46:38.000000000 +1000
-+++ configure.in	2011-08-30 00:53:26.000000000 +1000
+--- a/configure.in
++++ b/configure.in
 @@ -304,7 +304,6 @@
  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
          AUDIODRIVER=$with_audio )
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch
index f9295fb853b7..fd8f49059e76 100644
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch
@@ -1,6 +1,5 @@
-diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules
---- flite-1.4-release/config/common_make_rules	2009-07-30 14:52:56.000000000 +0000
-+++ flite-1.4-release.new/config/common_make_rules	2011-03-26 20:22:59.000000000 +0000
+--- a/config/common_make_rules
++++ b/config/common_make_rules
 @@ -68,7 +68,7 @@
  
  FLITELIBS = $(BUILDDIR)/lib/libflite.a
@@ -19,8 +18,8 @@ diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/conf
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
  	@ rm -rf shared_os
---- flite-1.4-release/tools/Makefile~	2009-08-22 20:19:01.000000000 +0100
-+++ flite-1.4-release.new/tools/Makefile	2013-01-20 20:06:34.259527220 +0000
+--- a/tools/Makefile
++++ b/tools/Makefile
 @@ -62,9 +62,9 @@
  LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
  
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
index 536b8f83eea6..54ce1000b6a8 100644
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=6
+inherit autotools multilib-minimal
 
 DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
@@ -18,6 +18,14 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-release
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-tempfile.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
@@ -29,11 +37,8 @@ get_audio() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tempfile.patch
-	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
-	epatch "${FILESDIR}"/${P}-respect-destdir.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-audio-interface.patch
+	default
+
 	sed -i main/Makefile \
 		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
 		|| die
@@ -61,7 +66,7 @@ multilib_src_install_all() {
 	dodoc ACKNOWLEDGEMENTS README
 
 	if ! use static-libs; then
-		rm -rf "${D}"/usr/lib*/*.a
+		find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
 	fi
 }
 
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
 }
diff --git a/app-accessibility/perlbox-voice/Manifest b/app-accessibility/perlbox-voice/Manifest
index 71704d83fef7..b72201bf5ba1 100644
--- a/app-accessibility/perlbox-voice/Manifest
+++ b/app-accessibility/perlbox-voice/Manifest
@@ -1,3 +1,3 @@
 DIST perlbox-voice-0.09.noarch.tgz 1316675 BLAKE2B 2684c891c7cf688976a4024133b32460fdfda455c7e682ca972eacfb84959ec123e04f03d39313bea8afaf928b11cd6d9d219a338ade764818d4c653bc1224b7 SHA512 db461c4b60003383cc14d25dbc6fdbc82069f588dae14434d6d29efa809c566b36c38f4311271492a9c35e965fed8fcdccf0debf06dc121c10fec460211387c6
-EBUILD perlbox-voice-0.09-r2.ebuild 562 BLAKE2B f009b504fca9cc14bbb36f11aed79efbb9022abf62142daa0ccae135b5c0a7ee9d031667df70c6429b769c6e0d4f61e4bd42ab8f4196ab9b9ad9e25c1509118e SHA512 61d70a9807d48bd7c4a14c7e36f440638731301cc10a546d7938b40f576e100b49bebf6fccfe301db5832ab8854f08deaf646f85f2154d57fb0d0b6ce6fa27b3
+EBUILD perlbox-voice-0.09-r2.ebuild 562 BLAKE2B c60a32b6c819eb83c9bcb3435856ac0f3c486504238acb7dc48d296b93bbb127fd6fc937a4771a40e937ef79534ba2c238b8d64e804283da0ddb0d402003f21c SHA512 f392fdcab967a93be814061c6750ff23a5eabdaa295df34b92628f70e7f6571ade93cb9c286ab7354c8ab346befb363d937462ca104783b228f5012ea795cb21
 MISC metadata.xml 244 BLAKE2B e9ba31e8b01f3ee6ff7a098b1cdf886d08c41c10536bbad83aeca89e0a34e9b4f5e5816d6dbaa5399f4bd2b89f87d714ec12736d286114023f0e2dc42acfb521 SHA512 fe707dfe4f31afb9a8d5fb323fbe09cffc54e895a8863cac7541a01ff26f90a99092cfa4c6b9cca75d5f3d464c283a5be3f87ecd8b01feee9491d7392af902e3
diff --git a/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild b/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
index 656deca16230..692e2dbd2edc 100644
--- a/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
+++ b/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="A voice enabled application to bring your desktop under your command"
 HOMEPAGE="http://perlbox.sourceforge.net/"
diff --git a/app-accessibility/powiedz/Manifest b/app-accessibility/powiedz/Manifest
index a23011bf49b2..f7eda04641a0 100644
--- a/app-accessibility/powiedz/Manifest
+++ b/app-accessibility/powiedz/Manifest
@@ -1,5 +1,5 @@
-AUX powiedz-dsp-handle-fix.patch 427 BLAKE2B b565529be2c883eb059fd2d019be80d82266a93006dfc73963ddb553eba52ebdcaad02aa5753e698dbf8a3f82f5fb70e7076ceb298f8272a7b1ee4dd18ac33c5 SHA512 19f91e6f5c18ca0a63ce949d868b35594b781b0b7585c843de2f4d74aa303ee9b4cd8a72f514b419e1ffcb188747ac53d4b44c8ef9814241755f42b52f8492d8
+AUX powiedz-1.0-dsp-handle-fix.patch 291 BLAKE2B 9f03a4359d8503ea772a13abe837bf6a1893cfc726f100710c40e3b3b9f10e5a2228a6bd1ef8624d200f0fa4947ac9de2d4c07e307a1534e7c1e2cd48ab7e2ce SHA512 99577f0de3961588c3d9d3036f7a19a260ba296fe28fb6379f2eee19ae09fa8691e5e47a09698146f8a73f4b6bc9b4c5c15df9f8d06e270c435c1984b1154e4d
 AUX powiedz.desktop 171 BLAKE2B 79d4483d3ef56bdcfa69731200d43ac394b875c5b00e4e3231d3720086f7f43d0155485f8c1e64f33d04e6bc6ceeb320d6a25f081a5c0fc1fd862fc8f040c323 SHA512 9f3be0578e15ce176edead31ba24c5576614689f9ede473a485c5478f0ad823f21bf411bd13f95799c042f31878aa91f246e9150ebaf299c28ad44d022ad72c0
 DIST powiedz-1.0.tgz 68672 BLAKE2B e6a96ec5f7dcdfc9508d4805e11209f0e7432abd329257710d813a94d8075c0893294a9abd75b811576290ef0b9fc9fcec29cbe04d9ab9ec4537b4bebfedf0ba SHA512 1a572ead0c6358b52ef4b5efc66dd633b2c7cb35c97bc911ce46f54fd84f626ca73b4be9951fb48688abaac4fab41f0a5087dbd89fecc91fc9e42f944e188eb3
-EBUILD powiedz-1.0-r2.ebuild 647 BLAKE2B 9026b97eb3cae4a8da11ac882883c84d6bf90e760f8883cf1543a45eb6df372ee545c82898c1800bef89c89c6ca0f17af62132e98ace34e8c8dfb356bd68d6a0 SHA512 d3540542b2959fd388e977b9ea6bd6917e6a96ee33e4d7fa8fe069fd1b10dc09f16fcdbc15fb2a2cd719648a36d4e851dffbc501972d86e136ba662dab427dad
+EBUILD powiedz-1.0-r2.ebuild 631 BLAKE2B 8d316a9f7b5ff89575bb90808e34eb60a2f6107efb94b29860811373063171aca736cf6968f36551d1cb3da840b86592a0c92dd5dad3864501d3508018f2a3b2 SHA512 afa242398e76db041ec11938ebf4114f3021c669ccbc84e0dfd5d733a94bbcd438b07b7d467ad345113eb3301049d0189de8623b172569f1bb6ad9476c04ca52
 MISC metadata.xml 393 BLAKE2B 934a4030dd96c98a6614bed171bab10582d885d3aeeefb793bb9c5aff190f3a8c59713c085e962dd9b2c56453be49fcdf5ba37c4e2f25dc619740403f93041f5 SHA512 e667c596590296dc51b7125efdc97da72a5e4c4d7e83469b1fa0975f066fb3c78ce4dc91032f3401e01fa107e1f3fec165c9adbe9572aa3163f2dcb7380fc116
diff --git a/app-accessibility/powiedz/files/powiedz-dsp-handle-fix.patch b/app-accessibility/powiedz/files/powiedz-1.0-dsp-handle-fix.patch
index f18761aff89e..fb2852b61c0e 100644
--- a/app-accessibility/powiedz/files/powiedz-dsp-handle-fix.patch
+++ b/app-accessibility/powiedz/files/powiedz-1.0-dsp-handle-fix.patch
@@ -1,6 +1,5 @@
-diff -urN aaa/powiedz/aufile.c powiedz/aufile.c
---- aaa/powiedz/aufile.c	2003-08-30 20:57:37.000000000 +0200
-+++ powiedz/aufile.c	2003-08-31 14:02:42.000000000 +0200
+--- a/aufile.c
++++ b/aufile.c
 @@ -217,8 +217,7 @@
  audio_open(int samp_rate,int disp)
  {
diff --git a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
index 1a1157f50c2c..fc5fe347bd92 100644
--- a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
+++ b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 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="Polish speech synthesizer based on rsynth"
 HOMEPAGE="http://kadu.net/index.php?page=download&lang=en"
@@ -16,9 +16,9 @@ IUSE=""
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-dsp-handle-fix.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-dsp-handle-fix.patch
+)
 
 src_compile() {
 	emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC=$(tc-getCC)