gentoo auto-resync : 27:11:2024 - 02:00:00

9 files changed, 3 insertions, 764 deletions

diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index f034c6494cca..f0170c9d2384 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -6,20 +6,9 @@ AUX podman-clean-transient-5.0.0_rc6.initd 669 BLAKE2B db5f35d6918ea12afd2bc6ef1
 AUX podman-restart-5.0.0_rc4.confd 284 BLAKE2B e2e5394428d95e9fa480f32ef3efcddc870394e8f5158fbcfe80434aca6c0a48bc1a4a5b7bdcf91e5313121be7f50f5e924a3a2084767e84d6bf045819121711 SHA512 99818e90a04ebdfa2ca8fbf8b4971025cae27807a0f2288f267c60e875f38cac4d189a72248861507189aa3a1e05f7c81d663f96ddac6a7e11edebf5f18baea1
 AUX podman-restart-5.0.0_rc4.initd 641 BLAKE2B c62aa18fe0da2d00032f09bc2e23debfc916c12a9ebdd22666c000c09242140b592fb08f1e961cf2dc66eb9eeb6ddaf7336713574fb2708620588904168ded51 SHA512 b947c3f6e3dc4d58008c16c7bc77306877b7375334eeb96a714541c8534bcb4ca25d85e2204af96a3d14471b966c0b59542694777b907dddeff15f8995889a2c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
-DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993 SHA512 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
-DIST podman-5.0.2.tar.gz 23811875 BLAKE2B e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d SHA512 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
-DIST podman-5.0.3.tar.gz 23814179 BLAKE2B 46385710e4d24f8eca3a7c98c18a97b96ecd4691b3c965c5a5e7bc690d40d892a6d5fb71c1dd8ec56cc907a2167ab5ee795b4d2c2279c58cef3a5a1cece8b678 SHA512 c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
-DIST podman-5.1.1.tar.gz 23794366 BLAKE2B 0612a148972c96f532e96a8eb1ab388d80b32fe2ca7c5626e615748ef269a853407aeb39f34686d9eb75de239882e524cf5ee7c97152caccf5f77eb6ecfd54d8 SHA512 e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184
-DIST podman-5.2.4.tar.gz 23833172 BLAKE2B b04f9b7009d42eb15396ed918889c43e3164e433ca9eb8485c9c642ba121a48cd9030b365a3853935f01e323576931b199b3ba0d2ec90bacf2400e3bdfd60483 SHA512 c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5
 DIST podman-5.2.5.tar.gz 23834863 BLAKE2B 2264c9b19e621a1269ae5baee6fee148e6f1b9cacbdd83fdbecf671f87855d0ae566e41e4e8cbffe57662b7e9a3d653d57a7d2acb8f30b869b8af1bd7473a617 SHA512 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9
 DIST podman-5.3.0.tar.gz 24194165 BLAKE2B fb2da37e4f97d69997b9518425bb1ec74846e4e26855bf9ece0eeefb723f603051d4d4a1b3320cdba5c97595db12e1948f280776429819d10bfe83a57f349c78 SHA512 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16
