gentoo resync : 25.08.2018

32 files changed, 432 insertions, 625 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index b25eea48d707..427a246e31b1 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-bindata-assetfs/Manifest b/dev-go/go-bindata-assetfs/Manifest
index 2ddbf50daea8..10e4641cd956 100644
--- a/dev-go/go-bindata-assetfs/Manifest
+++ b/dev-go/go-bindata-assetfs/Manifest
@@ -1,3 +1,3 @@
 DIST go-bindata-assetfs-0_pre20160822.tar.gz 3798 BLAKE2B 275f8d0601d09534342d7cb2c533b4227b95593039990fcc194a0525f7659451f3375c5cbad10ed8dcbf31bb513224da2c7475c7ec3b0b946625c937cfc000d4 SHA512 1dfb49c0eb0ff52119f19ad4f0f4cf3f0c37b1451f17be54b4d5fd1aff8fea9f28de8a764a995fc6bff8b818628aa7240cbd97b7e7fa5972770aec156eab8739
 EBUILD go-bindata-assetfs-0_pre20160822.ebuild 643 BLAKE2B b798b3a3441df9de2befe2f1403a882b5b6a37322489cda2b56d39e6b026d7de12925fab2159009e4cbfa68c0412272d48a09b362bcc99685f6b0d2a1040f4fe SHA512 76810c045658485bc6af4bbdc4a9c25daa3132e1a29689164845dac183e6053dbcfda58afd039a4f63687a42d20a8a72aeb4731fab80630f2168e64f9f46619a
-MISC metadata.xml 336 BLAKE2B b94df8cd5dc200ae085598201850bcc156f638225897aee2e2a9ca4c53b141ac26c05aa9e4c4dde7c9bceda02c628c5167db9307f890f1c314f6efec73bc567f SHA512 fb12f03f3affdfbe3c498829d6bcc90f4ad2402d2c23ad1b4bdfb19071b5be69aa54cdf49944737a56f1fb6e62c96955b7ceb0689aaa009ebb064ddd3db18abe
+MISC metadata.xml 258 BLAKE2B 27bb554801679826c9f8b158fa3c911f946510ddc3085a0bf73a624e405d51ab19393066caa38a08f216e338c14eaaa278a1e775be10ad855a4d100308455c3e SHA512 55c43f39e49f4eb0e2874caeeec6fe3a3fa494c9882f8cd9de50d5b050963ffecc586bc17d21fa126b762910475d615e287521ba36c2fb58d124ffd45225b773
diff --git a/dev-go/go-bindata-assetfs/metadata.xml b/dev-go/go-bindata-assetfs/metadata.xml
index 4d0242047017..636a399825db 100644
--- a/dev-go/go-bindata-assetfs/metadata.xml
+++ b/dev-go/go-bindata-assetfs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">elazarl/go-bindata-assetfs</remote-id>
 	</upstream>
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index 27000078bb8d..11f267042299 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1,3 +1,3 @@
 DIST go-bindata-0_pre20151023.tar.gz 17860 BLAKE2B 281a4ccbac82af31017728dd309cc32852a959cbe4e468bb2cf7e05266de748a22d062d8863350caaa713a28efb3c0dc7543abcf1fd1812543364ed6ff166c65 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43
 EBUILD go-bindata-0_pre20151023.ebuild 601 BLAKE2B 90c4070d09b39229e0a398c5d3e6d3524f35d95ba7565c3d4055914fccbb5fd651ce8b23d1d48d4de3c11950291a02a2ebe9972d867c53979205a92ee76d3c6d SHA512 e66e69d2366e910c7be09a1622e0f7cc148b3c47e377721dcb4368ee95086a12384fe0e7d13142d0482b040f743241cafcaac54123a553644bb3def10386d40c
-MISC metadata.xml 329 BLAKE2B 455a3940f0995bb9f2c636c5a35b0a449499db692439644b7516e3d1ec2b62d7cd09a0cba9b543d6d2bae1941f80ce17023a49934f2cabd61f0df424d6698547 SHA512 20d352cfc48333673b9e28dd55002d4bf2c34f07c32da49418970bea5963601382dd5a6f3462e492d249de7524e305acc08edc59a481dfe6f579fafac57ff447
+MISC metadata.xml 251 BLAKE2B 78b1289c2746a6805eeb73edc062b5309b69d11585038e4c26d863ad9c3b202b9ce1589a97e1e41f4b1c2472b45456dc0a555fd22387ffeea319d1fb3806c229 SHA512 d241954967f8571d47611771a1655e0719a0cdf7c339df0a8b7d184b01fb773a8e311465f18afcfe9dffcdbff427e1165bafb0aaca0d2837b2d1b55729b1b6cc
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 02c3ada43b43..ed3952c19107 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jteeuwen/go-bindata</remote-id>
 	</upstream>
diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
index 804a1919ac41..fd3a5057a875 100644
--- a/dev-go/go-crypto/Manifest
+++ b/dev-go/go-crypto/Manifest
@@ -1,6 +1,6 @@
-DIST go-crypto-0_pre20150808.tar.gz 876947 BLAKE2B c6da903ec7b5308114f2e2a364d6a2936dc24be4f8f274116c811740f712f13b2926a6f84b6160c450d921dbbeeb7ce48371e593cfa4d8abf80308f3cf07ac26 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519
 DIST go-crypto-0_pre20160126.tar.gz 902001 BLAKE2B 54d38a9aea69e01485417cbf8a900135730dca4bc79c9d5d1187eadb11a8dfca9ef6e72056c4ed4ad4a34b172379d94e6beb82ece9031411b8aa12af85200fb2 SHA512 168129ab9581b7348fb3285e045d99a0a837ac7bd65bf9f5e7a220fffbb9e2abf76da5f521c66eea7179eba0ad8da68d6f41cd9624ea40a9da25a18838427846
-EBUILD go-crypto-0_pre20150808.ebuild 1371 BLAKE2B d19720ef683fdc1094e418a9f28bee026b67a6714f38c9f8744440be745136816cdd9883951040965a527bcb2fb29ddf81217d72f07b3652cd7010b87a92e7fd SHA512 e95dd2cd871e32c5af4aee88fb15a5a42bfa0bbfa682f425ae147dabec99a450f1bc9bc1c9fb21de2ac654de218187f5c7acec81482dfa231e7eec26f964c3d9
+DIST go-crypto-0_pre20180816.tar.gz 1637516 BLAKE2B 800787412e1e52f70bc3df5b1b638e86ed2c66de86522786d7e3d8959f18d02426270d1f577ebaa8077d7d98c84ca7a358bed951c862a44b9293de8edebb17b4 SHA512 d2b730ba75b49b96f35969802b7321cd2efc89dcd2e8c0b8eaca545cb18287b34ad1c9ecbd07c6b4ace8708575d4586fbe1139d032a7038cc7221ad010d08074
 EBUILD go-crypto-0_pre20160126.ebuild 1691 BLAKE2B 0d894ff62289f1a8aa3b75c017e5246e4437c0b05fc2ae71a85f4369c82ada781a8540042932b4b769233792ead9901ad22b1b50439a5902f061774682141758 SHA512 a6d995f85bb6ba42c9539a96b19d84b18de9978d2ec3706678a5c1b337e7482203563935899ed171ff10f255feef34b7158bd68f7f58b7555da7c23ba61c858d
