gentoo resync : 19.03.2019

2 files changed, 141 insertions, 0 deletions

diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 4bfc27d06128..42b4b50bcbf4 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -2,7 +2,9 @@ AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850f
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
 DIST libpod-1.0.1.tar.gz 6088749 BLAKE2B 64e28c6c7b60e226cae6a302e6e26ca5c2659d3c61910cc6fd2bbceec20485d7f2106d32da0472bc18a08bd611a6f0bf851b5c46066b47613783768c53a4c034 SHA512 23515fa3934ba2ec174011362ab1b67c747a7bf3122e606677ed40eb18aad28f79da30d09b6e1d0b74384286ff600fd1441fa4b6424e8bf3e410e867b57d92ef
+DIST libpod-1.1.2.tar.gz 7878228 BLAKE2B 8974949843c6f966d48715df320e47b814e442e374e1393dd5a116c6f7222e9ce29f480205f6a58e213e6cead58e5b4f31fd776865911b22e517607349654d35 SHA512 55456fe03da0873d3f6c67ced25dbe98f6a5a14c3da64ab2b4a9c6161c1d727ec8cdfe5414b534531e440e8c86f909449f4026d66898b909924aba1744ec0682
 EBUILD libpod-0.12.1.2.ebuild 2661 BLAKE2B 8f020dea55baab9ee9af48f94c75b2e76de6fdc5ad8a60fbaf77ea432b77c3364a2183e97adf9e734d6df7d99845aa9308c0280e3187b32fe8671b75f47dce29 SHA512 d7e801c59fd1446fc319ac8c12b0fd5fad8dda0ab045d422606406b974076b838b8511b071051204b6fbd082ded69e0ba1d9bc7b059f98a1e27dc3a42be295e4
 EBUILD libpod-1.0.1-r1.ebuild 3862 BLAKE2B cd105237b716af0e8209c42f9e82f01ffeb73ae44656aede6128f6c1d1e1828a055631c15418106636358484e837337b59debdc827651abd53d00a27a537c94a SHA512 266ca4fda535b67ced6882ea80bbbbaea3e263e273e97097fb4ebaf92e569337a6481305a7ae8357816a9032dbd7658f0f573f7d536a18a237327688cbcc84ad
 EBUILD libpod-1.0.1.ebuild 2743 BLAKE2B 6e0e0052ee9e84ae28fe8bdc6c55385d3543e44924a77221c81a2f3b03ba3ab90f7357bdb91c32f92ab728332531382440f5fef5dc22904be4bae94db112233a SHA512 1877d1b671363b122591cafe39639100f5752a5c55076fd13737b45642aa087026f23c4443ef27b945de2e8249512a7935e632c794305562211c07f2267c5427
+EBUILD libpod-1.1.2.ebuild 3891 BLAKE2B 342e1eede326f25bce2da9634d35b9c24cf803aa6c1e00a4926b89f0cb787bec5ebc3c89c7a50518f1c25988cab7dd394f16855fce6b0e0282a3f049fa2bba64 SHA512 86a62ec57c2c7fa4d29494824b56aedc25b304a2d54dca5b9cde5433baf5e392c08b05fb948e871a4d14575712665cefca1b5d005939aebde493929e74f41aab
 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.1.2.ebuild b/app-emulation/libpod/libpod-1.1.2.ebuild
new file mode 100644
index 000000000000..0d80616d4c55
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.1.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="0ad9b6bf2aea4ba37e8c9738feabec61343ba175"
+EGO_PN="github.com/containers/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/cri-o-1.13.0
+	>=app-emulation/runc-1.0.0_rc6
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	# 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
+}
+
+src_compile() {
+	[[ -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/ostree_tag.sh ]] || die
+	if use ostree; then
+		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_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
+
+	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	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
+}