gentoo resync : 06.04.2022

6 files changed, 20 insertions, 176 deletions

diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 4119f4a86763..db94b1e01f69 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -2,11 +2,9 @@ AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
-DIST podman-4.0.0.tar.gz 11379640 BLAKE2B 2d68b95206ef59873c2a5c434aa3901c33a3526f840805ab42ac4dad4ed5861824a6b2142d02b500e087d56f4da3255c2b156af4d835a6427c2ebfae34278a75 SHA512 2e25f303d143bc4e265f0f8998ea1c4af3d6da8b35452cf6b27a4eb204805a9b5f75f4b6430921b42c80b76a6b5c9cf35a732c265727a11261fca25cc96f57e7
-DIST podman-4.0.1.tar.gz 11379467 BLAKE2B dc9785c6ff85ba2f2279b7b8fb820f402fa347c4af70e3c3a6119a7a79f19f1dc4e2048c0682f7751e701005e2966e806537630f6efd69d336bce560ad5053a4 SHA512 b333c91f1c04ef084df05dc6f31717e89078a3e5c6b620c403c29e4a3c9db30bbd15537334a645206d85bfb9679b1f4748c46936d9ca21c1f77066e8cf0f25c8
 DIST podman-4.0.2.tar.gz 11377152 BLAKE2B ab022c3e7ef40685301f08b2d939e936b07e08231d5b86a84fefa6ea7a60c8f20a5e15b79788d862c263336204a9cd8d7206748b4530f2f42ccdd31df370747f SHA512 f3c42b3b3c75ca451b4c22c2d6f9f1b9ab9437b118b16e19f17f92f28b5849f8e3de4ebc97d8d249f565a61ba187214928c25a031204163a59174e94ce300a59
-EBUILD podman-3.4.4.ebuild 4720 BLAKE2B 4dd14058aa08d487c475b753f5a448e3346b1b47a84bc37889bfea7055618ffcc7d5245475a02a8fa8a3d57379b6ceda276310234fd8703a1c75d9f014f8d4dd SHA512 c8b0f195af9d0b1185bec0f669f3f25802a93e8acaaffd9cae71cd7c9627b7e39d926ecd998e28c8f652081b5c69fc65cdd6297de23de8c29bdea8652f5c148d
-EBUILD podman-4.0.0.ebuild 4622 BLAKE2B 151356eef212d2605800b8aa46d7f60b0164be5540c912cdf0113387f951b7f9580d7b975d202203a572c229aa92e207d5eb30326303619adabb159dc042259f SHA512 8ce6d367a076faa8f022f50acff4143c786ef81b22b349b10b95d5ac4c0389ee4cca0d9d1aa33ac97d059622a1ddac7264ddc9ee134dae6ee51ab401b9509337
-EBUILD podman-4.0.1.ebuild 4622 BLAKE2B 9c609ec55048142d05b40d6d6858d2e9d2168b94e07fc4ecfefd7fc968e6de5e9d6259a700da876e54eda55f8e17a16a87cf0656ae08a6e1ab74013d78f45f5a SHA512 c683675f5e4b46398fab370bcaed5bc8856d8a328abded28429d2afa98addfd0e3f37ab5e72bdf439d4db8f57c2adc59ab5991f0b802de5f8b250fb74feacd3c
-EBUILD podman-4.0.2.ebuild 4671 BLAKE2B 40077186ec4f708ed8966b3885c1929b0d9113b86f69db6f7b97a0fedbabd64e31cc0c02c1965864452907c6ff29cfb00c90ca1b2bcd2db1ea79cd243749c87e SHA512 9d9bda5a62e30e237fd497967cbb2a0a4e618de8d8c1e9dfd06964a2646b633ecf6998d13b198a9e560ae6a7f87c74830fd70ad495e7b6c0e245a26f7c4eb1a3
-MISC metadata.xml 1256 BLAKE2B c4722c8acb1583fe9d594f961d9664b62aab1d9b8515649d76751a31edd48911f3709ce99e9fbbc6ec88a33ddf4d59d70ecb4e86e452c1456592870a11a9b6cc SHA512 c20dc6bec7e5dc41ecddb17eef2b3a27fd67f2090d84a75898a372c0d8a6be4c8dcba2af684bc432a6ac4d4569ac985f868b40e48b6780129a5cbcb2da5b71c6
+DIST podman-4.0.3.tar.gz 11392523 BLAKE2B 2d69fa8f52b061a931cf3dbe767edcb9eb5baf4f45fa77bcd9dd6e5541c126830c059a2bb97906f4fe9a4fd3257f77c801add06e1da910542ebafeaa2d032768 SHA512 a7c6f9a0f33641520c4143e6a3568129021783557f8ea7c846e4bc3f7da9bf70cb30b19cc7c6527809df2c46e6ded1d162a929dc4f44a5daafcf9d211b43b44a
+EBUILD podman-3.4.4.ebuild 4769 BLAKE2B e7aafdf1f99f27730ab646f5d2c11bedc17e1b85b68124963ec885274663fe9ada2c0c6bfea394da3e318fc6cae3f9a86b1c9756e688b61ea7e7107cca8e193f SHA512 4ce9a78078814afba81c06066492ccb762438b36fd4bfa6448e86768b3491d0cb1b388cbbce848cf762ea2bc9b05ee7f5b23673088ba945064e446e75aacdb9a
+EBUILD podman-4.0.2.ebuild 4719 BLAKE2B 29e40f5e31bf621c3cb9e9a9a5992f951c76cbee2a5a7e9ea79902f9686c91a2a9034d2623af2d0041ad9711b2194787d1f7c01e82ce86dfcd8873b865ba5d91 SHA512 da46f1e9064898caf13a04884d5df76ebf9e130ca5a722a04882398258de58ec43016f0104bcdbc2ad78c83fc649f1c925c75a6ea52e3fc514f7711dcd72a8bc
+EBUILD podman-4.0.3.ebuild 4719 BLAKE2B 257bcbd6fcd2f80109f037c34861030cde4d20f9689d9f4823f5205a0d5113372dc7514afbc8b2802594cce5c115efc3e6aa2a6107219e649a4d29d7e8b4b5ba SHA512 634cdc23aef262008d22253e31d9a3fe314e0d2d5e5ce9a0ae1b0fe3e24aa5053e4be9735989c1b0046812fa803ea8efdf6c74fd604f068be06c9a7f6d7dd46c
+MISC metadata.xml 1372 BLAKE2B b8d6a880c8f915394b01e98644672f4ec91937606e912158b58740df31576010cef8accb053e217991b700020ffa03b4e6440d90de4698dfd1a6645599d5a0be SHA512 c8b3b35f30b48b156ad9cc0ae4189fb40838e954a925f14abc169f734472b98fe02f88bb95b1d2bc28ce74b4535dec28c662719189a26b06a138f57820cc0a64
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml
index 844d5c0dcd45..11d7dc7603dc 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -22,6 +22,9 @@
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
 		</flag>
