gentoo resync : 06.04.2022

6 files changed, 3 insertions, 143 deletions

diff --git a/app-containers/nerdctl/Manifest b/app-containers/nerdctl/Manifest
index 28de84cf22d6..82355ca74cee 100644
--- a/app-containers/nerdctl/Manifest
+++ b/app-containers/nerdctl/Manifest
@@ -1,13 +1,5 @@
-DIST nerdctl-0.14.0-vendor.tar.gz 8166023 BLAKE2B 9aeeceb8b35244723a618814dd0b53ab380b31f15985754df41d5515ebfb00e5d5465e5ad0bd43b543683e0146d1114d2cb0dd95c7e011ca5974250ded296f7c SHA512 f63cecb655292cb8b0e734831834dd0134e6693ec517aeaa3d9accedcb35768115efa82b9133d20e34cbffbd78d043ec680a7fa4c838d5f4999fd8a50272d377
-DIST nerdctl-0.15.0-vendor.tar.gz 8310858 BLAKE2B 2406d87e3f1ee17b501308cee4a662ce79d1a49510ab1b023a6e52d537feb8fe79e9a9eacb25a1dcdf019db206467f67bf6a95e3a2ba03c07ad658cb0757394c SHA512 65494af911382086e57eab669280cc377670ce1472a2a7aef74e437a7d70d3e811a858cba1a4e154397709531523c13f3840f286334c6df367ae8f9ba47a9976
-DIST nerdctl-0.16.0-vendor.tar.gz 7871495 BLAKE2B 048c5070cec7d8dd6260738b427c461fce5144d2a1c569b4872771d43682860d6406cf7768ea1261499d4dc768269fa2af017ce969a1698c12699e82cd968b47 SHA512 9cb782e7fec46dd1c939d7bc9c417437899c22579159439c82f4b8fa5b7d4a993da679aa9130a5ee24e190fa0030ba73ead87c3e7971791b3e9a7437ab77c95d
-DIST nerdctl-0.16.1-vendor.tar.gz 7749772 BLAKE2B aca9191a3119b43001fe5aeaba29650bbffdf1af0ddbad5ed7b251592427da46fbe5342338fbe716c77b6890585cfbebf0ff35e11dbe2cb412348282fb8727f8 SHA512 55d6bc64c5f292ad7305ebfc0cc47224663980066931e6fad6fec2fb9fc2fe5cb95e19a80b3cfe22129e6511c17ba52b4e594f2dcbffd2cb3fdfd92034ad89db
-DIST nerdctl-0.17.0-vendor.tar.gz 7762722 BLAKE2B ea2254e58c58844df037117f17fb23a87939715499d948e9b8fb29ebdda40d90594cb13988187c24e13fd5ea8aaf3694546c4ab0454f649cc4456037ec37865d SHA512 40f6925c44764ca0e1107ce4fcace5a5971c43b1fb459e858db4c16c4f4fd992e9e1bb901f5e16f830de5c0bd32322d57960d472a067fc43bb6c9c76eac087d7
 DIST nerdctl-0.17.1-vendor.tar.gz 7762770 BLAKE2B 399a99047cb3a3ab31806529e2502f3446e3df717950f1db05d8a449e5c931719717a35e420791232b19338c9d81c8443f0cd2520c38509aedbbaddc8b6d2893 SHA512 ec2967abee1ff44dcd44dd21d079a9d1e9bb254d0a5b150f57a2668cdd26e7f6dd5de99bc1fff3a94b4fb1c4546785e78245ed4e4e5f026b81b909f8dbf318c6
