gentoo resync : 09.03.2018

4 files changed, 7 insertions, 5 deletions

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 060302a9eb68..91acfbeed361 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -14,10 +14,10 @@ DIST go1.9.1.src.tar.gz 16377700 BLAKE2B 63558227bdbff43da788c43e082e54dfa0210e5
 DIST go1.9.2.src.tar.gz 16383591 BLAKE2B 3ad9d0e7b6b817a4eab7ffcca30ba86a0e50e68ed028b11f54b8813f4b1a9a0598c79d501c733e7fbf77831c8f7df681692f9aa6b860b16a6288dcab59d40226 SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5
 DIST go1.9.3.src.tar.gz 16385451 BLAKE2B 0d16eba4d411a5ddb1915a305725e9762874568abb048cc5c8939e82481d7d530902d532b62c8fe10fe7e31465617171d17cb5aaf3ee51aa29b9a66837bf6874 SHA512 31c564af58b78c648c9bece8fa2ed3334feb80316b07b16f6286319e26d317da90d1af0464c3a2f776a3da72d31b22b063dbc620b93114bf142a11e8a625e527
 DIST go1.9.4.src.tar.gz 16392325 BLAKE2B c5a503e8c539f31a1bbef9c6d89263b7214fb433476830c205153aa07ee0debc273eb004dddd662f81cc6cd2d4d949af654a4f4db1c890530feadc90ce05e630 SHA512 1a7c830e07507ff7b89025adfb5c713444d97301f8ad47ef2564722c1e28186e946350f07e22777fbdd6f2f589c334eb01dfd589e97cb8a86f73669547badb0b
-EBUILD go-1.10.ebuild 5584 BLAKE2B 235e48cd961466acd6fa167d10425588aba877b407f5b0abaeae2b69df440c528e7a6f217ea0d7d677d119be740523bf874aff9655e4f59704fade25d25fed84 SHA512 3794c681a1dccdcd4d644265b303a3f5b272d548694a3a07f1352133f1a7d918518a5c6165980e5a51828228a6740121a36cf1f5dcd399c974cb27b4b12728e4
+EBUILD go-1.10.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 EBUILD go-1.9.1.ebuild 5581 BLAKE2B ad0fc38ca45942e4047137143513d7ce9c8a473278dca5b941b377e0454407d2878e625854448d3898cf5f3f9c4fc37a5e43f84d3e1c8e79da055dfecc0651dc SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997
 EBUILD go-1.9.2.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
 EBUILD go-1.9.3.ebuild 5584 BLAKE2B 235e48cd961466acd6fa167d10425588aba877b407f5b0abaeae2b69df440c528e7a6f217ea0d7d677d119be740523bf874aff9655e4f59704fade25d25fed84 SHA512 3794c681a1dccdcd4d644265b303a3f5b272d548694a3a07f1352133f1a7d918518a5c6165980e5a51828228a6740121a36cf1f5dcd399c974cb27b4b12728e4
-EBUILD go-1.9.4.ebuild 5582 BLAKE2B 6a7be60c188e532ab80cb1c27b99b936bef472aa6fda0ccf8fa83abbcbef9e4829e1401283f96fa22d21758884d1ef73203f186a1954c28ff3a8fc39dbbb6409 SHA512 5557757a7121bc35e09bdd2f6f6d68f9d8a7b38add4633c020c26930104fc34c33a6a090b1a2bb100202e63fd70500196b900e4e7e3ef44034e901ae57d83ea3
-EBUILD go-9999.ebuild 5584 BLAKE2B 61972a420ecaceb45bd90c22c57e4b297766f018b9d6c9acd17add96e70c4c5a43d415e25f726151558d043ae6d1c4d6cee880cc2601ee289f9942e2dce431f9 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7
+EBUILD go-1.9.4.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
+EBUILD go-9999.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.10.ebuild b/dev-lang/go/go-1.10.ebuild
index 480b7faabc23..503bf3c4a123 100644
--- a/dev-lang/go/go-1.10.ebuild
+++ b/dev-lang/go/go-1.10.ebuild
@@ -64,6 +64,7 @@ RDEPEND="!<dev-go/go-tools-0_pre20150902"
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="
 	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
 	"
diff --git a/dev-lang/go/go-1.9.4.ebuild b/dev-lang/go/go-1.9.4.ebuild
index 9b087eab782f..3d97b87631e8 100644
--- a/dev-lang/go/go-1.9.4.ebuild
+++ b/dev-lang/go/go-1.9.4.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 2ac936f0164a..503bf3c4a123 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.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=6
@@ -64,6 +64,7 @@ RDEPEND="!<dev-go/go-tools-0_pre20150902"
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="
 	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
 	"