-EBUILD podman-4.9.4.ebuild 4514 BLAKE2B c4789136b5edd1be8b7ffe78f30d4e7dee6142e98a7fbc9101bea0a0b7f5a0e3766eb74ff469c506533134674cf9ebb5256715bdd741341cb557f06940443dfa SHA512 1bfaf7cdcbd6d7867f88ccd1b3fe66435a505aec43d0a026eb31ee40bac9f41566be1bb034b9185105285d46becef27b235b242b6a4bb791e9fc542bde853549
-EBUILD podman-5.0.2.ebuild 3605 BLAKE2B 84c2e06b020489eccc97be64103697562cebaf847a4797416bd4f0e838b73d5e69683cf74370598742e1c62f5ca1122bd92130c3c03a737f9a53482a05e48f57 SHA512 b146929d4db98622743ca861dc1bf8e1abcd7d24a834ad977e2dbdcde4f1d9893a5e289dbbccfafbf7823b7ea8123e21884d08f7b1924afab651f1e5c6cc25e4
-EBUILD podman-5.0.3.ebuild 3605 BLAKE2B 84c2e06b020489eccc97be64103697562cebaf847a4797416bd4f0e838b73d5e69683cf74370598742e1c62f5ca1122bd92130c3c03a737f9a53482a05e48f57 SHA512 b146929d4db98622743ca861dc1bf8e1abcd7d24a834ad977e2dbdcde4f1d9893a5e289dbbccfafbf7823b7ea8123e21884d08f7b1924afab651f1e5c6cc25e4
-EBUILD podman-5.1.1.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
-EBUILD podman-5.2.4.ebuild 3947 BLAKE2B c6439cddb0133031ae6a2140f465bf51909373f71c7236b9c54661b1e31ed4fc56c7aaee7f45cc1a38d6fabb7fd7c1d115440d3ed7bf5aa93fdafbeae6a4dbc6 SHA512 89d4201f8816dd44ee6403aee597c625322b5d33db4e4e634d79b0b21a46b73ac10aad40b42f90117509cef078f3dfb44eb6f72d42dbce27321d9c46129c8373
-EBUILD podman-5.2.5.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
+EBUILD podman-5.2.5.ebuild 3947 BLAKE2B c6439cddb0133031ae6a2140f465bf51909373f71c7236b9c54661b1e31ed4fc56c7aaee7f45cc1a38d6fabb7fd7c1d115440d3ed7bf5aa93fdafbeae6a4dbc6 SHA512 89d4201f8816dd44ee6403aee597c625322b5d33db4e4e634d79b0b21a46b73ac10aad40b42f90117509cef078f3dfb44eb6f72d42dbce27321d9c46129c8373
 EBUILD podman-5.3.0.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
 EBUILD podman-9999.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
-MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
+MISC metadata.xml 1298 BLAKE2B d34dbc318614b35f5d05995e758cdbf4e173c73544fec41f7f726cc0ffb21257e90723fba092b6e33d3c15e437e2e4e4d207517703ca85bae4968b3b9e7cb4a5 SHA512 0451f166c722c3ea93a57df1059b083a5c8e484baf7a55421b5a82babf51959d1036ab3d179146c63b5ae00aefe2980caffb650dcc72a162537bd307d9e03b60
diff --git a/app-containers/podman/files/seccomp-toggle-4.7.0.patch b/app-containers/podman/files/seccomp-toggle-4.7.0.patch
deleted file mode 100644
index 17a09b601369..000000000000
--- a/app-containers/podman/files/seccomp-toggle-4.7.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,11 @@
- 	$(shell hack/systemd_tag.sh) \
- 	$(shell hack/libsubid_tag.sh) \
- 	exclude_graphdriver_devicemapper \
--	seccomp
-+
-+BUILD_SECCOMP ?= yes
-+ifeq ($(BUILD_SECCOMP),yes)
-+BUILDTAGS += seccomp
-+endif
- # N/B: This value is managed by Renovate, manual changes are
- # possible, as long as they don't disturb the formatting
- # (i.e. DO NOT ADD A 'v' prefix!)
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml
index 59ab2d3ffda0..897bde567784 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -26,19 +26,6 @@
 		<flag name="btrfs">
 			Enables btrfs support (graph driver) in Podman
 		</flag>
-		<flag name="cgroup-hybrid">
-			Use legacy (hybrid) cgroups instead of modern (unified) cgroups
-		</flag>
-		<flag name="fuse">
-			Enables fuse dependencies (fuse-overlayfs is especially useful
-			for rootless mode).
-		</flag>
-		<flag name="init">
-			Enables catatonit dependency required for podman run --init.
-		</flag>
-		<flag name="rootless">
-			Enables dependencies for running in rootless mode.
-		</flag>
 		<flag name="wrapper">
 			Install wrapper which lets use podman for command `docker`
 		</flag>
