gentoo resync : 21.06.2020

4 files changed, 2 insertions, 24 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 62987821268d..306b5d0c1868 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index 486cb3e92d98..dddcb6592ede 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1,6 +1,5 @@
 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 go-bindata-1.0.0.tar.gz 17871 BLAKE2B d461d863f099c705dbee5d32b188f1fde369c6e7497dfb8a1434d54f1c7bbf462357956960671f85813ce63fe1a3744578fa7a474362149aa115ac7c36a22fc8 SHA512 e6b46f80e39ad5463d67289fcae102eb7c18e8390daee99e495a94c97ed35df390dbfa6a36e11f43663ce38f05cafafdb5b3dd2896885fab7fd1f33e865d82a4
 DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
@@ -13,6 +12,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.zip 2908295 BLAKE2B 2dd707c5fcea8b16c24aa85c6ed98c0cdd26440a04a3f4c61d55e315f1959e133af3644dd7b0480c007367806e56b64e2a80f0680551d77c57b84f8a810725e8 SHA512 4f1931e839f7ccbdefde629b5ace77a463104179b58818963eebe42548185b5c8597c0632735ec25a6d0eccf85d8294eabcededcfda12b29bd21c4fc7e84aad5
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-EBUILD go-bindata-1.0.0.ebuild 547 BLAKE2B 16e8db22c36cc256db6fa7525fa7f1ce604cb28afa4ddb40397b3f6c6a38611af4a897017cc235906fc1b5eb436d0618fe2e642d8c087384db74a8b257f2e989 SHA512 32c2a16bf31e6afd3438a69240cc6d2c03920d9fe6e2333f3c7fa89579e8ba80c0a70b52e8c650638f36d4dd61f52e64b7b20db2cd8d892a591ee722f2cd28e0
-EBUILD go-bindata-3.1.3.ebuild 1334 BLAKE2B a67e662b1ff82b45f402b1afeaeda2b70963f5a39c1c5d6c0cb58fa1671547b77da8fc4faa2001414b0ceb7b03522ec629c5c542e916ff2c3618999b0a2c8d27 SHA512 15ec6c8440eef26845fa9ecf5ba991a09e82e379ddef6c898168e26d7c0bdb947059049974d7b8d1b3181cb90d741dd56f6ade66063b8e651f391b1d829d0ef6
+EBUILD go-bindata-3.1.3.ebuild 1333 BLAKE2B 4ccf3e7afa831b9aa1f343c6053a570d0850245681591022bfa8deeb303f1367c18a3db8e96b84b0e02e4f6f634d1599e06e8d54111b75c02e534e652eaea7a6 SHA512 c38e6e5d787fb4390365864255775cb5efd3dbdf2180ed97e605de1cbf3c7a7b9b7164c073b90a730b70202e00115e45a4febc087e769b340f0f8cd8ae40ea50
 MISC metadata.xml 251 BLAKE2B 78b1289c2746a6805eeb73edc062b5309b69d11585038e4c26d863ad9c3b202b9ce1589a97e1e41f4b1c2472b45456dc0a555fd22387ffeea319d1fb3806c229 SHA512 d241954967f8571d47611771a1655e0719a0cdf7c339df0a8b7d184b01fb773a8e311465f18afcfe9dffcdbff427e1165bafb0aaca0d2837b2d1b55729b1b6cc
diff --git a/dev-go/go-bindata/go-bindata-1.0.0.ebuild b/dev-go/go-bindata/go-bindata-1.0.0.ebuild
deleted file mode 100644
index 50276398b2e9..000000000000
--- a/dev-go/go-bindata/go-bindata-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/go-bindata/go-bindata/..."
-KEYWORDS="amd64 ~arm ~arm64"
-
-DESCRIPTION="A small utility which generates Go code from any file"
-HOMEPAGE="https://github.com/go-bindata/go-bindata"
-SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="CC-PD"
-SLOT="0/${PVR}"
-
-src_install() {
-	GOBIN=${S}/bin \
-		golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
index b27fcfa03f81..d51df91eaedd 100644
--- a/dev-go/go-bindata/go-bindata-3.1.3.ebuild
+++ b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="CC-PD"
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 src_compile() {
 	GOBIN=${S}/bin \