-EBUILD go-crypto-9999.ebuild 1063 BLAKE2B 833b19a7c104703922be8f66665158d1e084537658d7e3cab5689fb8dae33a94111b524a2907f1e63547ad95f547002392ed252cd6f6b5d85f195cb4e7e57516 SHA512 54ef740fc46c68e41949e2c1fc2102b269f9cf1232f930e78f1868d859df305d75eed827c15ceddba81f2b607d054196503b0a4d8c9b71b99ab9ecabf1aa9c30
+EBUILD go-crypto-0_pre20180816.ebuild 1305 BLAKE2B dcd94a85e937de412885f34115756083b44f41728e1d4f0c6f614afebe94c1b7af148bb571c97bc14629961f581dd281bb3d9975699710f59c29ac60febd884d SHA512 00578da069a3bc4ada9fef79b54d3de7464a243d1483b4dc785fd728edfceba409ad4c8da2ade77da277d97957da4a8f565b73532de232b8014a61733ceabed9
+EBUILD go-crypto-9999.ebuild 1437 BLAKE2B 35b40ea000b7873c199e0c09288ead176d530fe9d97bba3fd618aeb0f965cb302ad2ce78e578fa0e7061e679df64d424f7f5814cc896bc50b813d37d2896913f SHA512 faa5d234a6ad115fc218bcce357408c6027b7ece620b50ccfa6706fc94ded8384126fb0ff10a2d0e2cce28813e2414feb2557b47b2a217c702cb29b70771b602
 MISC metadata.xml 304 BLAKE2B d090eb82d7631d6984390d12c602fad54f5246bc6cb940403fd5be4b4ff85d6ac99469460c89a3e1c6751aab519229ad1ed615bd9782a24a864949a59dd5c355 SHA512 1e30936f145a4bac0db6816b1ab4ee6b5c38864774023e99d9724caf50e9039798d8675d41aa939c339d99ef59ccc2485bf3b5e3077f1e60d8b850bb607807b9
diff --git a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
deleted file mode 100644
index 32fa7915de5c..000000000000
--- a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN=golang.org/x/crypto/...
-EGO_SRC=golang.org/x/crypto
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="83f1503f771a82af8a31f358eb825e9efb5dae6c"
-	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go supplementary cryptography libraries"
-HOMEPAGE="https://godoc.org/golang.org/x/crypto"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestAgentForward(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
-	sed -e 's:TestRunCommandSuccess(:_\0:' \
-		-e 's:TestRunCommandStdin(:_\0:' \
-		-e 's:TestRunCommandStdinError(:_\0:' \
-		-e 's:TestRunCommandWeClosed(:_\0:' \
-		-e 's:TestFuncLargeRead(:_\0:' \
-		-e 's:TestKeyChange(:_\0:' \
-		-e 's:TestValidTerminalMode(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/session_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
-}
diff --git a/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild b/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild
new file mode 100644
index 000000000000..180bb7b462a2
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aabede6cba87e37f413b3e60ebfc214f8eeca1b0"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-go/go-sys-0_pre20180816:="
+RDEPEND=""
+
+src_prepare() {
+	default
+	sed -e 's:TestLockOpenSSHAgent(:_\0:' \
+		-i src/${EGO_SRC}/ssh/agent/client_test.go || die
+}
+
+src_compile() {
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/sys" "${T}/golibdir/src/golang.org/x/sys" || die
+	GOPATH="${S}:${T}/golibdir" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	GOPATH="${S}:${T}/golibdir" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
index 6cee16b68553..6a2b21ad3cb1 100644
--- a/dev-go/go-crypto/go-crypto-9999.ebuild
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN=golang.org/x/crypto/...
+EAPI=6
 EGO_SRC=golang.org/x/crypto
+EGO_PN=${EGO_SRC}/...
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aabede6cba87e37f413b3e60ebfc214f8eeca1b0"
 	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -20,19 +20,31 @@ HOMEPAGE="https://godoc.org/golang.org/x/crypto"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE=""
-DEPEND=""
+DEPEND=">=dev-go/go-sys-0_pre20180816:="
 RDEPEND=""
 
 src_prepare() {
-	# disable broken tests
-	sed -e 's:TestAgentForward(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
-	sed -e 's:TestRunCommandSuccess(:_\0:' \
-		-e 's:TestRunCommandStdin(:_\0:' \
-		-e 's:TestRunCommandStdinError(:_\0:' \
-		-e 's:TestRunCommandWeClosed(:_\0:' \
-		-e 's:TestFuncLargeRead(:_\0:' \
-		-e 's:TestKeyChange(:_\0:' \
-		-e 's:TestValidTerminalMode(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+	default
+	sed -e 's:TestLockOpenSSHAgent(:_\0:' \
+		-i src/${EGO_SRC}/ssh/agent/client_test.go || die
+}
+
+src_compile() {
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/sys" "${T}/golibdir/src/golang.org/x/sys" || die
+	GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_SRC}/.git"* || die
+	golang_install_pkgs
 }
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
index 85f625fe0576..d84a4abd39d6 100644
--- a/dev-go/go-net/Manifest
+++ b/dev-go/go-net/Manifest
@@ -1,6 +1,6 @@
-DIST go-net-0_pre20150804.tar.gz 539435 BLAKE2B f59222bd025bff05353c328072a028092bdc77c73fc438b78fb7c1aee5d3b152b1242ad5603a9da9e7e0a7bd1684bebe733342c0d5e415d1d1728f6e75e06cbd SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3
 DIST go-net-0_pre20160216.tar.gz 741192 BLAKE2B ed4ca3ddc71f794a92746e360157967582958e4de29a46c5e63964694986e5a8a4f95062a1d46881941e8e8dfb848bbd9c4bd3b7008d8f2da357c2cae9a441ae SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f
-EBUILD go-net-0_pre20150804.ebuild 1163 BLAKE2B e39fa116a096cbaab9b99131479eeb3149f097671b27a83607fef79ad032a217d789b187eb66fec46f5f4753c8e6897fceb9dae653920039e4b17e88ff8faf40 SHA512 ca6adc9c8ac75dffb0022f9c89819ebe47c4ca76e84bac416a1b1d844a11f4b8f4f16e8df463bcaf3db7f81944818b76e55278a935606bb868a53d7e8c8a56ce
+DIST go-net-0_pre20180816.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
 EBUILD go-net-0_pre20160216.ebuild 1193 BLAKE2B 1ee2b2456b71ac10706c377d79da8d23cdc0b690b3fc0372d3e6ab5f0b99a96c52fecdca35d0529a3ab9d047d94df6ffe56cbb67e9c29315383ab2d89187019b SHA512 4103011ea0a480441a1d8c9ceebd82ad0b12bcf4eaadaac5bf6b7029c32fd76309cf674abd3e1a1e18bfbcd196c4c6595e3b1679070edf162c72b2d1331c0830
