gentoo resync : 16.02.1018

3 files changed, 60 insertions, 2 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 2f32eac5d7f7..dc3d1c7687d6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -4,10 +4,12 @@ DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e9
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
+DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43 SHA512 8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
 EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3
 EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b840104c573373cfd7d964f0c6f8876771930225c2fb58ecd17e98854cb050ce91eef66e83201d0d6522b4250d21bb SHA512 be79eade0670b9701670953c552d4452e583284acf3f721d22992ada3f2e55745fa85cab1ea102b5d68d709320f1f44207b43c5ba473ef8e2951ea0ac07c802a
-EBUILD containerd-1.2.2.ebuild 1472 BLAKE2B 79c964f1508ae9a5df6f2ee9fb028fb6186362982c19442532ff1eb00d29f3e408cc94e7ff95aae9db3642323f58143e74fffa54288dc0a19cfbd6e9d7d70ca1 SHA512 e23251459744ae8b3bec35fe3a0261ffb99bab0e433ce9cdc48ed39579d73e061df9674bc12372004f4050e72bb68c0f4d6d1d6d5cea985ee2173a16f5fb258c
+EBUILD containerd-1.2.2.ebuild 1471 BLAKE2B ad5699507bac5219eea6d682a2db3525eff1ba6a93125c3cc270d0c9fbe34adba1f7492502601f4f72c7933d6814c2e4a77e003bc8fd758df1bce792fd32f5d2 SHA512 e1a2de6e4f4375935234bcc21fe92586feb3d2855563fe52191462a009cf2e83a745cb32512f127ba7781713b6d17f2036a82dfc776cf9e4c9f060a80dfeeb04
 EBUILD containerd-1.2.3.ebuild 1439 BLAKE2B 291f8949af5f47e1b22c568bdc37f6c425db53ab9d6b65d31492a81145d02cb68eb6405d2d0596c3adbc938d1a86a0f41c1798851484aa02fd3f093a1bc0f8df SHA512 cfb556243ad6a477af83750a91013a0b1aed20eece4914a4a853de66201003b89e759e4bf1025dc433cabb3f0461e69c335520234ec254a6fac8cfd8f21da432
+EBUILD containerd-1.2.4.ebuild 1439 BLAKE2B b8b08284f3c7334fe2837d81f1496f0d4e6f84d2ddc1fb4af59b033a94720218bc5b34aac44c0dfe0af9d5501f5c204fc2c5d17dd4c932ed7f0dda302449fb9b SHA512 bb052f147d6eb22576e3b104d079d4bb1823c21fcbf3cecfc0eb78efff2b1518be88db475e34c783039ddc991728487fb83b3f03a906079a8dd6071bab4327bd
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild b/app-emulation/containerd/containerd-1.2.2.ebuild
index 8ccee3fc69ac..0cdf19490c85 100644
--- a/app-emulation/containerd/containerd-1.2.2.ebuild
+++ b/app-emulation/containerd/containerd-1.2.2.ebuild
@@ -13,7 +13,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-1.2.4.ebuild b/app-emulation/containerd/containerd-1.2.4.ebuild
new file mode 100644
index 000000000000..d34eeabe0995
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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="e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
+	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.tools"
+
+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_rc5
+	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/*
+}