-EBUILD nerdctl-0.14.0.ebuild 984 BLAKE2B 9a00368dd6245d783f3ec7bf080e8006b281d67a82084d886e4c81d0d7f87fe160fa7a9515290a5785691543e02633e1c5ca5d19041d486309b4351b2fa557c1 SHA512 7fafcf4a06a7f81ba3ffb6c7cd23e4fbab6259eb9269ba80bce75f5ec05704b6059f1ac8bef856c97b4d9d8cf3061fb950f4e24c2ec37902a7af13ccd9be8fb6
-EBUILD nerdctl-0.15.0.ebuild 984 BLAKE2B 93f8db2417b97aab95d59d6b3f2eeaa8e570eab833c05ed85651df85f9db7b18a64b1134b42a40c21ce4e714a029637187235a6092016896c8858918d9b61917 SHA512 ae80495efc547402cd5ddd3d5442da8a0cc2b4552510222e41b29875a87c7b164c360aedeedc4cb97502cf59098c4995b65cf692086b59f9c99b5f6fa040c9f8
-EBUILD nerdctl-0.16.0.ebuild 989 BLAKE2B bd1f42af13c54c9b475d6bbd2bcfe1394d9d158cfe5b71334c00b725c905c764c41526286470ac54e77b287d131782722b00764a46bbd07c0097fcebfc8b158d SHA512 151f8d2887eabf460bfe852b88f3a9032c77eb1fb0b1eb5fd889963ffabb613df0a7187bbaf2fed7889750cd7b958451b7ae7469a5c36ed6957efed92af6f292
-EBUILD nerdctl-0.16.1.ebuild 989 BLAKE2B 7e3fa338130e3c786fc365d5a4b9a5567e95c2e6a0086569757a7fd31e3c224fe0d62e36d2a151ec2e313b1e0cc803ad6a6ae18401b0870ba1fbc304191a4a14 SHA512 01c5c2cd5f689f72320cb22569d098143f2ed348545ec1e014dacbfe04ba4b23193d0de6308724945ee8ae444d8eea9650d2e230edfcc3a92599ef78534505b1
-EBUILD nerdctl-0.17.0.ebuild 989 BLAKE2B 40e38adcb3f8b106d884850f1b90101cc2db08ada81426a9572d6cc01a41c3ec6176733c7984c1c978f54fe20754a52c59543a645f34418f98974c955130143b SHA512 ca8f7f267038e3ca5eb9edbe78ebb8c6650ede2bb3ffb4910e81aea32c5822d0638433b99cd181e446d65f394be9c805823bb1b52ccaf2f259a202387df5c440
+DIST nerdctl-0.18.0-vendor.tar.gz 7757873 BLAKE2B dfc77baee4649cf5a4ffa2ae196460d34eea531f930f04b894cc715b68a4295d1bcf98c89702032aaf6c5fc0b1a7f8b885f6c4b0bd61afd044b67fe4510c6967 SHA512 b542abafbd1dfe4213646b66b69d7bb286b8fda152870846cd350ad0362cbd16ca5f2d8fe23ae056f0c18f5674eb984f2993cf2937d7aff7b67668d65d9e1488
 EBUILD nerdctl-0.17.1.ebuild 989 BLAKE2B a6fcbb62d09d948200679bc0be906eaae18ac7875a9eec42bb262a1076a2c051d701ee82978445f534b14e160878dbf347fbe81902c52cc3536cd599729a281b SHA512 0e53088fc1b6764b230bd2657e99dd432dc025d721b1efac53e3b84383890c0344057a71746c7f955a41838728fee92758544f82932fa9b270d2a6e306542a3e
+EBUILD nerdctl-0.18.0.ebuild 989 BLAKE2B 6c7750f0daf4839bdc3f67400f9fc343d1b7d410ad97b05bc8055133709c3137415799d4b0ed4c4be5645914407b11a9a3b04c68ca6d8c0a51249d3b602980ee SHA512 1d9f94fc8a9b2d62d975f11641da5b4d5b5715f73f123104384abb0e588889200f1345f6491d5e03cf38c62143794fd8f142be56038406a4a71fb7426e517842
 MISC metadata.xml 328 BLAKE2B e1284388fe40d8aa709a783d583fc6116eafc276e6d3e65741a03dea3cfb007549c1dadfdc2eea8ee92e430c22b734ad76944efb9c00082b4dc84e003c684763 SHA512 27f4323cda23315264bc5ea386e19b3faea4fc4808835c7105b2827cb98ed62bbbc49fa9676bd8e897d66e1b2d1cc338eebfff4c7ed01b769c13f1b72e3d5252
diff --git a/app-containers/nerdctl/nerdctl-0.14.0.ebuild b/app-containers/nerdctl/nerdctl-0.14.0.ebuild
deleted file mode 100644
index e1d87b6cbffa..000000000000
--- a/app-containers/nerdctl/nerdctl-0.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="87a1a5df1a8b11b3519c30ada4ab9fdcf70fc9d2"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.15.0.ebuild b/app-containers/nerdctl/nerdctl-0.15.0.ebuild
deleted file mode 100644
index 8e9ded0e0bb8..000000000000
--- a/app-containers/nerdctl/nerdctl-0.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="b72b5ca14550b2e23a42787664b6182524c5053f"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.16.0.ebuild b/app-containers/nerdctl/nerdctl-0.16.0.ebuild
deleted file mode 100644
index 1ec02ed005d2..000000000000
--- a/app-containers/nerdctl/nerdctl-0.16.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="0ddaffd2ce304dd917267470883898feff9463dc"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.16.1.ebuild b/app-containers/nerdctl/nerdctl-0.16.1.ebuild
deleted file mode 100644
index 591a4594f02d..000000000000
--- a/app-containers/nerdctl/nerdctl-0.16.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="aecb998ba4d1c037d61eb5b82db4de952edfce16"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.17.0.ebuild b/app-containers/nerdctl/nerdctl-0.18.0.ebuild
index 32f76c05adfc..7641dedec9f4 100644
--- a/app-containers/nerdctl/nerdctl-0.17.0.ebuild
+++ b/app-containers/nerdctl/nerdctl-0.18.0.ebuild
@@ -7,7 +7,7 @@ inherit go-module
 DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
 HOMEPAGE="https://github.com/containerd/nerdctl"
 
-EGIT_COMMIT="9ec475aeb69209b9b2a3811aee0923e2eafd1644"
+EGIT_COMMIT="77276ff0fffad3f855ab9f2f5a4ad5527ef76485"
 # There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
 # so they are instead distributed via a combined tarball.
 SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"