gentoo resync : 28.07.2021

4 files changed, 2 insertions, 173 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index da07836e57ba..ffde3ba7b435 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,6 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
-DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
-DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
-DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
-EBUILD containerd-1.4.6.ebuild 1957 BLAKE2B 37e70d8fb5f2f719762719547696196619185ad50c471d53123e8d85c5fefa5d66f7cfaa1b7eaba1ffed382e6b907057e82ebd755b19a47033e9f261f1d79b64 SHA512 65f9428b86d7ac0720e4354a0d200c15a7305d3042e99919bd773001efbaa4b413d8930a11137a7277584bbde7c8e0f6a1ce54eee4ec8a74639b97486a1a0bdf
-EBUILD containerd-1.4.8.ebuild 1953 BLAKE2B 062f65e871fb5b57923748be4e8e2c2ce3af469510a2f3b674d6cb0d36f99d7078457020dc76480744d6193f439d1d572367cc998f53b08740b3fe9a1cecc122 SHA512 eaefef85e3ea128a4bc68e6be9338cf04008fd20701259099e4d6ac9847cb0a1c67cf3c73f25fd900b3e4979b765840c28c2026a9cf2c8aa07911a5dfbac857c
-EBUILD containerd-1.5.2.ebuild 1821 BLAKE2B a2ec9993e78a72e2331a51087f6c6e727a5eb9b4a1168316b9c640424a182624feb0d918beeff2ceb707f4cd3356062ec73e66a809641be5db2e29d86fa9a124 SHA512 92f10036925446ad3bc9a90386c34bb96d3ccf52a1747a8c36e156e0f008beaff2f0d1c592288fbc6f9a1edb871d1b6f94bfc82aa9860ca060e02697c35cc0a7
+EBUILD containerd-1.4.8.ebuild 1952 BLAKE2B 31be2b2d210f3ea3ef86f11eeb6e270c35a508f7ae12934b75a02d7c6977149b98f436a6a00253faa72d370035535b1fc8a9c9d8a11c25583b774ddc025dae0c SHA512 d79147ba9bdc69cac1e4049a04f3b8d62fdaf5e4bbdbaec9325d8e47c38be3246c31d6b5715dda2f66cb8e76dc31e7707b5c6158727431e0aefa56efdbf8f726
 EBUILD containerd-1.5.4.ebuild 1944 BLAKE2B d48f24de2088c4d8e71fbaa716f7ab8c9450924e8029e7d9bf5a892643b47ca63275332b1a5a904d439e4f53abc27b48b082d05898b897c0a5087465df49681e SHA512 6f9a892e1a7eb49ecd22006f751c0dee929644ba65edb1836176ea03e9b1e783420cef4b370d9b29a78db5ebc69f434cb337244d59047e7a579a915d562a6fda
 MISC metadata.xml 1143 BLAKE2B 2e3705605579b406365f0faca9238c1cfa1047ebbbe04686281d6b161aeb9bd947641116a755070fff9aa01dd8010ee36d570075a1ac7e87e29c727c2b06be7c SHA512 bddfb97b70466a3ff7442a1249708680b960456e6d1058dea59f09a34bcdf262c7b13430ec0fd3a16b0f060d48ffeda569c8ae4d9d9dbca93e4af2ee13ec1a1e
diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
deleted file mode 100644
index 8e9b81b35d7d..000000000000
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
-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/containerd/archive/v${PV}.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 )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~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})/"\
-		-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 -r docs/man || die
-
-	local DOCS=( README.md PLUGINS.md docs/. )
-	einstalldocs
-}
diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild b/app-emulation/containerd/containerd-1.4.8.ebuild
index c716298ccf9b..9e30a14ae4d1 100644
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -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="
diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild
deleted file mode 100644
index 7ebc5b203744..000000000000
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-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"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-emulation/runc-1.0.0_rc95
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-	default
-	mv ../man . || die
-	sed -i \
-		-e "s/-s -w//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || 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[*]}"
-		GO_BUILD_FLAGS="-mod vendor"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
-		VERSION=v${PV}
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-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 -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}