gentoo resync : 25.08.2020

9 files changed, 57 insertions, 85 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 306b5d0c1868..0467cd08400e 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/gogo-protobuf/Manifest b/dev-go/gogo-protobuf/Manifest
index a87645aff269..ab46723b4701 100644
--- a/dev-go/gogo-protobuf/Manifest
+++ b/dev-go/gogo-protobuf/Manifest
@@ -1,3 +1,13 @@
-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
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip 18257 BLAKE2B da8b70d502d0a158f016e697781f7dfa36fb36511d78ecb936a1f28d01d5ecf8294dbaacd3af1af421c541356db6cec80f47d405e886110e92b1b8be82dee68d SHA512 840140a0059fab470fa431ed5d76a6405c7954c0776d128290d25a3a4746a92d08b48aa35514fe8525e2ad3051dec4436f0c1f0e4b35e07ce082a0d7b019b64b
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip 21331 BLAKE2B 9e5e52229bde22035a34b7d3883106b3a663daf914560887db12c6c1112b8a94f13c4d0067d1a0958df57f0a4b0c3747ad61005501505c5eb63faa547ae63c96 SHA512 65d0271eede1389084e66c6d1bb547b240aa97747d6b7e74b5edc99cf0453eee10f24d64865b34c29a6a536c138942bb6d070b639d23bc3e78af3a7eca6949a1
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2
+DIST gogo-protobuf-1.3.1.tar.gz 2038188 BLAKE2B aee5f1910018ada96b4e52070bc487f6703c6cce4366cf5e1f167234702a7a318dc8dc74c19fc6612579d7d59b7e8220cea0edb6e70ee37c141093d857872607 SHA512 a901a849d5161fb9806ded3b4e57afc53a355875625ef285a74895deff32d799bf96feace6fe55aff40be5f16347a491ec16529c8d1ca4cbf087174960f013a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.zip 2585456 BLAKE2B cea45d54359b81dc553f826f3b6496fc1e4d7fb99dfb8397b2c21d62b7439836ad28821600ee6ffec67095bb35a2a281afe77db72cf208e9557f018fe8a1ac7c SHA512 f6d44993b03e54a30fe6562ff95491c807d851bf028ed5c713f019b8d5fa1985efa023e887cc91020137a4b4611a7fb12460be16488ac074b32b64eb20bba2b3
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.zip 3180971 BLAKE2B 8822257027065f8b6aec01abb45bace2c32ed0b2e4646dca1574327cb09b007474993d376fc0c4360824a57158c5a92d392dc1c781c66f60f8a5623353c83ece SHA512 b9bc3fead52b144168017fa1400dfa789f8b1b22557173799c06df70a2b149a64aade686680d56e054961a937b88013297c0ca9e23d6e9b20cfa5684d9c16a1d
+EBUILD gogo-protobuf-1.3.1.ebuild 1056 BLAKE2B f41374c7ec14bfb54761bbbefaee8b6404ff4f12e09650af0f1059f8cffb2613613474d968c498849e64903870a587e0e0ef9cbcfb69e10ccad3e0ebc5ed9d27 SHA512 2f8861a871f02462dfcdf8a7fa995dbff8675a03b2fb41bc756d24ef5aedd00109df43b937e49e6c51b763c2fd305b30e8ae9818cc444c7fa6c310ffc071334c
 MISC metadata.xml 245 BLAKE2B 9c22c3deb5251bea74cf97d35bf9565dff4d04054cb1845590aaf18df9ee63f4801d3c1cecf14c7923882cdf66948be5c32934374771a688dba1d652db24575e SHA512 3986757ef5e75ba84c00905a8ad49499dba2ce20330204c213b676ba4731a0920f5dd661c33ccf46b4e7d2c2ba19897d55dc83634170848ff732fd42477d0757
