app-emulation/containerd: Add v1.0.1 for Docker 18.02

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest

@@ -1,3 +1,4 @@
 DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4
 DIST containerd-0.2.6.tar.gz 1020572 SHA256 a67c4153ac5ae26b9d11daac133b90cba059ba16de7579e39c3e82bcda856493 SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 WHIRLPOOL 98f64c888ea580074e51b91311ab186291cb2d3ecc9f178d828687dbb60b35104237041699b6125cf026edd245459a052fda1801ac3cd7e1efe34606c3d9a4eb
 DIST containerd-1.0.0.tar.gz 3763785 SHA256 874720e68140cf57c7a4997cdab0b8177ad2ddb89e6332bb4f0ba23699a321fd SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a WHIRLPOOL 73ec169ed5529bbc7963e859f1a19497fd45d80352be94fef678a51066689c877a82bc97179aa53cc75bb363d251c3d09e5ce43a693522f08cc19b11bf9b7db1
+DIST containerd-1.0.1.tar.gz 3766659 SHA256 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 WHIRLPOOL 29823ab7fed5ec3832644faa77256c5dfdb0ce61496f20848bb4aca1d25f25b318df5539dbad2794497fa27c9100cd85f088419674f2a8a28f937efc4cdab6ef

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild

@@ -1 +0,0 @@
-containerd-9999.ebuild

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GITHUB_URI="github.com/containerd/containerd"
+COREOS_GO_PACKAGE="${GITHUB_URI}"
+COREOS_GO_VERSION="go1.9"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://${GITHUB_URI}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="89623f28b87a6004d4b785663257362d1658a729" # v1.0.0
+	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64"
+	inherit vcs-snapshot
+	MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v${PV}"
+fi
+
+inherit coreos-go systemd
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened +seccomp"
+
+DEPEND=""
+RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p171
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}
+
+src_unpack() {
+	mkdir -p "${S}"
+	tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}"
+}
+
+src_compile() {
+	local options=( $(usex seccomp "seccomp" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake ${MAKE_VERSION_ARGS} BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+	systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service"
+	insinto /usr/share/containerd
+	doins "${FILESDIR}/config.toml"
+}

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild

@@ -0,0 +1 @@
+containerd-9999.ebuild

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild

@@ -11,11 +11,10 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://${GITHUB_URI}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="89623f28b87a6004d4b785663257362d1658a729" # v1.0.0
+	EGIT_COMMIT="9b55aab90508bd389d7654c4baf173a981477d55" # v1.0.1
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot
-	MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v${PV}"
 fi
 
 inherit coreos-go systemd
@@ -25,11 +24,11 @@ HOMEPAGE="https://containerd.tools"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="hardened +seccomp"
+IUSE="+btrfs hardened"
 
-DEPEND=""
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p171
+RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p205
-	seccomp? ( sys-libs/libseccomp )"
+	sys-libs/libseccomp"
 
 S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}
 
@@ -38,10 +37,20 @@ src_unpack() {
 	tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}"
 }
 
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo ${EGIT_COMMIT})/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
 src_compile() {
-	local options=( $(usex seccomp "seccomp" "") )
+	local options=( $(usex btrfs "" "no_btrfs") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake ${MAKE_VERSION_ARGS} BUILDTAGS="${options[@]}"
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[*]}"
 }
 
 src_install() {