gentoo auto-resync : 19:09:2022 - 05:21:10

5 files changed, 169 insertions, 2 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index ef858097beae..b6284a382e92 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index a6ae583f8c5d..b1272512d8ea 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -3,5 +3,5 @@ DIST buildah-1.27.0.tar.gz 14821814 BLAKE2B e9d1ffc05024c3ae520e6436372a9eb59211
 DIST buildah-1.27.1.tar.gz 14825932 BLAKE2B bf290eeb4d96d255c7cdaa07af49eff44191664ac7dee255c7979656383daaa93c3673ba82ac1cbff033de769ffa08ad027f5d91c81b08a36222cb73e8a1e399 SHA512 a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
 EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7
 EBUILD buildah-1.27.0.ebuild 1198 BLAKE2B 62ef809576a3b390e336f845596f2a22edccbfe6ae72ad24aee52e8d8de78ec8364e72c42656adf0de189b1d0ecaf3bca88e10a88491459f6a766ca34d7687cf SHA512 3fdaaa6cd1bd0a82b4c74300536a3210c56d0c896f2a1f9e50644ea46e9ff38351b560c2295ff2fd79221b9543834f1b20e3a709fea79502078ca7b233664947
-EBUILD buildah-1.27.1.ebuild 1197 BLAKE2B 776bdbd022d1e567266c1b351ef890e1c26d3c6627f39f3ec33dc377ac2b6a1316cd18ac739a4aa98c3528c423b0822567ec1b762b2aa33afe8812a7b5e9112f SHA512 1a2b54a049c8135b5f3c8ba12fe428003429f9e4cd0b840d46187a2878c53d2a49d9772b49c201736e9c031073e66184c687b2dc1d4c4ddcc5c83e1faf759092
+EBUILD buildah-1.27.1.ebuild 1196 BLAKE2B b9b0c03282cd8d03a88649c1156361c8eaf64009147a8f78b9f9f7ab7c72dbb3d340221bc73e36ea1478d46a72e6c57622451c34b8e7f511fba93554dd0afdb7 SHA512 2c64885a361dbe355b5d8cfce1e9febc223fd1331dc3e7358f9f32f2281e8992d00c74de2337aafde4aab6473bfdd2a67aaab7597de8904bca2ad913c060b6a7
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.27.1.ebuild b/app-containers/buildah/buildah-1.27.1.ebuild
index bffa6ea8fe1f..06fc1f916d50 100644
--- a/app-containers/buildah/buildah-1.27.1.ebuild
+++ b/app-containers/buildah/buildah-1.27.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
 IUSE="selinux"
 
 RDEPEND="app-crypt/gpgme:=
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index db70861f653a..17284b057976 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -4,7 +4,9 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST podman-4.1.0.tar.gz 10904727 BLAKE2B 6d01a65b13494dc948c0667147eca6f250a81056f1bcf6eda6285566b8aa7aa526794ea96a571aecad642a8b1d3d1877cd31683ccf46662f8681a2afac083b5a SHA512 4d5f240423f21b1224ce44853a2265359dacee0d921f0ea53a7fca34f9076ebfaa49f4327a59ac51f5bf5b9dafb47dda3a9bb8e609237cc69f833b42b95bcd0a
 DIST podman-4.1.1.tar.gz 10905391 BLAKE2B a094785ccb7a84a42147fb0f0360480ad4f73a1cdaa29b666fabb08528584f5d37b1cf8fb807351d4a60d81779de4dec3ab5fc83275061eded21f97fd3fa5e7f SHA512 19dd2800b59dacf7edd5d8204bdaffa0959910c7751b582f5a12b8d644b52f9d6581b9c3b4cba3ddb0707f6a90c0dbc93de6d8e2eaa6a4234ebb9dfa28e693b3
 DIST podman-4.2.0.tar.gz 13019518 BLAKE2B a3b8d8b140b9d34e24f87f998fff3558649487b503bdd437f537f09adc51819d81786b6b4e858ef4e8a43c0d872cd20cd1ceee06988a36f830b9ffbb5109d14d SHA512 bc9e28d9938127f91be10ea8bc6c6f638a01d74d120efad5ad1e72c5f7b893685871e83872434745bc72ecaca430355b0f59d302660e8b4a53cc88a88cc37f9c
+DIST podman-4.2.1.tar.gz 13047683 BLAKE2B 968dc88164c846108d920dfbd3796078b6e7cde6c6d884ac5ea3379abe9a3d0ea72a78b10eea644a1040d1d564c13f05fe69112c49084344e95095c50ff537d5 SHA512 a8a6e3228c1cb6860bb27515bd081b5c395a17bd69fab8797758b84631d08d2389e554621080e66ecc04818c1c4d132ea6ed0edfedcfea6d7886a70ebc95297d
 EBUILD podman-4.1.0-r1.ebuild 4782 BLAKE2B 057db822cd7588941c59d8efd32d2170d42ef4f95880eefa23dafdcc834d377e3df5ca8a3cdc9757d37fe133960225251884316688ec04e921de0e3baa0d69b8 SHA512 64b1c4dfa38678b81f5e563c2634fe78cb41b1d98e893091a405c47a3ea13bb8411b376fcf1ff1794ac24fcc7efe704e4daa6c9aeba92f0bba2498415103c9c6
 EBUILD podman-4.1.1-r1.ebuild 4784 BLAKE2B 1135e265f0c8eb048244124b856e303fc6b45f7ae07167cff41a74613465873600004103733aec711df98f34a2157deb6ce94b728bbfee9b5f143accf8d4e1f5 SHA512 ad69026e96fd27293215a646e21668d3ee99b01a4069f038dc6bdc5542c01653eafb5fa77b933b273e327b799acd9246cc043280feab4d3b1523cc51c0ba5cff
 EBUILD podman-4.2.0-r1.ebuild 4784 BLAKE2B 161825694f430224c3be43cb5041b314e1d4cfed65f177c56c4fb957063e9d691c7a739f7f6dda8c84df2f3b3d8f638a3fc38019638dc976716a1af91aa9cda0 SHA512 31814c43d8ff5f34bd7f18fc84aee44a38b10632d559e314e93413b6dc1ac6d5d815155693577e7464af00df6a0030e64aeddcd321a0fadd4b76a7fa120a49ea
+EBUILD podman-4.2.1.ebuild 4784 BLAKE2B f0b71f8b5c64a44a511783f45d8a6d42786e5f40c6fd2edf7ac5e31e48af29c90d814603d776fe89da9d5599351c436abac176b070bdb26190b8ab234febd561 SHA512 a7e38f492a2c6cd3e0d8f47138b1c35bcfdcfc322c089b2149025b5c066061c01187ed5a19202ef2a95173e9aa63d9eff76269efc9fbb110de939cb0c3fcf417
 MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
diff --git a/app-containers/podman/podman-4.2.1.ebuild b/app-containers/podman/podman-4.2.1.ebuild
new file mode 100644
index 000000000000..7f04def7145b
--- /dev/null
+++ b/app-containers/podman/podman-4.2.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_COMMIT="62b324ddf718411b1d4d0ba8117c632f7f984a38"
+
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=app-containers/cni-plugins-0.8.6
+	sys-apps/shadow:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )
+	selinux? ( sec-policy/selinux-podman )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+	local git_commit=${EGIT_COMMIT}
+
+	# 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
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_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 vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/*
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf
+
+	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 [[ ${PODMAN_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
+}