gentoo resync : 25.04.2020

2 files changed, 57 insertions, 0 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 52dd303b302b..b59b291fce46 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -7,6 +7,7 @@ DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdc
 DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
+DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
 EBUILD containerd-1.2.10.ebuild 1435 BLAKE2B 4b55020f19d1349c90c2faa063c59f161a9ce1c7f9a02aef795de49f8b6ec3229964c2726547b3ad803ea84c7d2ab12c6b7f7b8afd53181a6e2f06e3e4df41ae SHA512 138989a2beb954c4e2d1be54fab432f3e38838cbd18c6341b297afae0c896f7fc9f4d234d96c70af3faee5b9d53bc095a0637c1e8b44b682c6359078bc8b69b4
 EBUILD containerd-1.2.12.ebuild 1434 BLAKE2B b1f6f907d6502dc829780b2e6150dc0e523ea9138840e31e0c88862aa0d07f489966a78d081c208e51e57ee5383ecf5b02cae19f2dda542ab8a6616ea0aaddd6 SHA512 2c9d32a48c78e7dbbf7837dcef9ffaff7d2e5c8fec67da47aff3985a6f898134317e7a13e4f370eb681013238eb085ed7c49d35ba240729cc605731bb5bfa301
 EBUILD containerd-1.2.13.ebuild 1433 BLAKE2B 444dca3d19fda544ad0652d68073b31a31b99c01cc720f9710d6bde42c3afaf6acd6f7bceb5017d9f618a52de7f9104aaeee1aa87f94bf1999d5769a5c9c914d SHA512 81c2a8173cc723e4b76823725334be88ca987163d708b809d4722e0a9612f60145cc0207c613f3820baf994ab6e45f3b091bcc6b04baded826174932ed365de5
@@ -15,4 +16,5 @@ EBUILD containerd-1.2.7.ebuild 1436 BLAKE2B fadea431a169fd01c58bad3ec746ba521d8a
 EBUILD containerd-1.3.0.ebuild 1436 BLAKE2B 221c0f5bf08fcaa1c1956859fc59b8b69830e0e26a221842894d385faadf243f76b575c6a4920b621c679c4c8d025f7ecc679a49d1a70dff738298c281335237 SHA512 133d213aa8115df74f5282843d0a0dc0832f0ca4f320ab4ffa541e3f85f0eb6ba89f66421498a857986fac8b368265445c9d01595def2a613d85c7abadf85dcf
 EBUILD containerd-1.3.1.ebuild 1403 BLAKE2B 27f63eea492f0b4069edbd19692ef501cb79d227ac02623684c408fc33da1d974ca2f2dbd78cdc1c6af9269f146b77c37ff427aea47c5b578eafc3c8d0f81550 SHA512 829b2b8943714ffe79759acf7b40d279e24047a9e77858910f7f820a89331fba8b91a8968cf4a4469a7395c1bec990d27702d583a15d074bd765104942505bca
 EBUILD containerd-1.3.2.ebuild 1407 BLAKE2B 82b111b3749b2f67729854cb50367139a7ac0ca25bc552713f875c5a7d9f7daad9c80c4e6071c01d7e3145d41bd608d08b28b6fd32b1508a2ec8b2324ad3c8fb SHA512 85cb4c29b6d2a77b0c278882ceac51315e34f103491bb7f5c209667572917facfb4debfc4b822728d8316a9ec0f771c3f6cb75d4b5c1b4c1e35ef6ff69837d99
+EBUILD containerd-1.3.4.ebuild 1407 BLAKE2B 559bed738625533707473147c978b4ea26e7df2cf952e2e5c0dffa1499caefc8a7b956b40867e9c38516822e72dbc214327347e10a33c3acbe3fef7843cb083b SHA512 8529ff278c6a01393ce70a7f8ffb124323c6214a6d509571f479bd8c309f6f3537721c6fe9ac1b0c6898c5a69aa4539af2653ea49752875e567acacb16094a4f
 MISC metadata.xml 986 BLAKE2B ea61cc405375a3a31cb6dcc51c8fcb5771d5da886b03c1718d9fa8933e13834ee5da915edf8b02557800f1a6919d95ff41930a5535ab8ecd371dd61dccbb214a SHA512 1aec368575f40d5ff0cb1d9fd2a13bed6cf15af319873cb5401f69946c5e65603a13d67e51013fbd3b25c3d4aa4747d1ccb621745fdea8a658eff2931b57e5ab
diff --git a/app-emulation/containerd/containerd-1.3.4.ebuild b/app-emulation/containerd/containerd-1.3.4.ebuild
new file mode 100644
index 000000000000..4733a84998c6
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/containerd/${PN}"
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT=814b7956
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc9
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="strip test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}