-EBUILD go-net-9999.ebuild 1183 BLAKE2B 070b19f5bf335924a9dc7933201d0c996d3010254a9c1917c09225bb19913ce8db7416340a47bd402b6b4cb6c51834a364e1563f6c299980f7a429117084500c SHA512 351cc777c76ae9570368816fa6f855af3c01f8767dd491199c258e73127d5dbea5972b9328d017d524438d406835de8874b2e8c1b22a9e9660f86c6ec05eb4d7
+EBUILD go-net-0_pre20180816.ebuild 1498 BLAKE2B c642395af4f3370a6b3c5c0f2f0350a128ce2427c932b60be40ff2c152b8570cabcd1291f05d2f171db1dd14efb1d1cd184643992dc0d1f18af51ef8c0368062 SHA512 280c1b31440ddd5eed77b18465419518251497c03bd82044ab8cb9e6696e6b8069d530327f30e269f29431a103d42acce19ebfb233f0004faaecc3d869d49ae5
+EBUILD go-net-9999.ebuild 1614 BLAKE2B 5b181ec3ac0cdaf1727bce7be573ce092b64c8972b6782cbaa559718b218ffaea2c107946732d12f34aff891082b339ea18f50ebbd0c669b15a29a60f9f3c161 SHA512 0e1ab66f4f4fc977fa3f95b1c20d58c57921d3fe70aa1c7b0f82a3b1efaf14b92610d9e4f7418b6de9630baabc7c03b87b647038954383c1409d0683b32ca21e
 MISC metadata.xml 301 BLAKE2B 842eb1c02738ef2694108db727a2f89137c7c3bb45743df6013f7b5542ee9029df0515680905bb93f628aeae74870b5a3167693c7345ad00ad15dd9920e86286 SHA512 bef6b9d68e27cb70d096a5abeac35df9248998041cb8eb370853e9044d7994b6dc3c32535dac71688d143ae18dd2ca1118fede990101094e724031b042fa71f6
diff --git a/dev-go/go-net/go-net-0_pre20150804.ebuild b/dev-go/go-net/go-net-0_pre20150804.ebuild
deleted file mode 100644
index 44adb09a05e9..000000000000
--- a/dev-go/go-net/go-net-0_pre20150804.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN=golang.org/x/net/...
-EGO_SRC=golang.org/x/net
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="1bc0720082d79ce7ffc6ef6e523d00d46b0dee45"
-	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go supplementary network libraries"
-HOMEPAGE="https://godoc.org/golang.org/x/net"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-text:="
-RDEPEND=""
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' \
-		-i src/${EGO_SRC}/webdav/xml_test.go || die
-	sed -e 's:TestPingGoogle(:_\0:' \
-		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i src/${EGO_SRC}/icmp/ping_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
-}
diff --git a/dev-go/go-net/go-net-0_pre20180816.ebuild b/dev-go/go-net/go-net-0_pre20180816.ebuild
new file mode 100644
index 000000000000..6568f4a0837f
--- /dev/null
+++ b/dev-go/go-net/go-net-0_pre20180816.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-go/go-crypto-0_pre20180816:=
+	>=dev-go/go-sys-0_pre20180816:=
+	>=dev-go/go-text-0.3.0:="
+RDEPEND=""
+
+src_prepare() {
+	default
+	sed -e 's:TestDiag(:_\0:' \
+		-e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestMultipartMessageBodyLen(:_\0:' \
+		-i src/${EGO_SRC}/icmp/multipart_test.go || die
+}
+
+src_compile() {
+	local x
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	for x in sys text crypto; do
+		ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die
+	done
+	env GOPATH="${S}:${T}/golibdir" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
index bf416c447af4..f9b9ae5ffca2 100644
--- a/dev-go/go-net/go-net-9999.ebuild
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN=golang.org/x/net/...
+EAPI=6
 EGO_SRC=golang.org/x/net
+EGO_PN=${EGO_SRC}/...
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
 	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -20,24 +20,40 @@ HOMEPAGE="https://godoc.org/golang.org/x/net"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE=""
-DEPEND="dev-go/go-crypto:=
-	dev-go/go-text:="
+DEPEND=">=dev-go/go-crypto-0_pre20180816:=
+	>=dev-go/go-sys-0_pre20180816:=
+	>=dev-go/go-text-0.3.0:="
 RDEPEND=""
 
 src_prepare() {
-	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' \
-		-i src/${EGO_SRC}/webdav/xml_test.go || die
-	sed -e 's:TestPingGoogle(:_\0:' \
-		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i src/${EGO_SRC}/icmp/ping_test.go || die
+	default
+	sed -e 's:TestDiag(:_\0:' \
+		-e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestMultipartMessageBodyLen(:_\0:' \
+		-i src/${EGO_SRC}/icmp/multipart_test.go || die
 }
 
 src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
+	local x
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	for x in sys text crypto; do
+		ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die
+	done
+	env GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_SRC}/.git"* || die
+	golang_install_pkgs
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
 }
diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest
index f408309f4f98..0fb6379c7cd9 100644
--- a/dev-go/go-sys/Manifest
+++ b/dev-go/go-sys/Manifest
@@ -1,6 +1,6 @@
-DIST go-sys-0_pre20150729.tar.gz 529002 BLAKE2B cc51b55c9bad7fffb9bf4d3c00ffb62dbff0e6765873f5a4b07ab4afdc0066a4f8c9d943fa7d8532345207f5bd1eb2b219922f9e7d33d25eb699902b4f5b960c SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487
 DIST go-sys-0_pre20160204.tar.gz 542894 BLAKE2B 6f3969e8beb9311a742b61a188826b92fcbb211cc0159870a2dad389710681ae415506f667feed1f82940c2f223acdb21ba8e09a94a322c2ee07948598397937 SHA512 59db0ba47447869f2339ea60b8766e1464f48e22a619da2aecc07977b146a54feb4e3fa4e6076b8d1c2deb11ffab3c820e4a61602f2ce3121df7cb08e0267569
-EBUILD go-sys-0_pre20150729.ebuild 929 BLAKE2B cd2b103f29b50acbab4bb90a2e02e6fcda41dbe5e9a1a79432f55b0e565157c7dcb7b95586c109c418e8ae02c8fb8a07f4e7d6c94902581e7b4b13eb30dfc385 SHA512 cc8ce0fae8f4409de4fe5125354fe24c43668edd72bd7d54d871ade8be6a45e238e5e890e3865f44231640f68a7a2526bd2ffc36c343fc5c389d473db06d94ef
+DIST go-sys-0_pre20180816.tar.gz 994494 BLAKE2B 24132a6dc2b8e73a28209418d8e89c62da4620b3ceed30ac51bd2f4e06a9bb37c9402e50f0f18b77ff9b0c4106836db894bb7f8d9b2ea77bca621aeb5999f460 SHA512 ae95fa505beab9791824fec5e4a52590b21d54af314db3219ef7545ab93059a5b8d1a6d3f81353852c72d2f515ad6bc9d6a0b5ae28b5b17a82cedd241165a2e4
 EBUILD go-sys-0_pre20160204.ebuild 930 BLAKE2B 009e9db57b5422385b3ad8d95d719fea7bf99b42c31bf364d1e63943b938c8634fb08d86633cdfb6e03f12766c0de99e9682949d1406ab6bd36f7f7746f567b8 SHA512 eb059464c6202c63b50331ebe1375d2f9bff079ee2589417c848dd1629456abb625dd9758b5910f2e8c9a862322ffa29bd24cc1ba9a311366672c82880584670
-EBUILD go-sys-9999.ebuild 621 BLAKE2B 54cab560b7a3218e2186da51a1a7af9ba92f599bd6b83f727a3de5e69e55f7ea293910ad9445c02f80729b2503fc417e441918503745d7fe54d1668ac0785963 SHA512 b9abe7a584e2153ea42b0097af77efe6331d0106fb5184f5794d3e8818f48389b4d873e53be32757ca1b5379c49cba8ffde87f3fe695f30b578016ed081a2191
+EBUILD go-sys-0_pre20180816.ebuild 820 BLAKE2B ed34023da0a6975550f785a8ccf204f0828a4fd51772285b8c1f1114693225c2b609437631d072f8e079a2516d212c2d59eb6e892f0cbd878bebb397440a0bae SHA512 cac45410c6b17fdb1c5efc9c66f8b967fe81b794725a549d7f6a223eb3d34d5afa6e229fe053d59a653f11db4c44ac27cfb81544d5da0d9eaa77de26dd4183e7
+EBUILD go-sys-9999.ebuild 925 BLAKE2B 471f4d76451360d26121513e73b1ad9e4cc1d29c8141c6539ab544d9dda22037eddade850df06f42d1b4e1a42b62f1aa5ebeab94209cf8e29920d21a4aad7edb SHA512 7d3351550dd3777c9432481844998477c7bf739f4e1a9e74193aba6fa5e29361df3df6566dc33016b864a58aacf09d1245a9ac60b38549216df5772671a67da4
 MISC metadata.xml 301 BLAKE2B 9ccb9a34913b74f256a6d9ed5f2caf99d4480d109725dff4ae48738eb74f130932253ebe3c085b121b3393a9d899248e9f10a8d684e7c00a56696b6d9daa6b5e SHA512 a0e26ad5f2b24f2d9f91b568423701fbcfccdd8cf06174a21e829eb851ad302ec677b5a5e32539e0d6701d90cebf503e233edae15aa908cd7c96dff6197148c9
diff --git a/dev-go/go-sys/go-sys-0_pre20150729.ebuild b/dev-go/go-sys/go-sys-0_pre20180816.ebuild
index 3a8840f6c759..e42e90c0451b 100644
--- a/dev-go/go-sys/go-sys-0_pre20150729.ebuild
+++ b/dev-go/go-sys/go-sys-0_pre20180816.ebuild
@@ -1,15 +1,14 @@
-# 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
 EGO_PN=golang.org/x/sys/...
-EGO_SRC=golang.org/x/sys
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-EGIT_COMMIT="58da1121af381632b48b2843aeb16299f2e1dc50"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded"
 	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -24,10 +23,15 @@ DEPEND=""
 RDEPEND=""
 
 src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
+	GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	GOPATH="${S}" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
 }
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
index 9ccb2c39b1ef..9fb94bbaa68a 100644
--- a/dev-go/go-sys/go-sys-9999.ebuild
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -1,15 +1,14 @@
-# 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
 EGO_PN=golang.org/x/sys/...
