gentoo resync : 15.09.2019

3 files changed, 124 insertions, 2 deletions

diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 94cb3c3c6ab7..92c1fae4710c 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,6 +1,11 @@
+DIST github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
 DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
+DIST github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
+DIST github.com-golang-xerrors-a985d3407aa71f30cf86696ee0a2f409709f22e1.tar.gz 12271 BLAKE2B cdcaf0bbf67399c9176786118a622fc0912036b9b0611922dd3d32ace2cac65ac288136ef228ff526e626d36c16e6f8442ffbb5df0c84fd713a669c326fa350c SHA512 719b3a3e432a928f641e15b8553d3e2c2015b1c68c633e9f13f1d57cee634544bb857518fcd75124e41a448b4c219b80dd0c1823329eb4edfc715994d40331d5
 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 2645 BLAKE2B 1fc85f9022a35895d830527bd8644db2dd1d9b8922771ea63b4d4b9569be22c930df5c38e8cd73759c93fd7cedc8891ce91e1ba20a3206ad148c55f28114877e SHA512 a2efdb24332e3ca1914cc00f00c4311b90e5c4614fdf88b935ad14a85056a832a6cf93a272beee01bbb5c32a6244eed3cb49d35a7e5ddf8fc097057ce6f96e66
+DIST go-tools-0_pre20190911.tar.gz 2264380 BLAKE2B 049d961191eec5b3bd75d9ab1dea576a9b3700cdcd06fce39ae34844af7dc045d61cbe604c16c1fd355f38c0a3e5523c0162ca37c49bd7a7d28642fa2a5b4e5e SHA512 d72f71a8d3f1b14b165d60279dd4dc110ee59ae0e716cdfa9d23610d65972c03fea7191848e5a1b38dc6a2ce96050fdd919f3251e39c0dced11be9d47087a50c
+EBUILD go-tools-0_pre20180817.ebuild 2660 BLAKE2B fbbb176fabd1f2d0423dad3f60a7a65b4e87de284baa7e30b67ee0caba821fe7ef87825eb3460ac5a3b947b1b1bbe236db3ed52de45ce6965be4c86f7b1671a2 SHA512 f88c6053150558e5ead6f41e49ba37d013a9e1ff3a87bfc0c1d4729a93d0469a7e5875fa71cf01b3a3a5e667ace2bae5c25a3802fcaeb835b692242cec4c4a0a
+EBUILD go-tools-0_pre20190911.ebuild 3952 BLAKE2B ef5717a0cb484d2c84b21017223098cc49ce8e79a9ddfc0810d9eee7d3d5ee7ce8631fb993a6c2ebe4284dc77300392c9671b5bd2cd6c00fb803e3c9b002a580 SHA512 7a232bc4cdf1815d217cd54fc855280a146f002f51f772517dc0934f6aeec04561301cae29c239ce7baefe9cb477291db0043eeb04e68548ba92223378a95ac8
 EBUILD go-tools-9999.ebuild 3216 BLAKE2B 119f173e1c3a5c325cd7b909b870ff805b865e6fe32591df571f5219b411b275bfa3c8132c07bdf9aa78492e182c1f23582ab3258c9db27d3911654b9a88a6a1 SHA512 b6bce78a41d6c875d9cd5aac8085f7d2debd14ed7135397211915675d22e40dc63c6c969a03e2d8e1346aee3da656774059deb8542400eae033dee630c0cc642
 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 35fe93954d4e..787b6a953867 100644
--- a/dev-go/go-tools/go-tools-0_pre20180817.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${ARCHIVE_URI}
 	${EGO_VENDOR_URI}
 	mirror://gentoo/${GO_FAVICON}
 	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