diff --git a/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild b/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
deleted file mode 100644
index 0abb1c6156a3..000000000000
--- a/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/gogo/protobuf"
-EGIT_COMMIT="fcdc5011193ff531a548e9b0301828d5a5b97fd8"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Protocol Buffers for Go with Gadgets"
-HOMEPAGE="https://github.com/gogo/protobuf"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install ${EGO_PN}/protoc-gen-gogo || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install ${EGO_PN}/protoc-gen-gofast || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install ${EGO_PN}/protoc-gen-gogofast || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install ${EGO_PN}/protoc-gen-gogoslick || die
-		GOPATH="${WORKDIR}/${P}"\
-		go install ${EGO_PN}/protoc-gen-gogofaster || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/protoc-gen-{gogo,gofast,gogofast,gogofaster}
-	dodoc src/${EGO_PN}/README
-}
diff --git a/dev-go/gogo-protobuf/gogo-protobuf-1.3.1.ebuild b/dev-go/gogo-protobuf/gogo-protobuf-1.3.1.ebuild
new file mode 100644
index 000000000000..638494adde97
--- /dev/null
+++ b/dev-go/gogo-protobuf/gogo-protobuf-1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Protocol Buffers for Go with Gadgets"
+HOMEPAGE="https://github.com/gogo/protobuf"
+
+EGO_SUM=(
+	"github.com/kisielk/errcheck v1.1.0"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/gogo/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT+=" test"
+
+S="${WORKDIR}/protobuf-${PV}"
+
+src_compile() {
+	GOBIN="${S}/bin" emake install || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc README
+}
diff --git a/dev-go/golint/Manifest b/dev-go/golint/Manifest
index 9db999d7bbb6..ccf5fc033ff5 100644
--- a/dev-go/golint/Manifest
+++ b/dev-go/golint/Manifest
@@ -11,5 +11,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.zip 2931354 BLAKE2B eaa01c066a3be354b161262a5e83f67b8edafec70735dff4727dfdfa59fc867b73f7246758b219c23055e05303d4ae663d656d12dd32ea5cbe368610ae33df41 SHA512 2201bbed9215537b9eacb06b9ae232511626138e508a5739c405ba8e5d498237a45919a55bb2b2a476a2fdf69bdad6144ec7673610423c0bf76099f7ea75eb4c
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golint-0_pre20200301.tar.gz 31870 BLAKE2B 54fd5d0c8c490c95f397ce7889a696726a57e83b350e2133724d80d8500a7d3b2427e3fa24bc28d82c8b4ca32fb9c4e45ec8021fe6f499e320c8194bb113f229 SHA512 d62a20f02006d6e69391f5758ed1f3fe2c81a44e782d6a5530c6feacd9b1547168ae9401f84c92ff4adfcbda32d97049cd7afe47b00ee91ec50bc850c8ca9462
-EBUILD golint-0_pre20200301.ebuild 1375 BLAKE2B 849434b407dd0210f1e499074c05cb6ad0b6eb46703a19589f28e1c0d5e0da363c1778f75d784a97b98c4c1480410e7aa3d14fcf0bcc3cfac2bc4049ff309923 SHA512 1612d44a977b57c0a797b6087920bdb03c93b85fd219940351ae21df54e12d031988709c225bf1ee2a96adf60808c79907f1b6b78344932bcb111ca24997c18e
+EBUILD golint-0_pre20200301.ebuild 1380 BLAKE2B fefd53f5fc4f154f8b2f54366dffe84f9add5691e24b77e94a4cd0db1e9ec8b628902537b427a3a4802bffa3eb6b2581a353731d35424e0abb6b0185ae4b6919 SHA512 0b1e827cb61e251cf63a9c54f831d666533de1e119c5649de1d9b5ebc247775f8c116c3aacb89a0ec8a16d216d5da3d4af7ba0c0c4ebc20f78d9fdc0906567d3
 MISC metadata.xml 324 BLAKE2B 66f4944a9c30a65ccf8a89b90f5d5150165a936daa0f39f74fa5e5de9348288df31bcff94cd61bcc67fbdccbc0ceffa4c2a8cec00d2a1a2ca3621a0bf9b09e24 SHA512 69b45d514c5f5f336495087dc1e1343594596155307671e9c05c6a95f063362b21a5392a59d038bcbbfc6e4e071f015475fbc573d63824381f22425a1c0579f3
diff --git a/dev-go/golint/golint-0_pre20200301.ebuild b/dev-go/golint/golint-0_pre20200301.ebuild
index 667f9da059da..5a2861e7ffc6 100644
--- a/dev-go/golint/golint-0_pre20200301.ebuild
+++ b/dev-go/golint/golint-0_pre20200301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/golang/lint/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}/lint-${EGIT_COMMIT}
 
diff --git a/dev-go/goptlib/Manifest b/dev-go/goptlib/Manifest
deleted file mode 100644
index 017a71d37335..000000000000
--- a/dev-go/goptlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST goptlib-1.1.0.tar.xz 26204 BLAKE2B d8f16646ca167d2b7d83aabb0f9ea1bc3d211afe96fc6e088856734c3b7efc7eec5ba3f0885e5cc3a73cafe3e760fadc21a0e9f3f64d9ff7f39077c13c63aa7f SHA512 28dc9a2c00e7630ca1712172ab155147e281c3527bc95d826cdfe818f89ef5a7ab47b392a90a2a59378b47d842a375773a53b26c9fa389d62e7919fbcb025b43
-EBUILD goptlib-1.1.0.ebuild 577 BLAKE2B 184b5b9a3a5b5366cb8711264c56ebbde858e97a6f1b78e5d7497b20a2b06f6270a09e40bed23a203259e11475ec616e7187e56192554d6be3b45bce68b41640 SHA512 b6186c2e5b86e153423a379805a41473dfb019d5196fe660c9dcdc472a966aa4faf933b0de6a9d0110d61fb00b4d68f8e478696a399f75730aa186c10abd63ef
-MISC metadata.xml 358 BLAKE2B 330c914b403f0d5a41e538c333484f974330039b62d2ac7df08b1871a0ceb63edb391f38dd67b9286f054c6e26ada560405c92ea48433dccafb4d71b84fbb9a2 SHA512 e4ff5460265f6df156ded881294e4755b34fe2bcb0ba57836a137dfe80606a58b7c79943e46e4b4eef4197422512b06590ec041dbb451ba9b8de705417cd0253
diff --git a/dev-go/goptlib/goptlib-1.1.0.ebuild b/dev-go/goptlib/goptlib-1.1.0.ebuild
deleted file mode 100644
index 38ed04bb68bf..000000000000
--- a/dev-go/goptlib/goptlib-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=git.torproject.org/pluggable-transports/goptlib.git
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="${PV}"
-
-DESCRIPTION="Go Tor pluggable transports library"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/goptlib.git"
-# Upstream does not publish release tarballs
-SRC_URI="https://dev.gentoo.org/~marecki/dists/${PN}/${P}.tar.xz"
-
-KEYWORDS="amd64 arm x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-go/goptlib/metadata.xml b/dev-go/goptlib/metadata.xml
deleted file mode 100644
index 2662d67c9d82..000000000000
--- a/dev-go/goptlib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-</pkgmetadata>