-EGO_SRC=golang.org/x/sys
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-EGIT_COMMIT="58e109635f5d754f4b3a8a0172db65a52fcab866"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded"
 	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -22,3 +21,18 @@ SLOT="0/${PVR}"
 IUSE=""
 DEPEND=""
 RDEPEND=""
+
+src_compile() {
+	GOPATH="${S}" GOBIN="$(go env GOROOT)/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	GOPATH="${S}" GOBIN="$(go env GOROOT)/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_PN%/...}/.git"* || die
+	golang_install_pkgs
+}
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
index 7c8ed026b362..b967b9452c56 100644
--- a/dev-go/go-text/Manifest
+++ b/dev-go/go-text/Manifest
@@ -1,6 +1,6 @@
-DIST go-text-0_pre20150806.tar.gz 3736536 BLAKE2B afc6a95116426f9b981432c772c374cb3c84d300e81af1599383be74d00830556d36ff614d88e8952b89974ecb238b77725a3d1a83dc65a0f85dafa3d29a2dff SHA512 dd0fc8b5abdfa6f005316bb7828c03a081485e0bd33cbf86c0b83f8bf9240973a7b0a2e6f52ef75f48ec00fc922be21a6c65ff9eb4080f28cb3f280bd4c4f5c6
+DIST go-text-0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
 DIST go-text-0_pre20160211.tar.gz 4015547 BLAKE2B ad85f27761e2fd91a6acff497fe9b720484d51c6d75032c02fe21784dff78b4b900ac95aab394a6db1f7b2c9fb5a3d1cbde8db2aaa4c099b19357d82f747eb89 SHA512 066e53f6e094a6cf3effe1a9376f7bde41c3059099381bb5adf8c84589de4dab9115ce3c8cb7f89f90e2601422f79e3906f8f498d66e364da9f830ede1f7f05f
-EBUILD go-text-0_pre20150806.ebuild 1234 BLAKE2B d61eeacd7b8f6af3bc9b3957d350d52d103169cb49e9dc1ead669dbd1669a683d7792e67a52a19af57b5a15b79cc30a4b85bef7bd47501ea6495565d07503c8c SHA512 d058c7b320013440f938b91a1ac9cd2224d2bf329d8aab45dfd57db319cffdbb3a8e709d1b3fe240b7ee64e9788fb2ac0bc0b0698750fc6bee8885e72c334180
+EBUILD go-text-0.3.0.ebuild 1203 BLAKE2B fb46358f1c2958e26531aa73c3cede5ac768b3a14cbdaeeb046bc881e906edb0094eef22732912e0b0aec40dd7ffa3f9650b585ab728282243785b1bdc59d962 SHA512 65eb11a8f0c51fa1b7f574d0e8fa9724c2aaa15c485e426e872c6b6e580e81364075cf8523dcce0671b73ecc19924dde9ced64e9835691bb11ab5cf6d3ff96a5
 EBUILD go-text-0_pre20160211.ebuild 1372 BLAKE2B 79842e705e299769a14b12735ae09eec6788cfdbdb0a29050356575ce0706f9e4bc34c0d1b0e957161f2ea9cff7d62fd653780d507621b426b0df8894afd7d18 SHA512 09a680a57e682d51a5929b7c08680c14aea25bbb816e61865942166c8ff30230d36143bd11174f8d0c84170e3020a06c5a9a8a9973d50d90c7e53bda763f3fb9
-EBUILD go-text-9999.ebuild 1218 BLAKE2B 2a2e2e29d6779d523b3baa05a3ec36532b29d79ba1459117580185ab1d9633d636288f1385fd8e615ab933ef2820d9006acaa36e0db5585dc1b1579e6f96d4df SHA512 8042d1fe75b9064c2e24ec36d13b1204d6b4f2710cfc2be231bc0ca435568b1c83afc2623cc9f5d37d36c8f7ab364d8242500c444a9a327ed85c05bc6274dc29
+EBUILD go-text-9999.ebuild 1299 BLAKE2B f2d9eb98d3955ff9660b1b42e73feb24c7068645d74537a61fc61c07dd379622b96d5a3e089728356d575eff62360a213c2b1d67fc6352e0429fc42972150ca5 SHA512 b7aac61eceb419a1834345476ca98d000942073f30e4bf93bcba27b419dfd3684684cbb306259d9046709574e007384655d71c2cda542cea31e886c4ee368cbc
 MISC metadata.xml 302 BLAKE2B a05f70c06783ee19acede14cc45403fc3c66b6ba9d9d60a46ff406187bc3d0b4d60a37896b8d5099c3a883442ee11700c2692397dd9f86606807c4f3ea69ec1c SHA512 d6011dea76488098287ce6c436fd8c8b2b3607153611121b2ebd0b67be11629e8eb1318d460474c355fe8828c0bb0836db4fbae351f49bbbd7448c37f5a572ca