diff --git a/app-containers/podman/podman-4.9.4.ebuild b/app-containers/podman/podman-4.9.4.ebuild
deleted file mode 100644
index f47814bad560..000000000000
--- a/app-containers/podman/podman-4.9.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm64 ~riscv"
-	fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	>=app-containers/containers-common-0.56.0
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	wrapper? ( !app-containers/docker-cli )
-	fuse? ( sys-fs/fuse-overlayfs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# bug 906073
-	use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
-
-	# Use proper pkg-config to get gpgme cflags and ldflags when
-	# cross-compiling, bug 930982.
-	if tc-is-cross-compiler; then
-		tc-export PKG_CONFIG
-	fi
-
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
-
-	insinto /etc/cni/net.d
-	doins cni/87-podman-bridge.conflist
-
-	if use !systemd; then
-		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/podman.logrotated" podman
-	fi
-
-	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 $(usev wrapper podman-docker.conf)
-
-	local want_newline=false
-	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-5.0.2.ebuild b/app-containers/podman/podman-5.0.2.ebuild
deleted file mode 100644
index 4ac692ff576c..000000000000
--- a/app-containers/podman/podman-5.0.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
-RESTRICT="test"
-
-RDEPEND="
-	app-containers/catatonit
-	>=app-containers/conmon-2.1.10
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	wrapper? ( !app-containers/docker-cli )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
-
-	# Use proper pkg-config to get gpgme cflags and ldflags when
-	# cross-compiling, bug 930982.
-	if tc-is-cross-compiler; then
-		tc-export PKG_CONFIG
-	fi
-
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \
-		  all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
-
-	if use !systemd; then
-		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/podman.logrotated" podman
-	fi
-
-	keepdir /var/lib/containers
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-}
diff --git a/app-containers/podman/podman-5.0.3.ebuild b/app-containers/podman/podman-5.0.3.ebuild
deleted file mode 100644
index 4ac692ff576c..000000000000
--- a/app-containers/podman/podman-5.0.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
-RESTRICT="test"
-
-RDEPEND="
-	app-containers/catatonit
-	>=app-containers/conmon-2.1.10
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	wrapper? ( !app-containers/docker-cli )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
-
-	# Use proper pkg-config to get gpgme cflags and ldflags when
-	# cross-compiling, bug 930982.
-	if tc-is-cross-compiler; then
-		tc-export PKG_CONFIG
-	fi
-
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \
-		  all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
-
-	if use !systemd; then
-		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/podman.logrotated" podman
-	fi
-
-	keepdir /var/lib/containers
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-}
diff --git a/app-containers/podman/podman-5.1.1.ebuild b/app-containers/podman/podman-5.1.1.ebuild
deleted file mode 100644
index 1deb45b19629..000000000000
--- a/app-containers/podman/podman-5.1.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
-RESTRICT="test"
-
-RDEPEND="
-	app-containers/catatonit
-	>=app-containers/conmon-2.1.10
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	wrapper? ( !app-containers/docker-cli )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${T}"/togglable-seccomp.patch
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
-	$(shell hack/systemd_tag.sh) \
-	$(shell hack/libsubid_tag.sh) \
-	exclude_graphdriver_devicemapper \
--	seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
-
-	# Use proper pkg-config to get gpgme cflags and ldflags when
-	# cross-compiling, bug 930982.
-	if tc-is-cross-compiler; then
-		tc-export PKG_CONFIG
-	fi
-
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
-		  all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
-
-	if use !systemd; then
-		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/podman.logrotated" podman
-	fi
-
-	keepdir /var/lib/containers
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-}
diff --git a/app-containers/podman/podman-5.2.4.ebuild b/app-containers/podman/podman-5.2.4.ebuild
deleted file mode 100644
index 91caafc19598..000000000000
--- a/app-containers/podman/podman-5.2.4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="amd64 arm64 ~loong ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
-RESTRICT="test"
-
-RDEPEND="
-	app-containers/catatonit
-	>=app-containers/conmon-2.1.10
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	wrapper? ( !app-containers/docker-cli )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${T}"/togglable-seccomp.patch
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
-	$(shell hack/systemd_tag.sh) \
-	$(shell hack/libsubid_tag.sh) \
-	exclude_graphdriver_devicemapper \
--	seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
-
-	# Use proper pkg-config to get gpgme cflags and ldflags when
-	# cross-compiling, bug 930982.
-	if tc-is-cross-compiler; then
-		tc-export PKG_CONFIG
-	fi
-
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
-		  all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
-
-	if use !systemd; then
-		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/podman.logrotated" podman
-	fi
-
-	keepdir /var/lib/containers
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-}
diff --git a/app-containers/podman/podman-5.2.5.ebuild b/app-containers/podman/podman-5.2.5.ebuild
index 1deb45b19629..91caafc19598 100644
--- a/app-containers/podman/podman-5.2.5.ebuild
+++ b/app-containers/podman/podman-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_rc/-rc}"
 	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+		KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 # main pkg