gentoo resync : 11.07.2019

4 files changed, 2 insertions, 64 deletions

diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index 5a61d7d3dad9..110004bc1566 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,13 +1,9 @@
-DIST cri-tools-1.0.0_alpha1.tar.gz 2727719 BLAKE2B 6c413aff111ce279e86f1036c3efd0c98901ed42bce482b3877cec58a55958a80305c013b6e515dbb84ff3d8def41156b81a0749ce606fd3806a7fae3fc445f0 SHA512 e0fe6171ac1b1649be667b2924a1b163810fe18c51fb9c3fe363b381feb889d18872f8077e267a147058481f799a35f6a0b5f8d285215e216ee771d7ea74f66a
-DIST cri-tools-1.0.0_beta2.tar.gz 2417018 BLAKE2B 06dc5675c339fb26fce92c3ca05f855da754a452b25554ab84da0b6528b56c01005a625a06ead9a0f1e51e3fee96b54865990927fc312efa96167f8a5ebe94f1 SHA512 f0aadf8659ae1731945c8403d5a6d30bb9ed1e2ebf1a1045541087652a0d7a45b35fea5346cbec37903425634d7f65ccd852b56a7db93f6bbf9c91ae4899f107
-DIST cri-tools-1.11.1.tar.gz 2557233 BLAKE2B 26594d9817302f4ddf26e0c6c66765efdc1580bc0b80af8db5f3bd12eb9590d8fb3186165cc696a387eda31e429e4840419ceb4450706506ce4d6af2e1e48c5b SHA512 3e87c26061a8d5a6077c23b35adef3c85e1e0b85378d8062ebb1886195105f034ecf9407d14f495c23e40a5e016ff0ad5e89625beaacd594b8c7ef4e0b41b56e
 DIST cri-tools-1.12.0.tar.gz 2608498 BLAKE2B 242e689ec69081838afe36b86e3f802e4ff3bfd50461026a8637dd777b8996d9e153fbab103c98fc5ad8bd82c4da52413ab4698f95db8f1c0fa7e825e8dd80f7 SHA512 394269515ac80dd2b995b20220b03e03bad8bbfa25cea8979777ab75830a0523f0945553ba5d3f7a900eabe9ccf67ebf5789627b46640a2fc46193aff101ba20
 DIST cri-tools-1.13.0.tar.gz 2675580 BLAKE2B 4dcac547caf048b546ea0b11401e414e8ab834171b9cf1abd773cc8b05d70e47138dde7c1195ba6e99ad5e7d7632d7cebb4a8c67f7ec9c0ee3a750ac5e591a7f SHA512 df5553913a9e8aa1e0fa896dd1da00184d059bf360080d5c4003ca20ab4b93770847e07887451a44668e588eec5ab0258e7f02ed485d9344701af0afa20d712f
 DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
-EBUILD cri-tools-1.0.0_alpha1.ebuild 920 BLAKE2B ac8766ac2876393d9fbee5ef0d315270ded4d274e48706b53a13a1f125212080bc4fcbd8bd78c0bf4adfe1be0ea36b0adf7ddb1d6846777dd5822151ebf809b4 SHA512 09b85dcf464a4fca9614f56af447c804fda73fbf0ae575f62635e7a99d107aa65f31b6450ffd5ffd19561cb2585352a92b4fc9da19b1ae54381ca24595c2a79b
-EBUILD cri-tools-1.0.0_beta2.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.11.1.ebuild 923 BLAKE2B ff6c4784a3e09a1895522c96e0894d013c4c021debce7bc29aebd9d58e8649781f537104e7baa9dc8a63bcc3242e378aff759807e88548162e3b3d4dda1e2479 SHA512 edba5dab60fa94ee2c84ca0352f2d94d63be11a207e8bfcca9681df375ff70106a9000d5c1e7b7ef3c64586e7c9ff23d9f8e67607c171adb50c5ed7f29fa2f97
+DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
 EBUILD cri-tools-1.12.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.13.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.14.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
+EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 MISC metadata.xml 345 BLAKE2B a0a36cc291e52c9625d8caf20d81a06d5a94d69987a912ff9b7cc50582b06df285544ba2e050deea23628c2de34ccec9cfbb7c9beeec486733b86e54d5f73081 SHA512 bb952b4fe9687fa36406793426a8f6c922db248d75794e4f17e31b4056b10e7ce17dddb5f47eb68045babfaa9e63005cc5d408f96d52eb7c67b78b034408e7d8
diff --git a/app-emulation/cri-tools/cri-tools-1.0.0_alpha1.ebuild b/app-emulation/cri-tools/cri-tools-1.0.0_alpha1.ebuild
deleted file mode 100644
index 75ef27658443..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.0.0_alpha1.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/_alpha/-alpha.}"
-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"
-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.11.1.ebuild b/app-emulation/cri-tools/cri-tools-1.11.1.ebuild
deleted file mode 100644
index 6b723aa1cb6b..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.11.1.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-incubator/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"
-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.0.0_beta2.ebuild b/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
index a298fcbf5cbf..a298fcbf5cbf 100644
--- a/app-emulation/cri-tools/cri-tools-1.0.0_beta2.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.15.0.ebuild