diff --git a/dev-go/go-text/go-text-0.3.0.ebuild b/dev-go/go-text/go-text-0.3.0.ebuild
new file mode 100644
index 000000000000..84a3b008c103
--- /dev/null
+++ b/dev-go/go-text/go-text-0.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN=golang.org/x/text/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go text processing support"
+HOMEPAGE="https://godoc.org/golang.org/x/text"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-go/go-tools-0_pre20180817"
+RDEPEND=""
+
+src_compile() {
+	# Create an isolated golibdir in order to avoid an
+	# "use of internal package not allowed" error when
+	# and older version is installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/tools" "${T}/golibdir/src/golang.org/x/tools" || die
+	GOPATH="${S}:${T}/golibdir" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-text/go-text-0_pre20150806.ebuild b/dev-go/go-text/go-text-0_pre20150806.ebuild
deleted file mode 100644
index 3fb9794a126a..000000000000
--- a/dev-go/go-text/go-text-0_pre20150806.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN=golang.org/x/text/...
-EGO_SRC=golang.org/x/text
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="1309a1875a4368c12688b9383c6bcac738c17c29"
-	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go text processing support"
-HOMEPAGE="https://godoc.org/golang.org/x/text"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
-}
-
-src_test() {
-	# Create go symlink for TestLinking in display/dict_test.go
-	mkdir -p "${GOROOT}/bin"
-	ln -s /usr/bin/go  "${GOROOT}/bin/go" || die
-	golang-build_src_test
-}
-
-src_install() {
-	golang-build_src_install
-	export -n GOROOT
-	exeopts -m0755 -p # preserve timestamps for bug 551486
-	exeinto "$(go env GOROOT)/bin"
-	doexe bin/*
-}
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
index 5768c80ac6f4..4d851787c267 100644
--- a/dev-go/go-text/go-text-9999.ebuild
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGO_PN=golang.org/x/text/...
 EGO_SRC=golang.org/x/text
+EGO_PN=${EGO_SRC}/...
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -21,28 +21,28 @@ HOMEPAGE="https://godoc.org/golang.org/x/text"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE=""
-DEPEND=""
+DEPEND=">=dev-go/go-tools-0_pre20180817"
 RDEPEND=""
 
-src_test() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	if [ -d "${T}/goroot/src/${EGO_SRC}" ]; then
-		rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	fi
-	if [ -d "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" ]; then
-		rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" ||
-			die
-	fi
-
-	# Create go symlink for TestLinking in display/dict_test.go
-	mkdir -p "${T}/goroot/bin"
-	ln -s /usr/bin/go  "${T}/goroot/bin/go" || die
-
-	GOROOT="${T}/goroot" golang-build_src_test
+src_compile() {
+	# Create an isolated golibdir in order to avoid an
+	# "use of internal package not allowed" error when
+	# and older version is installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/tools" "${T}/golibdir/src/golang.org/x/tools" || die
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
 }
 
 src_install() {
-	golang-build_src_install
-	dobin bin/*
+	rm -rf "${S}/src/${EGO_SRC}/.git"* || die
+	golang_install_pkgs
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go test -v -work -x "${EGO_PN}" || die
 }
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 910800e4ccd7..2754ca6bb58e 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,11 +1,8 @@
+DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
 DIST go-favicon.ico 1150 BLAKE2B 7cef9e0c7031531ceaddc56b9e7cb8c09cf3ebf08bbdd53876edcf48d412c55968268190b1fe1814e21efc5669618a5e07d30d7bdbb73b4cbeca9a31b3185fc5 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6
-DIST go-tools-0_pre20150823.tar.gz 1633447 BLAKE2B 00866c14139099821fc883ab3908b47481a3ea5af323977fdd84622f43e8998a6fcf6c0a4cbf0c6bb98494d1f4b1fdd0d281447b67a0766af1e5b4f68cf24e27 SHA512 6d906bae8433182e7a105a46b92c4f64ac145196ccc72f8934376fc49e5d554182931745e92229c4571323a6eba9ce2f680b5add3844ecb593a194cbbc1b0b63
-DIST go-tools-0_pre20150902.tar.gz 1630401 BLAKE2B 5f23e4d05c614584bfd2ac77d15ad4b464f083b489b1a687a823d014d848ce38ac5006a379eb46f37e7aba0419b7f1b4d48c053aae89c6ac912366e5ddc487c3 SHA512 437d5178ce5bf6c4d39ad638259e7c18150d2574dffb632003fa0b83a61a9103e666e562aecc6e8412d995e4b5ffacda6bc12b1cfbbea0b22a5ff680a0a7e3e1
-DIST go-tools-0_pre20160121.tar.gz 1768660 BLAKE2B ebc7622967dbb82c6578591c108bba8c96cb7df56360d445b02de1da905ac64b4901057acd36e3d2ab5ec51e5e2ff206efae6a9f9523180e53434adcdad278e3 SHA512 ca4b213a6f398f9bb61a81784fb6dcb4a82994e2d7a95134fc5203ce0f65848d192b2d7c8975a59199db873942c23562866a5607347e060ac0af370d72e067e2
 DIST go-tools-0_pre20160220.tar.gz 1827046 BLAKE2B 26b4080540958764c42fffc1cb6a1597705c0a7ea85357b5169f9a0bf6939d7c5475681f6fede8b46a88ef58c72afa9eaa9da3fb66a3bbbb19942d0a1887bbeb SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1
-EBUILD go-tools-0_pre20150823-r1.ebuild 3217 BLAKE2B 1ac7bed44e714f46544857f3dbbea304d23a9de3c6c36962f52596e6b8546ba0d481a67e6b91887ebf3851ab7ec38be1179d1b2b30fd63cc48029d0bf2925730 SHA512 7d2841db649dbe546a455e806417c0c58ee3daec4e7b88412d5a685a2f8923a1a3333f5f24fc87c6adf5c53498119cc84086eeb68d60b1098020a08cb8440cc9
-EBUILD go-tools-0_pre20150902.ebuild 3070 BLAKE2B ab9142caa3795a49f3a6fbf8a8ead9cd15563f86d065237a510159b316f4c8131835fc2336ad81a7ad96f204ae62a471e369b9bc6bcebb95c4c529febcb2a54f SHA512 acebcbae352d8036010f5c0837c06d672285b2bff354dd306290c71e040d7564e1a871a47382c12a3ff7cf7b12983a6c2d756cda42086acaa71d14632a130972
-EBUILD go-tools-0_pre20160121.ebuild 3466 BLAKE2B e26e9b721cf2f51967a9d8eb4b748c5514f6fdae47adc1f86a4fb6841044cd4d8db9b8aa9a63e54664816435201ac3e66df17a0aa4b6898f7b99e60763e87faa SHA512 0fa231782f3702f1d5dc7aa9132958b3328a89b31468292c61021d55af40756e59ba0a299d64e86547eb506865e09dc11cc3c6530a0ca1f1510ca2f4cff809e5
+DIST go-tools-0_pre20180817.tar.gz 2321169 BLAKE2B d1ba93b36b62bfbf53770cab6c96019d1a96db0ff6521f591577d866f74a1f65ec24e41a06f81d0040be7122f2e0da734e68d0a72591040265b5f95b324645fe SHA512 1af6c4a58f4d1985dc55e4342d9a4f26ada646ffe87fafdb5bdf876ad972a9f826da257ff9a10956c24dbc90ed9d6935bb78b4f7d30f9e50493c60f7ce92edb1
 EBUILD go-tools-0_pre20160220.ebuild 3479 BLAKE2B 0c985cf0b27aee2600ad5099e126f306c8a1d4c96c810306cef20bb1cc450c88783cd2a818fedb474a2b5c58ac1223ef95ca3279441d6678ff4d13319a4820f8 SHA512 90edc996457245773d17ee74f14ab23902ba62e9d184fd1869b11e68d800e129b48bf2599a682a01bd4ad1d86123cc200f4a7f5524bbbf5263f14b9660b94643
-EBUILD go-tools-9999.ebuild 3217 BLAKE2B 1ac7bed44e714f46544857f3dbbea304d23a9de3c6c36962f52596e6b8546ba0d481a67e6b91887ebf3851ab7ec38be1179d1b2b30fd63cc48029d0bf2925730 SHA512 7d2841db649dbe546a455e806417c0c58ee3daec4e7b88412d5a685a2f8923a1a3333f5f24fc87c6adf5c53498119cc84086eeb68d60b1098020a08cb8440cc9
+EBUILD go-tools-0_pre20180817.ebuild 2473 BLAKE2B e8f991baea83a03aecb9d753becdc48997b75392457487c62d24251e56eb7f09dfd25e13911e268af655b38b50fd4476682bf83b9d87ac0dcca5bef6aa98db8b SHA512 f811140755682828b1271a36835301d60d558d7e13199912ae7b4666e16ebc1a7c0dbda2a23bec5c4779c00aa17d4cc5c25d21b21333d7d6e10f9893d9784542
+EBUILD go-tools-9999.ebuild 3044 BLAKE2B f27fbdd1420d74023c1bde11321bcbd4fc1eb4c42ac26c5c3f03714e2a679f6669f4df60875721f6b4ed793db3a82614a1104aeeeb7c60390e7491a6f38e3e90 SHA512 30db6795c125555862a577c4798bca3ff93158107b041517a787eb99b6dc36b36ca56c88d7315a15589e2c52b110c0d1a8f23640cb309cb397c72a84c5bcf201
 MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
deleted file mode 100644
index 3fcfd947ef6d..000000000000
--- a/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN="golang.org/x/tools/..."
-EGO_SRC="golang.org/x/tools"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="6c9aff3"
-	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go Tools"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-SRC_URI="${ARCHIVE_URI}
-	http://golang.org/favicon.ico -> go-favicon.ico"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-net:="
-RDEPEND=""
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' \
-		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' \
-		-i src/${EGO_SRC}/cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' \
-		-i src/${EGO_SRC}/go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${EGO_SRC}/go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
-	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-e 's:TestTestmainPackage(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
-	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' \
-		-i src/${EGO_SRC}/go/types/check_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' \
-		-i src/${EGO_SRC}/go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' \
-		-i src/${EGO_SRC}/go/vcs/vcs_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-	-i src/${EGO_SRC}/refactor/lexical/lexical_test.go || die
-
-	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
-		die
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i src/${EGO_SRC}/godoc/static/makestatic.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
-		-i src/${EGO_SRC}/godoc/static/godoc.html || die
-}
-
-src_compile() {
-	# Generate static.go with favicon included
-	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
-	go run makestatic.go || die
-	popd >/dev/null
-
-	golang-build_src_compile
-}
-
-src_install() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-
-	GOROOT="${T}/goroot" golang-build_src_install
-
-	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
-	doexe bin/* "${T}/goroot/bin/godoc"
-	dodir /usr/bin
-	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
-
-	if has_version '<dev-lang/go-1.5'; then
-		exeinto "$(go env GOTOOLDIR)"
-		exeopts -m0755 -p # preserve timestamps for bug 551486
-		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/cover"
-		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
-	else
-		rm "${D}"$(go env GOROOT)/bin/{cover,vet} ||
-			die "unable to remove cover and vet"
-	fi
-}
diff --git a/dev-go/go-tools/go-tools-0_pre20150902.ebuild b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
deleted file mode 100644
index 552b4705291a..000000000000
--- a/dev-go/go-tools/go-tools-0_pre20150902.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN="golang.org/x/tools/..."
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="1330b28"
-	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go Tools"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-SRC_URI="${ARCHIVE_URI}
-	http://golang.org/favicon.ico -> go-favicon.ico"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-net:=
-	>=dev-lang/go-1.5"
-RDEPEND="!<dev-lang/go-1.5"
-
-src_prepare() {
-	local go_src="${EGO_PN%/...}"
-	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' \
-		-i src/${go_src}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' \
-		-i src/${go_src}/cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' \
-		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${go_src}/go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${go_src}/go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${go_src}/go/ssa/stdlib_test.go || die
-	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-e 's:TestTestmainPackage(:_\0:' \
-		-i src/${go_src}/go/ssa/interp/interp_test.go || die
-	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' \
-		-i src/${go_src}/go/types/check_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' \
-		-i src/${go_src}/go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' \
-		-i src/${go_src}/go/vcs/vcs_test.go || die
-
-	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
-		die
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i src/${go_src}/godoc/static/makestatic.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
-		-i src/${go_src}/godoc/static/godoc.html || die
-}
-
-src_compile() {
-	# Generate static.go with favicon included
-	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
-	go run makestatic.go || die
-	popd >/dev/null
-
-	golang-build_src_compile
-}
-
-src_test() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	mkdir -p "${T}/goroot/test" || die
-	GOROOT="${T}/goroot" golang-build_src_test
-	rm -rf "${T}/goroot"
-}
-
-src_install() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-
-	GOROOT="${T}/goroot" golang-build_src_install
-
-	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
-	doexe bin/* "${T}/goroot/bin/godoc"
-	dodir /usr/bin
-	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
-
-	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
-}
diff --git a/dev-go/go-tools/go-tools-0_pre20160121.ebuild b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
deleted file mode 100644
index 2ab6225e7dbb..000000000000
--- a/dev-go/go-tools/go-tools-0_pre20160121.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN="golang.org/x/tools/..."
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="f3a63969dd29f8cfa913fdaea22f30c1ed537cb3"
-	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go Tools"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-SRC_URI="${ARCHIVE_URI}
-	http://golang.org/favicon.ico -> go-favicon.ico"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-net:=
-	>=dev-lang/go-1.5"
-RDEPEND="!<dev-lang/go-1.5"
-
-src_prepare() {
-	local go_src="${EGO_PN%/...}"
-	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' \
-		-e 's:TestWebIndex(:_\0:' \
-		-i src/${go_src}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' \
-		-e 's:TestDivergentPackagesExamples(:_\0:' \
-		-e 's:TestIncompleteExamples(:_\0:' \
-		-i src/${go_src}/cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' \
-		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${go_src}/go/gcimporter15/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${go_src}/go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${go_src}/go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${go_src}/go/ssa/stdlib_test.go || die
-	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-e 's:TestTestmainPackage(:_\0:' \
-		-i src/${go_src}/go/ssa/interp/interp_test.go || die
-	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' \
-		-i src/${go_src}/go/types/check_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' \
-		-i src/${go_src}/go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' \
-		-i src/${go_src}/go/vcs/vcs_test.go || die
-
-	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
-		die
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i src/${go_src}/godoc/static/makestatic.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
-		-i src/${go_src}/godoc/static/godoc.html || die
-}
-
-src_compile() {
-	# Generate static.go with favicon included
-	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
-	go run makestatic.go || die
-	popd >/dev/null
-
-	golang-build_src_compile
-}
-
-src_test() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	mkdir -p "${T}/goroot/test" || die
-	GOROOT="${T}/goroot" golang-build_src_test
-	rm -rf "${T}/goroot"
-}
-
-src_install() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die
-
-	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-	golang_install_pkgs
-
-	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
-	doexe bin/* "${T}/goroot/bin/godoc"
-	dodir /usr/bin
-	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
-
-	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
-}
diff --git a/dev-go/go-tools/go-tools-0_pre20180817.ebuild b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
new file mode 100644
index 000000000000..f4effc4ab2dd
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="golang.org/x/tools"
+
+# vendor the net package due to a circular dependency
+EGO_VENDOR=( "golang.org/x/net aaf60122140d3fcf75376d319f0554393160eb50 github.com/golang/net" )
+
+EGIT_COMMIT="7d1dc997617fb662918b6ea95efc19faa87e1cf8"
+ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+
+src_prepare() {
+	default
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_PN}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${EGO_PN}/godoc/static/gen.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${EGO_PN}/godoc/static/godoc.html || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i src/${EGO_PN}/go/internal/gcimporter/bexport_test.go || die
+	sed -e 's:TestLoadSyntaxOK(:_\0:' \
+		-i src/${EGO_PN}/go/packages/packages_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-i src/${EGO_PN}/go/loader/stdlib_test.go || die
+	sed -e 's:TestWebIndex(:_\0:' \
+		-e 's:TestTypeAnalysis(:_\0:' \
+		-i src/${EGO_PN}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${EGO_PN}/go/internal/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i src/${EGO_PN}/go/internal/gcimporter/bexport_test.go || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	GOPATH="${S}:$(get_golibdir_gopath)" \
+		go run makestatic.go || die
+	popd >/dev/null
+
+	GOPATH="${S}:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} $(cd "${S}/src/${EGO_PN}" && GOPATH="${S}" go list ./...) || die
+}
+
+src_test() {
+	GOPATH="${S}:$(get_golibdir_gopath)" \
+		go test -v -work -x "${EGO_PN}/..." || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_PN}/vendor" || die
+	golang_install_pkgs
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+}
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 3fcfd947ef6d..10b4b86e3238 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN="golang.org/x/tools/..."
+EAPI=6
 EGO_SRC="golang.org/x/tools"
+EGO_PN="${EGO_SRC}/..."
+
+# vendor the net package due to a circular dependency
+GO_NET_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
+EGO_VENDOR=( "golang.org/x/net ${GO_NET_COMMIT} github.com/golang/net" )
 
 if [[ ${PV} = *9999* ]]; then
+	ARCHIVE_URI=""
 	inherit golang-vcs
 else
-	EGIT_COMMIT="6c9aff3"
+	EGIT_COMMIT="7d1dc997617fb662918b6ea95efc19faa87e1cf8"
 	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~x86"
 	inherit golang-vcs-snapshot
 fi
 inherit golang-build
@@ -18,82 +23,68 @@ inherit golang-build
 DESCRIPTION="Go Tools"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
 SRC_URI="${ARCHIVE_URI}
+	https://github.com/golang/net/archive/${GO_NET_COMMIT}.tar.gz -> github.com-golang-net-${GO_NET_COMMIT}.tar.gz
 	http://golang.org/favicon.ico -> go-favicon.ico"
 LICENSE="BSD"
 SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-net:="
-RDEPEND=""
 
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' \
-		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' \
-		-i src/${EGO_SRC}/cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' \
-		-i src/${EGO_SRC}/go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${EGO_SRC}/go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
-	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-e 's:TestTestmainPackage(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
-	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' \
-		-i src/${EGO_SRC}/go/types/check_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' \
-		-i src/${EGO_SRC}/go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' \
-		-i src/${EGO_SRC}/go/vcs/vcs_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-	-i src/${EGO_SRC}/refactor/lexical/lexical_test.go || die
+src_unpack() {
+	golang-vcs_src_unpack
+	mkdir -p "${WORKDIR}/${P}/src/${EGO_SRC}/vendor/golang.org/x/net" || die
+	tar -C "${WORKDIR}/${P}/src/${EGO_SRC}/vendor/golang.org/x/net" -x --strip-components 1 \
+		-f "${DISTDIR}/github.com-golang-net-${GO_NET_COMMIT}.tar.gz" || die
+}
 
+src_prepare() {
+	default
 	# Add favicon to the godoc web interface (bug 551030)
 	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
 		die
 	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i src/${EGO_SRC}/godoc/static/makestatic.go || die
+		-i src/${EGO_SRC}/godoc/static/gen.go || die
 	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
 		-i src/${EGO_SRC}/godoc/static/godoc.html || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i src/${EGO_SRC}/go/internal/gcimporter/bexport_test.go || die
+	sed -e 's:TestLoadSyntaxOK(:_\0:' \
+		-i src/${EGO_SRC}/go/packages/packages_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestWebIndex(:_\0:' \
+		-e 's:TestTypeAnalysis(:_\0:' \
+		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${EGO_SRC}/go/internal/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i src/${EGO_SRC}/go/internal/gcimporter/bexport_test.go || die
 }
 
 src_compile() {
 	# Generate static.go with favicon included
 	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
-	go run makestatic.go || die
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go run makestatic.go || die
 	popd >/dev/null
 
-	golang-build_src_compile
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
 }
 
-src_install() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+src_test() {
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
 
-	GOROOT="${T}/goroot" golang-build_src_install
+src_install() {
+	rm -rf "${S}/src/${EGO_SRC}/"{.git,vendor} || die
+	golang_install_pkgs
 
 	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
 	exeinto "$(go env GOROOT)/bin"
-	doexe bin/* "${T}/goroot/bin/godoc"
+	doexe bin/*
 	dodir /usr/bin
 	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
-
-	if has_version '<dev-lang/go-1.5'; then
-		exeinto "$(go env GOTOOLDIR)"
-		exeopts -m0755 -p # preserve timestamps for bug 551486
-		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/cover"
-		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
-	else
-		rm "${D}"$(go env GOROOT)/bin/{cover,vet} ||
-			die "unable to remove cover and vet"
-	fi
 }
diff --git a/dev-go/go-tour/Manifest b/dev-go/go-tour/Manifest
index 0b1e3161d4ad..3bc1564e6ed8 100644
--- a/dev-go/go-tour/Manifest
+++ b/dev-go/go-tour/Manifest
@@ -1,3 +1,3 @@
-DIST go-tour-0_p20160209.tar.gz 275272 BLAKE2B c3d98bf839fc62a43eb7b994a798ab977c19756160930f7ecda39543e8bf4f793ec1eb4f2e3fb202e2bd9b1d8738eed02b40510047fcfe5274ae3c99410dde0a SHA512 bc9131e6173f72ea01c3062454a47a90301ad01bc1ea356ef09b81ad2d887759671ee9700f2c6b47821fc02c49297b8797d732ae0e9b414205e483d30579d2e9
-EBUILD go-tour-0_p20160209.ebuild 1108 BLAKE2B 5a55e6c40ade0d49d4121dce55dde77172f9f046a45815a868b355768c59a0f3f2efd1041ea1d22d3c2fceece344d04b9b2eb5cf8fe3551dae97c938019f00a8 SHA512 ebeb76acf12afd2146deac37cdfc9db89f230727059ad3992ce8da4d843e1cdb42ddb2c693378045684d74917e3b75c4a3eeaf96079aa5df8abea68d2d863b3f
+DIST go-tour-0_p20180810.tar.gz 319048 BLAKE2B 43c4ca53d939cf7590c8e3607e2089974f1b40dc9268ccbf9100e36d258d76a828c5512e662f20d125c07d0a35d48d3004c8f06d6f80a6a1645099d4ca592c57 SHA512 73eb1b7a228d046d572b2c781cdd7b43ef57de982987ab5808cbb2775c34c9805fac3c52fd68edd34ccadec5169ce5d61234eee553daf0b9ef2d2529e2817b44
+EBUILD go-tour-0_p20180810.ebuild 1094 BLAKE2B 2cbb46860460043328b8db825da7855d99105b109749cb94e6c79d6282d7a74b761db19ba3bca622da654a23d54bdf24b9e770d5b212c90c978bda2cc32b319d SHA512 43818de5961041d32b8227c561cbe7c7e5b93b13006580979e1c90d3d2d60d82cbeb280b41a6e481c0fc60183b66e0e18bb2866a70d81f542f4514f93f96f905
 MISC metadata.xml 302 BLAKE2B b47fb7e4329ee56fd11c666f3493a1ad78c816390b7f1748c6bccb780aaf2440fc18f6d75352f80c481b40bdd9a060c192ed2fd1d6076bedf45aa57d67c6a2f0 SHA512 c49a4e57f4cc812eb4412bd71b02ac70785afd6d1793b09212f15a72a83d92a5c5f769ac569b7fe1e9f31b49b5abae913c647c75e82c3e7c3405e20819ff3b37
diff --git a/dev-go/go-tour/go-tour-0_p20160209.ebuild b/dev-go/go-tour/go-tour-0_p20180810.ebuild
index 5dd5bec1b027..0266d4dd62b2 100644
--- a/dev-go/go-tour/go-tour-0_p20160209.ebuild
+++ b/dev-go/go-tour/go-tour-0_p20180810.ebuild
@@ -1,10 +1,10 @@
-# 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
 EGO_PN="golang.org/x/tour/..."
 
-EGIT_COMMIT="6b2e5b35ce8ed092eaedc3d2a2294373a639f122"
+EGIT_COMMIT="d642b9371986f5bb2152547a0d525a57f634c3ef"
 ARCHIVE_URI="https://github.com/golang/tour/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 inherit golang-vcs-snapshot golang-build
@@ -15,22 +15,28 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-DEPEND="dev-go/go-tools:="
+DEPEND="dev-go/go-net:=
+	dev-go/go-tools:="
 
 src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_PN%/*}" || die
-	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	[[ -x $(find "${T}" -name a.out) ]] || die "a.out not found"
+	local x
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	for x in net tools; do
+		ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die
+	done
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	[[ -x bin/gotour ]] || die "gotour not found"
 }
 
 src_install() {
-	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
 	exeinto "$(go env GOTOOLDIR)"
 	newexe bin/gotour tour
 	insinto "$(go env GOROOT)"
 	doins -r src
 }
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/gogo-protobuf/Manifest b/dev-go/gogo-protobuf/Manifest
index 5b4f5a49fbfd..a87645aff269 100644
--- a/dev-go/gogo-protobuf/Manifest
+++ b/dev-go/gogo-protobuf/Manifest
@@ -1,3 +1,3 @@
 DIST gogo-protobuf-0.4_p20170815.tar.gz 2572704 BLAKE2B 5a536c01dfa71f274f54e788ca863e74737cd356fbc4f3dad75d540589951140ed6c03a72cc8b84952a9dfceebab71c549715b0843ec704ad5de972e448e658d SHA512 3ab7f2e0006e537999e5fd0ba52272ad53c4707688401bb1e415007600f1ac5200dd8a03bd706977813b17c7712ba94a8b43fcf13b6498114a1d79c72bb216e7
 EBUILD gogo-protobuf-0.4_p20170815.ebuild 1048 BLAKE2B 12c0284d874ffb69aa9289a6ae6287e80047dd4155a702852d4c3087a21cfd16f9a1a2565d4434fddfd3fe730092c386a6c34fef7bcc1d4d9cea9b18b03d1580 SHA512 8c90de5ba3f264e075f366ad3ac40043cddf360da5ec16c7f44522ce9a5c3e93d0f3bafc07ffbef7fdb929172bc47db1bacc42c6345097887ed432675a2351d9
-MISC metadata.xml 323 BLAKE2B 902e54b6293376193b94221b5763f3bf4de242e6ecc1670fe15528e177dedd8c65132abe7ab284fa34bc16c49282fac7d3c30260455dbc7da358d9fefda062ce SHA512 d5bbbadf23e0bf2ef8757ab4231aff3c2a45b861d9ca0439c41863b91e24157680663385b65d8fa9ceade83e3e4705bcb54cba67d56a9e48bb2f1789c78103dc
+MISC metadata.xml 245 BLAKE2B 9c22c3deb5251bea74cf97d35bf9565dff4d04054cb1845590aaf18df9ee63f4801d3c1cecf14c7923882cdf66948be5c32934374771a688dba1d652db24575e SHA512 3986757ef5e75ba84c00905a8ad49499dba2ce20330204c213b676ba4731a0920f5dd661c33ccf46b4e7d2c2ba19897d55dc83634170848ff732fd42477d0757
diff --git a/dev-go/gogo-protobuf/metadata.xml b/dev-go/gogo-protobuf/metadata.xml
index 180140b98774..9aa34401e269 100644
--- a/dev-go/gogo-protobuf/metadata.xml
+++ b/dev-go/gogo-protobuf/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">gogo/protobuf</remote-id>
 	</upstream>
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
index ede42ccd9337..908cf7635024 100644
--- a/dev-go/gox/Manifest
+++ b/dev-go/gox/Manifest
@@ -3,4 +3,4 @@ DIST gox-0.4.0.tar.gz 15766 BLAKE2B d2cdab2404f49bf658eedc8884185044e19df0a62509
 DIST gox-0_pre20160725.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
 EBUILD gox-0.4.0.ebuild 637 BLAKE2B 706eaf1ed567a5f17fc9e782099f21aff2925761a8784226a08be8b2630cce3d4b54d9e7edf5aba30ecd3f6c81ea2684dd0510e47f645b3c6bfb5f9a87cca67f SHA512 a7cbceb9c28d2eaa76eaf9af45f62b65b98c676dd9d0ca02ab0197d9281abac1dddf66b95b319282e20a0c2731bf882d389c4741246d9a8c2603b07188eb2f15
 EBUILD gox-0_pre20160725.ebuild 700 BLAKE2B f6247d9425967116bfa730c6664f17f66b099da71b4a0329c4cfc2d9c08dadaa4a57671bc0e76bef42864ea6b4494f1c4436fea184248e5e67109ed8d02d347c SHA512 cceb276eef86d8018b35dc61a7acd908abd42684958a7cd80f19ada359812a7c5edd81da619698b5a116e6afdbaab1de4fed1bafec4b8d0da063c8128a158c50
-MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-go/gox/metadata.xml b/dev-go/gox/metadata.xml
index 97df2a00971b..6f49eba8f496 100644
--- a/dev-go/gox/metadata.xml
+++ b/dev-go/gox/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>