gentoo resync : 30.05.2020

5 files changed, 2 insertions, 102 deletions

diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index 84f7c4a3485c..add03747b991 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,9 +1,3 @@
-DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
-DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
-DIST cri-tools-1.16.1.tar.gz 6915584 BLAKE2B eb2bc397b3bbeadb64d4d13610189f18bbf49ff93be1b1f3edf504305ed1a2ca8e271d3c041f5af01117f6c7403671a29df30d7aaab270cdb7ab84ac921fa914 SHA512 df15e6f3c4fe697070547d804bfa6755f780b3f0562f06312f39d3ee8756931bbec7c07482e2ef73413d85c1e9ca58064a769a15b04b3832da17044d180e8b4c
 DIST cri-tools-1.18.0.tar.gz 5295512 BLAKE2B 9dda4a401b858e98aa60521d3268d8f6ff6a2c1bd2c219a0e5e9e5360fba58d41e97258c636da26ee57bbfc3286798c74107c7de92d3e3398bdf53b7d9078e94 SHA512 849b496e6d19eec29e0e56f0b37c094649311b80514f319b0c68c6519e3ddd48e1973c3d288144db998826676416644ec705b7ea0916c21898b40928ea800af1
-EBUILD cri-tools-1.14.0.ebuild 956 BLAKE2B 370f1b353b625c26460a5ef81227711f8657f9dcdfcf3a327e1092666720ff09fa268c3c6d00c28c9ba7f607b47793b029f25d3b0ba74320ed4dfdb2fb385c96 SHA512 9cdb18d3ad1eee6ea6fd3e39a274c5aa42647e1283ad0349ac69f3e8aebaa8a51459d1b4045942647aa651f11f677f9a2a0acdd8ab36f697bf390f1cbcb64b23
-EBUILD cri-tools-1.15.0.ebuild 957 BLAKE2B 9bc931c2ee049ffe33875a898f9f7fa56b0f7f7c61452c748f8034b4f674d397575ec3f057bbc72a269dfac259208f0b6abc8bbd869bf4db4762ec7e73b0311b SHA512 6fcc00e79b73730805708061ac05b82257fa0427d73b0d0790248f2a04bd8f6d4546f2fca881dd929a9f428a8995f484430af65aec746a35e821869d68089a6f
-EBUILD cri-tools-1.16.1.ebuild 1166 BLAKE2B b9914e8ff5d7a3620bec87aa0c05b69c2550673f5cf539c83d6316c6d7260e23e27c83ba8cdf7bddc6fe22b4d1cce0d442a3902603013b4d5e495ec7ae9ca25a SHA512 087d6b46a5925d26e6223d5a344c1063a9694f41f0657b2281662c9ed27b49fa9419da298966edd6026b01d6f1dc3c810180f0caf06224716119c6054ea881da
-EBUILD cri-tools-1.18.0.ebuild 847 BLAKE2B 90b1103fcb18c17fba89627b4b4eaa3146725ca01442213f1ef04a3a74c7c8978a5c025b1192525a97d4eb4522c35f91cf676a6998fa047c59fc2f6c3b272cf2 SHA512 5c01f33dd1382beb670d75ce1e743b154960545516dca5cea7114b20efac3380d78fb9bbc3a4c8bf611b212c03df87c0241e5a431e1aa176bbdaa82f19eb575d
+EBUILD cri-tools-1.18.0.ebuild 846 BLAKE2B 4673efb448fbaf2d2f335d72b6845b5f3dbe646926efc88637f0fc53453e61de56802babf8cc6a72bc868882a8cf66a9056e1b9af4d3a0bb391be620e2593491 SHA512 2a8d349df0f4a3ff2a721e17dd4666a4a5d1f3ccc18f8c094c916d3dd98c4cf4dc16b3038f8c4a7ad88cc752d1074ab29fb1245caf86af7fbae12aed41297f3d
 MISC metadata.xml 262 BLAKE2B 49e1602cd5ee2277d0a096d29fc8cf7207ac4d650a8dc26ed2db496a854e03d72e18cd86369e4260ca207592fdecd0c9ca8bc6c3db3167d67c6dc0a9af53a5b1 SHA512 01b8c964891da9e8707b95ebe390c0e673af592c77712e811bea3783d314f148d3ce843d41ef59fcecfe0b1cefebfe47070bfee6726cb5d1f3528e143d39d85c
diff --git a/app-emulation/cri-tools/cri-tools-1.14.0.ebuild b/app-emulation/cri-tools/cri-tools-1.14.0.ebuild
deleted file mode 100644
index 3b5003937b29..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes-sigs/cri-tools"
-MY_PV="v${PV/_beta/-beta.}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
-	GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/cri-tools/cri-tools-1.15.0.ebuild b/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
deleted file mode 100644
index 95fe02952654..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes-sigs/cri-tools"
-MY_PV="v${PV/_beta/-beta.}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
-	GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/cri-tools/cri-tools-1.16.1.ebuild b/app-emulation/cri-tools/cri-tools-1.16.1.ebuild
deleted file mode 100644
index c26dd52f60db..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.16.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="github.com/kubernetes-sigs/cri-tools"
-MY_PV="v${PV/_beta/-beta.}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
-	GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
-	bin/crictl completion bash > ${PN}.bash || die
-	bin/crictl completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	dobin bin/*
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/cri-tools/cri-tools-1.18.0.ebuild b/app-emulation/cri-tools/cri-tools-1.18.0.ebuild
index 105b2c340d04..32412429f575 100644
--- a/app-emulation/cri-tools/cri-tools-1.18.0.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT+=" test"