gentoo resync : 27.03.2018

5 files changed, 24 insertions, 22 deletions

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)