gentoo resync : 15.06.2021

5 files changed, 28 insertions, 117 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 4bdc7cae272e..015ae8615f09 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,7 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
-DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
-DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
-EBUILD containerd-1.3.7.ebuild 2060 BLAKE2B 17a524d749ab4c93a10b611809f63b951093f70f3b54bbcfb7ab37b3bbbb16bfbc4663f38dce3b4a358a7226ac7c93501d5de35595a5b864fb8917eb970553ca SHA512 fd421d1d9c0ed3fda728591611f9c691bcdfa58d8daa185c1a4cd244d9206f3e9c2a71d56742ce850f84aa61266ccc9f6172fda20b31b67e14c8800ff9cf367c
-EBUILD containerd-1.3.9.ebuild 2027 BLAKE2B 5147229fede581c46fcf29583b7b06e56586a06e9a29fa27b984ec00e87abab743565befea28a08e722bd97aa160ba98654bcfd95ed852a35b619b8e66184120 SHA512 f686aebab6556ac6694aae474894f054cb13c0076258de179e75b735a9685360778491bb233148185cfc1bea346cb6aebeeed5b7e903185a451812467cd54985
-EBUILD containerd-1.4.4.ebuild 1890 BLAKE2B ceb56a42ce8c8447bcb2daa7ca9b9cbd2c2142cb926f94f106314261e53db675295afb8786cb7405bb695ddd9d80e9d8483f890ef507ca523438efa0d877fddb SHA512 e3d9bec60e941dae7d3d8398eb8c8ef5e006e3557563cca1e50a3577d30424ed4d22c87f25b6c82874c74851a086d1d61ae32f6eb0aec0eeba131e10ff39c498
-MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
+DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
+DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
+DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
+EBUILD containerd-1.4.6.ebuild 1889 BLAKE2B e25f303304770b47a22814a28af0a1d6933f45ecb98e93f0d660b3788dec61cd2741c1ab36645765f8b6ab627aacb92146b5a199714cb40275668ab3204782b4 SHA512 d766c94f94782fd4354c46c1988936ec9e89fc8285ccf9e1b66ceb7e419bdabd8e9107b1c8be9e8d5603c3b1343a28ec67683151f9b6ab54ab14a95b68e2de26
+EBUILD containerd-1.5.2.ebuild 1753 BLAKE2B 0b373938a4b37d42aa0a98ef4e38b61269576eed4fdb437d9320962b4c5f7e6ea815be8f208b7e7dd4d00eb252b5f3635df82666335489e3aae8854901dff354 SHA512 6e261742c69d6db6b39c11a8830bc2843a8b98ecb9be14d1ef0f5c6c5bbdab78015fc538f6d45b348c73af1316f84b84a541f913514124176557537b356e7de9
+MISC metadata.xml 1143 BLAKE2B 2e3705605579b406365f0faca9238c1cfa1047ebbbe04686281d6b161aeb9bd947641116a755070fff9aa01dd8010ee36d570075a1ac7e87e29c727c2b06be7c SHA512 bddfb97b70466a3ff7442a1249708680b960456e6d1058dea59f09a34bcdf262c7b13430ec0fd3a16b0f060d48ffeda569c8ae4d9d9dbca93e4af2ee13ec1a1e
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
deleted file mode 100644
index b78f87e7f3d6..000000000000
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
-EGO_PN="github.com/containerd/${PN}"
-
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-RDEPEND="
-	${DEPEND}
-	~app-emulation/runc-1.0.0_rc10
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-	test? ( "${RDEPEND}" )
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
-		-e "s/-s -w//" \
-		Makefile || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-	)
-
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	export GOFLAGS="-v -x -mod=vendor"
-	# race condition in man target https://bugs.gentoo.org/765100
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -rf docs/man || die
-	local DOCS=( README.md PLUGINS.md docs/. )
-	einstalldocs
-}
diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
index f63187003559..f0cb4195bf52 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e
+CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
 EGO_PN="github.com/containerd/${PN}"
 inherit golang-vcs-snapshot toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
@@ -23,7 +23,7 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
-	~app-emulation/runc-1.0.0_rc92
+	~app-emulation/runc-1.0.0_rc95
 "
 
 BDEPEND="
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild
index 2e7c01ad5a79..7f7c816464f6 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.5.2.ebuild
@@ -1,22 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="ea765ab"
-EGO_PN="github.com/containerd/${PN}"
-
-inherit golang-vcs-snapshot toolchain-funcs
+inherit go-module systemd toolchain-funcs
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${PN}-man-${PV}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
@@ -26,27 +21,27 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
-	~app-emulation/runc-1.0.0_rc10
+	~app-emulation/runc-1.0.0_rc95
 "
 
 BDEPEND="
 	dev-go/go-md2man
 	virtual/pkgconfig
-	test? ( "${RDEPEND}" )
 "
 
 # tests require root or docker
 # upstream does not recommend stripping binary
 RESTRICT+=" strip test"
 
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
 src_prepare() {
 	default
-	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+	mv ../man . || die
+	sed -i \
 		-e "s/-s -w//" \
 		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
 }
 
 src_compile() {
@@ -61,13 +56,12 @@ src_compile() {
 
 	myemakeargs=(
 		BUILDTAGS="${options[*]}"
+		GO_BUILD_FLAGS="-mod vendor"
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
+		VERSION=v${PV}
 	)
 
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	export GOFLAGS="-v -x -mod=vendor"
-	# race condition in man target https://bugs.gentoo.org/765100
-	emake "${myemakeargs[@]}" man -j1 #nowarn
 	emake "${myemakeargs[@]}" all
 }
 
@@ -75,11 +69,13 @@ src_install() {
 	dobin bin/*
 	doman man/*
 	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
 	keepdir /var/lib/containerd
 
 	# we already installed manpages, remove markdown source
 	# before installing docs directory
-	rm -rf docs/man || die
-	local DOCS=( README.md PLUGINS.md docs/. )
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
 	einstalldocs
 }
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index 0795c4ce61ef..88d88c9fab9d 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -24,5 +24,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">containerd/containerd</remote-id>
+		<remote-id type="cpe">cpe:/a:linuxfoundation:containerd</remote-id>
 	</upstream>
 </pkgmetadata>