gentoo resync : 19.03.2019

6 files changed, 14 insertions, 7 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 0ec7e67ab3ad..efa763346b4b 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 71174cbedd90..3f4e01ae9f88 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,6 +1,6 @@
 DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
 DIST go-favicon-20181103162401.ico 5686 BLAKE2B 331d7684a569fc40fcd147eb812661f42b0ee3ca4c017515c33523b588b012763ce29f24bfce5bc7274e7560ff7dd8e872af43d2b51dc0722ac416b43c11f841 SHA512 0a6fe8bddbce99ed7fd035a3dc998dc9e893060854eee9d1c70bcc8de77b71fd3bd203b2de0f1c9a146f7d47555ab856389e16a372ee41f4ab57be611877fc16
 DIST go-tools-0_pre20180817.tar.gz 2321169 BLAKE2B d1ba93b36b62bfbf53770cab6c96019d1a96db0ff6521f591577d866f74a1f65ec24e41a06f81d0040be7122f2e0da734e68d0a72591040265b5f95b324645fe SHA512 1af6c4a58f4d1985dc55e4342d9a4f26ada646ffe87fafdb5bdf876ad972a9f826da257ff9a10956c24dbc90ed9d6935bb78b4f7d30f9e50493c60f7ce92edb1
-EBUILD go-tools-0_pre20180817.ebuild 2554 BLAKE2B 6896ac6c4f7a392c333f17d9d27b6ac8475682bf59755c04c8d91927a1096ba42b955c89e08e6546bb1314bfed124f307a8cadfd998f4af95210194702085158 SHA512 94444293ee626ec6a598f213cef127ccc63b5990683e4141ccb78b8684201be6715ac819385638a01e6ba4f4d37bbd4eca33b74a0cd1abe76776054d00e3e5a4
-EBUILD go-tools-9999.ebuild 3125 BLAKE2B d1030911d200939ca732058a1e267cdb2e10c4597638deff2e14d7f89a19d9afabb71292001ed8d8f0c175b47cbd2d137938c56a42c0072396e62f29d606390f SHA512 519c5ca3f8747d010febb30fcee4a91ace4db5f6d06698fc09ed64d1876df18bb7acdb3086a4521e0031cba326f376402c1ba69b4460332885c5d5b36fc949a0
+EBUILD go-tools-0_pre20180817.ebuild 2593 BLAKE2B 67c1b8276508f4b14e17e21bb99e58d6c396933d4e14c2c39d50b8a7bcf7c02b75a1c83c62755d7951812eea0f7395c657531969f17405a0ca73bc45c047fa03 SHA512 f30a15200b0bf9b57137c7f7efd1d066d6cb6d79a77a46edea920b67b5bbd4d8a120adf742f501b1a49a0560a9b370b163ae19da0d586847920414b585d093dc
+EBUILD go-tools-9999.ebuild 3164 BLAKE2B eb97618904c3223f56444ebea820eb9716edbcda3aaf0c092dab0040c7ba166f61e03012c13460c9655666cd714f5d89b8ac6c619908c61d6fbc8e3ab9c93c4f SHA512 a61403126905fdaa1f5ff29868ef28eb6b30c13262ff66483397a7eefcf03bd51d7f7e6ba2a3f6503b6f4bbd6e2d92ee769f9cc7c3334c9f1b4253359e76420c
 MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0_pre20180817.ebuild b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
index 5191bd7e69ca..a7bd294e6203 100644
--- a/dev-go/go-tools/go-tools-0_pre20180817.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678964
 	# Generate static.go with favicon included
 	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
 	GOPATH="${S}:$(get_golibdir_gopath)" \
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index fb8bd018f99d..ffc68729ed0b 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,6 +65,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678964
 	# Generate static.go with favicon included
 	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
 	GOPATH="${S}" GOBIN="${S}/bin" \
diff --git a/dev-go/go-tour/Manifest b/dev-go/go-tour/Manifest
index 3bc1564e6ed8..cf57581fc627 100644
--- a/dev-go/go-tour/Manifest
+++ b/dev-go/go-tour/Manifest
@@ -1,3 +1,3 @@
 DIST go-tour-0_p20180810.tar.gz 319048 BLAKE2B 43c4ca53d939cf7590c8e3607e2089974f1b40dc9268ccbf9100e36d258d76a828c5512e662f20d125c07d0a35d48d3004c8f06d6f80a6a1645099d4ca592c57 SHA512 73eb1b7a228d046d572b2c781cdd7b43ef57de982987ab5808cbb2775c34c9805fac3c52fd68edd34ccadec5169ce5d61234eee553daf0b9ef2d2529e2817b44
-EBUILD go-tour-0_p20180810.ebuild 1094 BLAKE2B 2cbb46860460043328b8db825da7855d99105b109749cb94e6c79d6282d7a74b761db19ba3bca622da654a23d54bdf24b9e770d5b212c90c978bda2cc32b319d SHA512 43818de5961041d32b8227c561cbe7c7e5b93b13006580979e1c90d3d2d60d82cbeb280b41a6e481c0fc60183b66e0e18bb2866a70d81f542f4514f93f96f905
+EBUILD go-tour-0_p20180810.ebuild 1412 BLAKE2B 19c7e43de92c5a852e5516ff83bfbfc1e1f34adffd3d67094e38e9e602f273dc72f897db547dfd9c3d8b853d33aae1018bd0f2a64c39ed932bd9bfc369aeb2c4 SHA512 dbfa7d6c2151374cff74bc6623d8253042797c5429d5e2b039d896db0b06348ecb8f6940758b94e815cc45e62741d86c16e9f14511b3fef1290a65cefb6d9ae8
 MISC metadata.xml 302 BLAKE2B b47fb7e4329ee56fd11c666f3493a1ad78c816390b7f1748c6bccb780aaf2440fc18f6d75352f80c481b40bdd9a060c192ed2fd1d6076bedf45aa57d67c6a2f0 SHA512 c49a4e57f4cc812eb4412bd71b02ac70785afd6d1793b09212f15a72a83d92a5c5f769ac569b7fe1e9f31b49b5abae913c647c75e82c3e7c3405e20819ff3b37
diff --git a/dev-go/go-tour/go-tour-0_p20180810.ebuild b/dev-go/go-tour/go-tour-0_p20180810.ebuild
index 0266d4dd62b2..c5967f041fa4 100644
--- a/dev-go/go-tour/go-tour-0_p20180810.ebuild
+++ b/dev-go/go-tour/go-tour-0_p20180810.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,11 +20,16 @@ DEPEND="dev-go/go-net:=
 
 src_compile() {
 	local x
+	# Create a temporary GOROOT, since otherwise the executable is not
+	# built if it happens to be installed already.
+	cp -rs "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/"{pkg/tool/$(go env GOOS)_$(go env GOARCH)/tour,src/${EGO_PN%/...}} || die
 	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" \
+	export -n GOCACHE XDG_CACHE_HOME #567192
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" GOROOT=${T}/goroot \
 		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
 	[[ -x bin/gotour ]] || die "gotour not found"
 }