gentoo resync : 10.02.2020

2 files changed, 58 insertions, 0 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index d12ea32f8e42..b96de59bac28 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,13 @@
 AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf8d7420dde704174f237a9023a9546cfcb2a122bb74ef583119c9668b453f11612eed26aca55044132 SHA512 d0193e784c62070004e43a7d8b8834bbcd2eba51faa7f8505cea04e06740f5e4950e5c036aa32edf3f592c02f3dd9e65214a6adba8579bdf9c79ae556af94462
 DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec SHA512 14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
+DIST containerd-1.2.12.tar.gz 4990623 BLAKE2B 640ff03f74e94dd3f919d3c26015cebae1f316c910442db881cd999c92991b7011131f05501648e9f08b6e34d38e2aa6ee1065ae31550de88ad79d9cafa5687e SHA512 bcb4f94aea984c804e34137cab6aad252c01dc75d5e33ade5d1e533e4266fd0af67d2bf8aa85f0e6eba4e43756e84f884f1dec4c9febd66f8a3e3bc8cd3ac775
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
 DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a040000b7b8777b3fbeb4c5b861caae4f6209c59c5 SHA512 b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
 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
 EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
+EBUILD containerd-1.2.12.ebuild 1435 BLAKE2B 13a3717ffa8cc95ba8af26428925949d44223040b497ec30da9105d2c144b57ac8344ce265ef1bf07ce527b09fea10302cf1fdd9d88901fa2880bc5be6d3d648 SHA512 a81597467ad007308d96f36446dc838e4afcd37148c81ec40c955958d8a863d260a899474c3e373486c05254f7b7dbf8b94fca01f854279209af89fda2c64d08
 EBUILD containerd-1.2.6.ebuild 1436 BLAKE2B 15ec996c1e39e5907c80e161d64f0854e99bfd33d7ec0f91d53afcca3964fef23c52b89db1b42c99d976b0aca513c759038e2fa913b085f19c5ccad69e1c3e34 SHA512 1e43851c799501c712b5be468bb3469c89177e856dd4bea40c2b130cbcd3b2fb5acc1722285f1839562e837d7cd0243b0138fa418eda293843d4626e34b390a3
 EBUILD containerd-1.2.7.ebuild 1437 BLAKE2B 5483fceb26472d3b98e88d9d507b11b2ebb8cef7a8b254cfe106384cdb79975b3bd9804f63876e2b3f5b08d0ab96beeb50210ff850046bc98f13ee6781a38376 SHA512 e676267b0e4ca108735f16c1d3bee9d1edb3a4287a0b0e1ffd4a11005055162f76b11a0dad1e4d22ba57b48b2bbc7e862005d58c4861011c5d8f6047bddca47c
 EBUILD containerd-1.3.0.ebuild 1437 BLAKE2B 1d1303203e48395437fc53cc232571093de834e0b5b9dc7fa02c7864372adaa7340906cfac7c1c56e645a8d4d18a39d5a7e32e9f547c8a3905fee4fc019a681a SHA512 6689ab82a9b3d73764d7149e094781670148815e2b255ffbaa31887a3a0153ebe4930c49c2bcf73befb02410aea2ad023f33e26c4ab6a605e8097a84de76c36a
diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild
new file mode 100644
index 000000000000..d2c5c94985c2
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+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_rc8
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="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/*
+}