gentoo resync : 05.04.2018

6 files changed, 28 insertions, 4 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 485e2e09b75d..b1a3200fdfaa 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index 6a9e2fcc5f22..a26d2c0ff60f 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -3,7 +3,8 @@ AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea
 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 epos-2.5.37-gcc7.patch 593 BLAKE2B 10d992f2f886318904dbbaab4707f453ee846e469415b9467ff0e05d586466b5bc176f41b5805f744dc7873fd7223372a59909fedc946cd9d950efd7b4bc7c8d SHA512 b19d218dc3387efb2e9ea8d444692821c53a9cc77ab8541ad7b95a280478983fd8644fbe8dca305539c487c06c60a2b67dae09bd1e3776e3f2a07cb26631b46c
 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 898 BLAKE2B 2f8a3c0f61b7bb3a4a94bec5de3e0be4c7fbb2fa97a2c374d7eb0671adb4b32f6593dbf99735e1c4792a8b515dd1c9f6d2b6553bdc4c82e9618548f1bf4df954 SHA512 c911d5602f9de366b72e35dfa3d32b1b66cb1f2d5d0577c40eea233074231c442978ca637ef8cc2ecb1b0768849ba8b63cac52f49607df7263bd5a0f41143f6d
+EBUILD epos-2.5.37-r2.ebuild 937 BLAKE2B 38e6e60a5b6e25e8259aee75a531de07be3a72864d84eabf8a30050f1386f12330d3aebf63c1b1c41e2f13495db7d94f11dc7f19e7befd981e13969c07d5cfbe SHA512 363f4fde319b70dbf4d2bddf64c0556b1db225ca5b5dc171600a0c46f219ab1c50a255ef56e6ff3bdffa2dd5f16ca14867c348d58fe9316f61f546fb73b4080c
 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 65a83ff55fef..216717c781b9 100644
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
 	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
 	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
 )
 
 src_prepare() {
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
new file mode 100644
index 000000000000..6c889a662c2a
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/638596
+
+--- a/src/nnet/matrix.cc
++++ b/src/nnet/matrix.cc
+@@ -63,7 +63,7 @@
+ template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (cols == y.cols);
++	this->assert (cols == y.cols);
+ 	if (cols != y.cols) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
+@@ -80,7 +80,7 @@
+ template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
+ {
+ 	int i,j,k;
+-	assert (rows == y.rows);
++	this->assert (rows == y.rows);
+ 	if (rows != y.rows) { retval.Realloc (0,0); return; }
+ 
+ 	T sum;
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 6d16e7e528e2..b74f8d9e873c 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,5 +4,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 EBUILD speech-tools-2.1-r2.ebuild 2702 BLAKE2B 9842d6916cb0e63163c012196f508c0377a473ddaeef30a670e815d96ae30b43a60c838aca9980360c416c9265db32f94fbd2ab9eb150051f43f0b32bd1afe97 SHA512 35d8852ae1e0e94ae7663e489cbb7277efe155fce213d2a323e56b1225950b8455b4e83a824aea84b39a244eebc22f2c6b94820574692c8da276181a57b933da
 EBUILD speech-tools-2.1-r3.ebuild 2985 BLAKE2B 7ed28e6f05a49c83495e85c8f2c8376fdc5eec78fe548f7308cc260174e0dbcb76edfce511a2e1176836a5ca2a7aa5e979a06fc0e2e8d20ed9780089aa02e853 SHA512 90950552bb5d5634bd28d5d538b452b86a9246b92142f591faed49587b010f461721df7092f986dec05081d340222f2d324f899278fcd38fd6d29b7478d95ff3
-EBUILD speech-tools-2.1-r4.ebuild 3068 BLAKE2B 67ad3974c96272f359911b1ef7aaf98607ecb66e3649acd7c80cdcf3ceaeb2a295bed5e2b7050df85455672bcf1ecf7590195ed165547493691fe4ea61f974eb SHA512 2bd37315aac301e1a5960263340afcc934d156fd391b242d2e534742554c837216b4e21e4295b1041a5c5b388cb8aca18974da2bd0456b9f9c1810ebf9324faa
+EBUILD speech-tools-2.1-r4.ebuild 3065 BLAKE2B 29ea31b2e77cd0b699d7da6153e49086fc8a7b59e9ea4bfd364f6651ac7b1ef82e82b54872299342f8b242a816df50ad77b7cf587bd23167d2c0a5ae87c5da8c SHA512 ccf8bbb6c51fb0e7283568c7688f80316b810a0f63982995ced5d39bd3e7157995c05f5d37e83a3d3cade9c6e2be7909c5736fbeb09ecb7e529bc06d1d2a12f5
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
index 495fb2fc75b6..3b7f386dbf4d 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
 
 RDEPEND="