+		<flag name="cgroup-hybrid">
+			Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).
+		</flag>
 		<flag name="fuse">
 			Enables fuse dependencies (fuse-overlayfs is especially useful
 			for rootless mode).
diff --git a/app-containers/podman/podman-3.4.4.ebuild b/app-containers/podman/podman-3.4.4.ebuild
index f6e9ac8b1006..d9c90056d70c 100644
--- a/app-containers/podman/podman-3.4.4.ebuild
+++ b/app-containers/podman/podman-3.4.4.ebuild
@@ -15,13 +15,14 @@ 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 +fuse +rootless selinux"
+IUSE="apparmor btrfs +cgroup-hybrid +fuse +rootless selinux"
 RESTRICT+=" test"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-4.0.1.ebuild b/app-containers/podman/podman-4.0.1.ebuild
deleted file mode 100644
index a3427504010b..000000000000
--- a/app-containers/podman/podman-4.0.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="c8b9a2e3ec3630e9172499e15205c11b823c8107"
-
-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"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=net-misc/cni-plugins-0.8.6
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )"
-
-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
-}
diff --git a/app-containers/podman/podman-4.0.2.ebuild b/app-containers/podman/podman-4.0.2.ebuild
index e565620c034c..62f957b6252a 100644
--- a/app-containers/podman/podman-4.0.2.ebuild
+++ b/app-containers/podman/podman-4.0.2.ebuild
@@ -15,13 +15,14 @@ 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 +fuse +init +rootless selinux"
+IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
 RESTRICT+=" test"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-4.0.0.ebuild b/app-containers/podman/podman-4.0.3.ebuild
index 0be37da653fe..3b27406e15ab 100644
--- a/app-containers/podman/podman-4.0.0.ebuild
+++ b/app-containers/podman/podman-4.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-EGIT_COMMIT="84c8870ac236578c41713113fc09a29a5f727bdd"
+EGIT_COMMIT="62534053086fdeba7b93117e7c4dc6e797835a3e"
 
 inherit bash-completion-r1 flag-o-matic go-module tmpfiles
 
@@ -14,14 +14,15 @@ SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.t
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
+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
-	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
@@ -30,6 +31,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
+	init? ( app-containers/catatonit )
 	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "