gentoo resync : 18.11.2018

7 files changed, 11 insertions, 153 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 638cfb13b453..2949b705d6c4 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 2754ca6bb58e..71174cbedd90 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,8 +1,6 @@
 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_pre20160220.tar.gz 1827046 BLAKE2B 26b4080540958764c42fffc1cb6a1597705c0a7ea85357b5169f9a0bf6939d7c5475681f6fede8b46a88ef58c72afa9eaa9da3fb66a3bbbb19942d0a1887bbeb SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1
+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_pre20160220.ebuild 3479 BLAKE2B 0c985cf0b27aee2600ad5099e126f306c8a1d4c96c810306cef20bb1cc450c88783cd2a818fedb474a2b5c58ac1223ef95ca3279441d6678ff4d13319a4820f8 SHA512 90edc996457245773d17ee74f14ab23902ba62e9d184fd1869b11e68d800e129b48bf2599a682a01bd4ad1d86123cc200f4a7f5524bbbf5263f14b9660b94643
-EBUILD go-tools-0_pre20180817.ebuild 2473 BLAKE2B e8f991baea83a03aecb9d753becdc48997b75392457487c62d24251e56eb7f09dfd25e13911e268af655b38b50fd4476682bf83b9d87ac0dcca5bef6aa98db8b SHA512 f811140755682828b1271a36835301d60d558d7e13199912ae7b4666e16ebc1a7c0dbda2a23bec5c4779c00aa17d4cc5c25d21b21333d7d6e10f9893d9784542
-EBUILD go-tools-9999.ebuild 3044 BLAKE2B f27fbdd1420d74023c1bde11321bcbd4fc1eb4c42ac26c5c3f03714e2a679f6669f4df60875721f6b4ed793db3a82614a1104aeeeb7c60390e7491a6f38e3e90 SHA512 30db6795c125555862a577c4798bca3ff93158107b041517a787eb99b6dc36b36ca56c88d7315a15589e2c52b110c0d1a8f23640cb309cb397c72a84c5bcf201
+EBUILD go-tools-0_pre20180817.ebuild 2554 BLAKE2B 6896ac6c4f7a392c333f17d9d27b6ac8475682bf59755c04c8d91927a1096ba42b955c89e08e6546bb1314bfed124f307a8cadfd998f4af95210194702085158 SHA512 94444293ee626ec6a598f213cef127ccc63b5990683e4141ccb78b8684201be6715ac819385638a01e6ba4f4d37bbd4eca33b74a0cd1abe76776054d00e3e5a4
+EBUILD go-tools-9999.ebuild 3125 BLAKE2B d1030911d200939ca732058a1e267cdb2e10c4597638deff2e14d7f89a19d9afabb71292001ed8d8f0c175b47cbd2d137938c56a42c0072396e62f29d606390f SHA512 519c5ca3f8747d010febb30fcee4a91ace4db5f6d06698fc09ed64d1876df18bb7acdb3086a4521e0031cba326f376402c1ba69b4460332885c5d5b36fc949a0
 MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0_pre20160220.ebuild b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
