gentoo resync : 15.12.2019

7 files changed, 69 insertions, 11 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 7a027f327dd5..fc5db97b2d14 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,8 +3,10 @@ DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb
 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
-EBUILD containerd-1.2.10.ebuild 1439 BLAKE2B 3d29e77e2873c2b6cd2460f2aecf664bd2d3f890b3a24448df1593be4f0312a4a40c99cb5a698d58719dc142217f846906744d412f6b832431b58f7b99679e36 SHA512 cd913ada2b1afd40f8834350ef8bd923e784b0eb9b7821da74da223b7f21ba133177c0cd39dfdf1397cd33be395e15046bb11f4e1836de5ae746b2644e0c9165
-EBUILD containerd-1.2.6.ebuild 1438 BLAKE2B 6f32e5e84deaa3af38aaccc5348eb3e2fcb03cdfb489902b0fdbca9365b711b99d5427521c44025ed8229ad029e7e11a3ae9a361157719c85bc6fe0b8737d307 SHA512 e72cc152933a436003d7f3403981e73026842069d5c35700d3c5b6b7893d69ab311fb7adc7ddcfc228d7c10b7d735c38c1af5e1bc758ddf3a4010eb691571fcf
-EBUILD containerd-1.2.7.ebuild 1439 BLAKE2B eb6c9a7402729bdb82762f44569ca8c99092872da4368f45dea7f8e5bfc72bf1769c77feff6059f83d2c258eebd075c350332ca9cff4fa3c227b0dd74f6b1d11 SHA512 c992f390a16e01f91780c98de084b495533eb7ad208f6e711ff79f3238237977247068d20df2332e8189dcc307c6ff8d0053a2ad558bfe8d74d77225b4cf0102
-EBUILD containerd-1.3.0.ebuild 1439 BLAKE2B ec5934cb16e2d2d4cdd4775b83a058bcd65be32ee326297570d0cc1095b93b0943129ab059130756f33951978dddbc5ba9ef938c5fe1dd8edd56b22dd54acdf3 SHA512 b7747d0981d4ed32db14dbc59fcd5e263b81d1f2a4c1736f665015dc8215a900980219634bae402b3759973c5e4686b51534bc3a3315f782d7229f12afa7a404
-MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
+DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
+EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
+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
+EBUILD containerd-1.3.1.ebuild 1404 BLAKE2B 0d7036ff3f180cb2054d95263ec88d08e2628fe5a421d9967d4313966c858692e2c1a7c41122c9b2efea7b055af232c2e8fc2725fb8691944a0be2fa0fc9f6db SHA512 ec6c3514980b5037bcabe94202285ae90730baeeef0e6f8a6d120590647283be3ac5cfeddc7be4b948f962aa7f30fe030d18578faa62a554b591111898322b98
+MISC metadata.xml 1092 BLAKE2B 1c5fd4a96401beb153a27a1aa0729da7737f8caec11be9b1bd7d9b5bd46c5f1ccfda37ba1829bc63d844a3c0e046930938faf88459d87f0ebc8b855f1f3b132f SHA512 75c31c0feacf4f09862edbb1087a248b1238b9c206ae837f16b9f1a3f1290698ce33066d4fde815c2aa82193b07e54f55130f396668dd0a8bb399d5232f466bb
diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild b/app-emulation/containerd/containerd-1.2.10.ebuild
index 95e25445893a..53b84c161278 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -13,12 +13,12 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="b34a5c8af56e510852c35414db4c1f4fa6172339"
 	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
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild
index 46e17e7be0b6..dcc5a7670301 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild b/app-emulation/containerd/containerd-1.2.7.ebuild
index 21f2f7301c8d..c021436695f6 100644
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild b/app-emulation/containerd/containerd-1.3.0.ebuild
index 59441dac7e0b..0c5e0f6bd86c 100644
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild b/app-emulation/containerd/containerd-1.3.1.ebuild
new file mode 100644
index 000000000000..17258ef6de6a
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.1.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="c7a4f87"
+	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_rc9
+	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/*
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index a28d7bea81ae..11dca7fe67a0 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -26,6 +26,6 @@
 	<flag name="cri">Support for Kubernetes CRI</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">docker/containerd</remote-id>
+		<remote-id type="github">containerd/containerd</remote-id>
 	</upstream>
 </pkgmetadata>