8 files changed, 63 insertions, 155 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e827f0f69010..8a4465d84fd0 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index fe258324c716..d12ea32f8e42 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -4,9 +4,11 @@ DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05d
 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.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
+EBUILD containerd-1.3.2.ebuild 1408 BLAKE2B 6b6c70d5a2846716f98d60af8f6b4691c075c84ce59fcb674599c66b2d83e048656f6f0c012ee687f0b57496f39f095d3728993e77ca2c4d23db0d1a256fbaab SHA512 d2a7d53e844af2d02ba4c90a596abe66d736668b5fa52264becba657f6ee72b9b0bae46a938fc538fd7c01fd718be35af28cff1edc4a463a46d331009f5fb752
 MISC metadata.xml 986 BLAKE2B ea61cc405375a3a31cb6dcc51c8fcb5771d5da886b03c1718d9fa8933e13834ee5da915edf8b02557800f1a6919d95ff41930a5535ab8ecd371dd61dccbb214a SHA512 1aec368575f40d5ff0cb1d9fd2a13bed6cf15af319873cb5401f69946c5e65603a13d67e51013fbd3b25c3d4aa4747d1ccb621745fdea8a658eff2931b57e5ab
diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild b/app-emulation/containerd/containerd-1.3.2.ebuild
new file mode 100644
index 000000000000..f6200c865cc4
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 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=ff48f57f
+	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/*
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 3ce6d012f676..441840288151 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,10 +1,8 @@
 AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
-DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd
 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
-EBUILD libpod-1.6.3-r2.ebuild 4103 BLAKE2B 7c364d2bc48b0cbc04e7bc055971e192aef47fc8f60d564455b566a3e99aa3a830ec4faa94637939cea68dca965ca9a6baa93bfafc00448968b19fad68cfee00 SHA512 74e9f53d0ae82357cca455e3297d34e7d376ca88be862862637001de04820373029545a0fb914d6aec95e339f0aadb46a4ed91fe493fbf400dd7b62ff5475cb4
-EBUILD libpod-1.6.4.ebuild 4103 BLAKE2B 12b545008c0fcea03f336f21de3419f8c2549bc38132a3885ab53913da53a3e52cde2abd52b147848db2ee39d3670447376a589505bee8fed898ea537a1c40c3 SHA512 259c1e276a1f6b418e3977476e481c85e17e68e89be7115b3142139f7d812ede442b41439645efa672ea641201ece7e773ad719a4ce40f459fef9e51be86411c
-EBUILD libpod-1.7.0.ebuild 3770 BLAKE2B a24eab388c17bdd51decf1291027cdf55d96d5eceea19a5eabf12edda3493a490b8bca6e0009ea2127b859464cc972c5174f56c72718aac1137e5ebd2d424787 SHA512 95f9cefd62c1f31ef623c4f5289dfc8ead5373046bd7e286063f31c43ada9a34577d0d1d41a6b88ba9ca41e5e31d45d832a739933108a7a099bb3631601d5884
-MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
+EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f
+EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc
+MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31
diff --git a/app-emulation/libpod/libpod-1.6.3-r2.ebuild b/app-emulation/libpod/libpod-1.6.3-r2.ebuild
deleted file mode 100644
index 345becae9294..000000000000
--- a/app-emulation/libpod/libpod-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="9d087f6a766259ba53b224944f1b7b778035c370"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!ostree"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-emulation/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
-		"${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
-		"${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
-	eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
-		-e 's/^\(install:.*\) install\.python$/\1/' \
-		-i Makefile || die
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || die
-}
-
-src_compile() {
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins seccomp.json
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-emulation/libpod/libpod-1.6.4.ebuild b/app-emulation/libpod/libpod-1.6.4.ebuild
index 45bd559b5243..c12fd7d1e1c6 100644
--- a/app-emulation/libpod/libpod-1.6.4.ebuild
+++ b/app-emulation/libpod/libpod-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
 KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!ostree"
+IUSE="apparmor btrfs +rootless selinux"
 RESTRICT="test"
 
 COMMON_DEPEND="
diff --git a/app-emulation/libpod/libpod-1.7.0.ebuild b/app-emulation/libpod/libpod-1.7.0.ebuild
index 5ccc860cc393..329e1e7a7204 100644
--- a/app-emulation/libpod/libpod-1.7.0.ebuild
+++ b/app-emulation/libpod/libpod-1.7.0.ebuild
@@ -14,8 +14,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
 KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!ostree"
+IUSE="apparmor btrfs +rootless selinux"
 RESTRICT="test"
 
 COMMON_DEPEND="
diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/libpod/metadata.xml
index b488c7d9282c..0ce2c6b92f8c 100644
--- a/app-emulation/libpod/metadata.xml
+++ b/app-emulation/libpod/metadata.xml
@@ -19,9 +19,6 @@
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
 		</flag>
-		<flag name="ostree">
-			Enables dependencies for handling of OSTree images.
-		</flag>
 		<flag name="rootless">
 			Enables dependencies for running in rootless mode.
 		</flag>