deleted file mode 100644
index da04f9371b08..000000000000
--- a/dev-go/go-tools/go-tools-0_pre20160220.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="ee8cb08bfe4453a27a4bd7c86a917800d339c5ac"
-	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
-	rm src/${go_src}/cmd/bundle/main_test.go || die
-	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: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: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:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' \
-		-i src/${go_src}/go/types/stdlib_test.go || die
-	sed -e 's:TestFindImportVendor(:_\0:' \
-		-e 's:TestProcessVendor(:_\0:' \
-		-i src/${go_src}/imports/fix_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/*
-	# godoc location varies depending on whether or not it's
-	# installed on the system (bug 591656)
-	[[ -e bin/godoc ]] || doexe "${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
index f4effc4ab2dd..5191bd7e69ca 100644
--- a/dev-go/go-tools/go-tools-0_pre20180817.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
@@ -14,16 +14,18 @@ inherit golang-build golang-vcs-snapshot
 
 DESCRIPTION="Go Tools"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
+GO_FAVICON="go-favicon-20181103162401.ico"
 SRC_URI="${ARCHIVE_URI}
 	${EGO_VENDOR_URI}
-	http://golang.org/favicon.ico -> go-favicon.ico"
+	mirror://gentoo/${GO_FAVICON}
+	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
 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" ||
+	cp "${DISTDIR}"/${GO_FAVICON} "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
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 10b4b86e3238..fb8bd018f99d 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -22,9 +22,11 @@ inherit golang-build
 
 DESCRIPTION="Go Tools"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
+GO_FAVICON="go-favicon-20181103162401.ico"
 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"
+	mirror://gentoo/${GO_FAVICON}
+	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 
@@ -38,7 +40,7 @@ src_unpack() {
 src_prepare() {
 	default
 	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
+	cp "${DISTDIR}"/${GO_FAVICON} "src/${EGO_SRC}/godoc/static/favicon.ico" ||
 		die
 	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
 		-i src/${EGO_SRC}/godoc/static/gen.go || die
diff --git a/dev-go/golint/Manifest b/dev-go/golint/Manifest
index 180a1d3f2387..f5475ee91969 100644
--- a/dev-go/golint/Manifest
+++ b/dev-go/golint/Manifest
@@ -1,5 +1,3 @@
-DIST golint-0_pre20161114.tar.gz 30204 BLAKE2B 40bc84a2daa86c2956332ffe46dba45d2cdb0826b31251bed3e94f6f794c1f6d41f009b8ad807ec864198e96899aee09e8a189416e398c3386fbf556d12fee5a SHA512 6ba92ade7a84ab587383ce5fe857ac4d6f731a75390ff52ede0bf0ef85b4eea7ebb33282b8332727bf94461891e098700de6d8e8b625f580e4cf791ab436278b
 DIST golint-0_pre20180702.tar.gz 31957 BLAKE2B fb3129918bf352ab75f617d933902055877473ca9269b0e5bf91a727e88b579b7b6ced6255d845364405a749ef0aae1f8f67bab0cf97916b39fd7e8f4be54f74 SHA512 bbf550927f547950e0a8270eaf4981cf51b799998e2154058aad3345579ea3a70581cdc13cc36345ca82cf3513a88092f0f5d453895768d05b25a4c47f030fb0
-EBUILD golint-0_pre20161114.ebuild 811 BLAKE2B 0c9704fc59b2d6e84cceb3f77207c45cf2b0ee10da57891b35b32c3691bd52d6a6bed32b3048d85c962c11937f6e0795f3cf93f1d99d45910aca99f463d2b83b SHA512 9d4702fcb40edb150c3b520df0e8f04fc5564da334d02d706965c17bd18e2d62107edebe88434ba7c42346efc94c79f5e885a2fc73ad2d95d1d8f3ff6a9bc740
 EBUILD golint-0_pre20180702.ebuild 772 BLAKE2B 8c84b05996c8e57f2587ae484a715543e4307fdb7985aa910fd517022b27b4871a461dd60edf61f1b9394f154b6fa562f8372eb8544280c601caf3733b1d55c5 SHA512 1b80ccf869d423187aca953913dacc8e66447888bdfb3c74d08540f7aeeb66c087f199042ffc4b89de45fc8e2fecb2bf4bc0923ced7204f23bdb05d2047343a0
 MISC metadata.xml 324 BLAKE2B 66f4944a9c30a65ccf8a89b90f5d5150165a936daa0f39f74fa5e5de9348288df31bcff94cd61bcc67fbdccbc0ceffa4c2a8cec00d2a1a2ca3621a0bf9b09e24 SHA512 69b45d514c5f5f336495087dc1e1343594596155307671e9c05c6a95f063362b21a5392a59d038bcbbfc6e4e071f015475fbc573d63824381f22425a1c0579f3
diff --git a/dev-go/golint/golint-0_pre20161114.ebuild b/dev-go/golint/golint-0_pre20161114.ebuild
deleted file mode 100644
index 7342fc55f018..000000000000
--- a/dev-go/golint/golint-0_pre20161114.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/golang/lint/..."
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT=206c0f0
-	SRC_URI="https://github.com/golang/lint/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="a linter for Go"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND=">=dev-lang/go-1.6
-	<dev-go/go-tools-0_pre20180817"
-RDEPEND="!<dev-lang/go-1.6
-	dev-go/go-tools:="
-
-DOCS=(
-	src/github.com/golang/lint/CONTRIBUTING.md
-	src/github.com/golang/lint/README.md
-	src/github.com/golang/lint/misc
-	)
-
-	src_install() {
-		golang-build_src_install
-		einstalldocs
-	dobin bin/*
-}