-LICENSE="BSD"
+LICENSE="BSD Apache-2.0 MIT"
 SLOT="0/${PVR}"
 
 src_prepare() {
diff --git a/dev-go/go-tools/go-tools-0_pre20190911.ebuild b/dev-go/go-tools/go-tools-0_pre20190911.ebuild
new file mode 100644
index 000000000000..5a326334fe15
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20190911.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="golang.org/x/tools"
+
+EGO_VENDOR=(
+	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
+	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
+	"golang.org/x/xerrors a985d3407aa71f30cf86696ee0a2f409709f22e1 github.com/golang/xerrors"
+)
+
+EGIT_COMMIT="6bfd74cf029c99138aa1bb5b7e0d6b57c9d4eb49"
+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="Tools that support the Go programming language (godoc, etc.)"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+GO_FAVICON="go-favicon-20181103162401.ico"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}
+	mirror://gentoo/${GO_FAVICON}
+	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/${GO_FAVICON} "godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i 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 godoc/static/godoc.html || die
+	sed -e 's:TestDryRun(:_\0:' \
+		-e 's:TestFixImports(:_\0:' \
+		-i cmd/fiximports/main_test.go || die
+	sed -e 's:TestWebIndex(:_\0:' \
+		-e 's:TestTypeAnalysis(:_\0:' \
+		-i cmd/godoc/godoc_test.go || die
+	sed -e 's:TestApplyFixes(:_\0:' \
+		-i go/analysis/internal/checker/checker_test.go || die
+	sed -e 's:TestIntegration(:_\0:' \
+		-i go/analysis/unitchecker/unitchecker_test.go || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i go/internal/gcimporter/bexport_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i go/internal/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-e 's:TestStdlib(:_\0:' \
+		-i go/loader/stdlib_test.go || die
+	sed -e 's:TestCgoMissingFile(:_\0:' \
+		-e 's:TestCgoNoCcompiler(:_\0:' \
+		-e 's:TestConfigDefaultEnv(:_\0:' \
+		-e 's:TestLoadSyntaxOK(:_\0:' \
+		-e 's:TestMissingDependency(:_\0:' \
+		-e 's:TestName_Modules(:_\0:' \
+		-e 's:TestName_ModulesDedup(:_\0:' \
+		-e 's:TestPatternPassthrough(:_\0:' \
+		-i go/packages/packages_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-i go/packages/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i go/ssa/stdlib_test.go || die
+	sed -e 's:TestLocalPackagePromotion(:_\0:' \
+		-e 's:TestLocalPrefix(:_\0:' \
+		-e 's:TestSimpleCases(:_\0:' \
+		-i internal/imports/fix_test.go || die
+	sed -e 's:TestFindModFileModCache(:_\0:' \
+		-e 's:TestInvalidModCache(:_\0:' \
+		-e 's:TestModeGetmodeVendor(:_\0:' \
+		-e 's:TestModCase(:_\0:' \
+		-e 's:TestModDomainRoot(:_\0:' \
+		-e 's:TestModList(:_\0:' \
+		-e 's:TestModLocalReplace(:_\0:' \
+		-e 's:TestModMultirepo3(:_\0:' \
+		-e 's:TestModMultirepo4(:_\0:' \
+		-e 's:TestModReplace1(:_\0:' \
+		-e 's:TestModReplace2(:_\0:' \
+		-e 's:TestModReplace3(:_\0:' \
+		-e 's:TestModReplaceImport(:_\0:' \
+		-e 's:TestScanNestedModuleInLocalReplace(:_\0:' \
+		-i internal/imports/mod_test.go || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678964
+	export GOPATH="${WORKDIR}/${P}" GO111MODULE=on GOFLAGS="-mod=vendor -v -x"
+
+	# Generate static.go with favicon included
+	pushd godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	go install -work ${EGO_BUILD_FLAGS} \
+		$(GOPATH="${WORKDIR}/${P}" go list ./...) || die
+}
+
+src_test() {
+	go test -work "${EGO_PN}/..." || die
+}
+
+src_install() {
+	rm -rf vendor || die
+	pushd "${WORKDIR}/${P}"
+	golang_install_pkgs
+	popd >/dev/null
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe "${WORKDIR}/${P}"/bin/*
+	dodir /usr/bin
+	ln "${ED}/$(go env GOROOT)/bin/godoc" "${ED}/usr/bin/godoc" || die
+}