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

author: V3n3RiX <venerix@koprulu.sector> 2024-11-27 02:00:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-11-27 02:00:01 +0000
commit: ead7697a01fd631b56240b2d58aedd98ba7f92d3 (patch)
tree: c73ecbedbb9db967a7dff614f5e8b79eacb79f5d /app-containers
parent: 403335d7014372971e9e9267493a808d08bab48e (diff)
28 files changed, 18 insertions, 1715 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 7848511ec08f..68167b2ce75e 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 66be3d04fc81..bc9e0a9271a1 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,18 +1,6 @@
-AUX dont-call-as-directly-upstream-pr-5436.patch 1230 BLAKE2B 991ffcf879c2cb6dbce7ff33805d4fe89e9e40d846a4b2a03a5252833f0cd5f17f32f1e605645d6eedd0fcc1a4a2034588644dbe9dd18c97c0fb501fb8df7cf2 SHA512 9dbb9b91fb367ff59b78dd5c2ac86f47b7db0ced6d6bb2c84761c6d919bb4d86743dd5c9150336e961ec71c61c3aef5350a82a9c84d204cd101c09ca72a5b2b5
-AUX softcode-strip-upstream-pr-5446.patch 924 BLAKE2B 7c558438b633182e8fb5a0a5a22a2acc0b122bddde6787a12c7c79cbc99f6e4301463153d3d32b336826b26c3146ede5762d57cc98fbe509bee898c7a7ee958d SHA512 26cb7e87b4fd88db5590d3b3376d9c8e6e81edf48e754a6462b85ce654d25a69f612d7b6a1e7edd2cd8f62d1366bd304b04e50920a4592a7e0a95d66858bf9ac
-DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9 SHA512 1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
-DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
-DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B 014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d SHA512 ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
-DIST buildah-1.35.4.tar.gz 19370823 BLAKE2B 6dc8ad2a21c3ce41d4b8a2908d90bcbb32f5598c11fcde49a706334407370998731fedac7d8ee8e080a6a168c10b4a0404bf1120cab8b561e916a9df2bd2d115 SHA512 679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f
-DIST buildah-1.36.0.tar.gz 19328201 BLAKE2B d3602b62a587d75904741b086bea6d789ac30fb6079b574214368552269e48310921340f42050c5c648173452fab7b478690fbfbd80bbebda4a5ec9a102aa4e6 SHA512 feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f
 DIST buildah-1.37.5.tar.gz 19323742 BLAKE2B 1c03cc201f10f4d3645ecd3dac9ae97b3fe585b63ca8980e22e8b13d6dab05842c47e694b45c13875f03dadf0a656177445b0f3835a8a6faca63b288ff136013 SHA512 ee33d85ea3aa9ec423b4e48e19db69359e3fc480a61abd511fa473257aa326e9a9c4dafc985afb83f7caa9a7a5ba6a89b2a1c028fe6ef7bd4ef382ec8591331d
 DIST buildah-1.38.0.tar.gz 18547712 BLAKE2B a7c8df00ecc570d44173318adf68036389ce27bad5c10c7ba2bf7a728c29647186fcf0bfb9d0949e7947aff1e64cb2683b69ea0b4cb3d4181697813de8a5870f SHA512 c9f31693043e348c2bee6219f5a42738d93aa690a81f6bb283bd4d93ea6fe0cbde50754f7ee1a7e690853b7cfb934ce60e35ceb029180f41a95192773023c243
-EBUILD buildah-1.33.7.ebuild 3994 BLAKE2B 7c60e479bdc171ee817d8d703e05aa2c422911a2e623d4eeabcd4226bc1d7dfdd619ab6fa98323f98c964e36d8e0f567dc4a82ed7609b1c764b56b6d7038cbce SHA512 506340b81a1338870fd1b6c83f5048cfe5ddaa72bd9a320823e5e5a5fed0edc5933a8d66afe00b83a4bec0c09fe01386815d5bc0ae32ff325f3280bb2dd7aef2
-EBUILD buildah-1.34.3.ebuild 4061 BLAKE2B 225b32e4528504ce67423827af079494f43a4101967bd2751b37fba3eafde7c35a81ce60f41949713c57fcaa971e5605542b8682bbf66e42a039ec7586f3d0b1 SHA512 c18b4ba32a6a0114662d4157bfd78cb14c0a7b084fd879f15f77b1a315e4a0ecb6cd3fd64c3e07881cd983b0e76c9b6106ccfd22f6e5e552286586bf86008afb
-EBUILD buildah-1.35.3.ebuild 3214 BLAKE2B 693d407d6d21365fd8ee503fd4a0dce8931237d498700c4a43a5fb387bc44f3f1a482c2bf8f989963a3ba0211e033c2f425f26e59207420cf5eaa2b70c13ccdb SHA512 c92b7eaacfb20bf58b75cc7c24f57d84f77807f33060d523ebf9fd4d3d33280a532a7b597ff0626b8a2a21661dac05ce00f3827aba5527b1a474568920384a7e
-EBUILD buildah-1.35.4.ebuild 3216 BLAKE2B cf2b2bcec65ac61a7d83e24a4c445124b5319af3cee5f3169d59f611dba52c8a31a5a0cf7a0159b6ac1dd9e0988fb5b14e7884debea679b11e008f8d2f69676b SHA512 af72d1f40fb96b8e2483ee3be587e5abb026cdff8002acda3fbdc9884789c2c1f9f585a41b654668bcfb75708cbb92b1318b1590c75848a079ba71f2fe005aa3
-EBUILD buildah-1.36.0.ebuild 3090 BLAKE2B 5507d3ab121cb50f0a4dfe0550c31e1ed5eb316f0de024b7d342d226edf2ce058bd865e5c18bd9faf39a5f3a170a98b15098471d3e554aab59b82239fb24750b SHA512 efd45f928ec7ef2d35af10d389355cfe3d9c6d89edc033f0c984aa7c90fcabdfb0e4411d0c4bbbe9b457aee969c058f5c3788f5dd602c4491beebc0abe9489bc
-EBUILD buildah-1.37.5.ebuild 3090 BLAKE2B 5507d3ab121cb50f0a4dfe0550c31e1ed5eb316f0de024b7d342d226edf2ce058bd865e5c18bd9faf39a5f3a170a98b15098471d3e554aab59b82239fb24750b SHA512 efd45f928ec7ef2d35af10d389355cfe3d9c6d89edc033f0c984aa7c90fcabdfb0e4411d0c4bbbe9b457aee969c058f5c3788f5dd602c4491beebc0abe9489bc
+EBUILD buildah-1.37.5.ebuild 3088 BLAKE2B 67e0f9d958907dc416e19f657a8a3f68022ac5214613716a23ace88d814c2433741f465756d718425817a3fabe61d0c39e2a8f46eb0535130acf83338b6f062e SHA512 1f341865dd92b2ebbcd1bca2a6ce9ee68778127514e81440edd97994971d05fc9af5b5f23717a36470afaeff485808cce9de0b8bba21359efa31baa9ca5c55c2
 EBUILD buildah-1.38.0.ebuild 3099 BLAKE2B bb155ae447ceab425ed02f802e0b734d52e71bd7a6d2900de3f72d657159c086ff2bf7d2cd28f747c34e4db95d0bdcdb2522701a7b90655000b7dd160bf8f17d SHA512 8d2f3c3b591f4af7b3ea09d82e74b7ec12d653ef771b25fb24c25cb0114660922b35c85f910511a5464f914c4785f6f74600cd1af77a7cf572047b71d89ca61b
 EBUILD buildah-9999.ebuild 3099 BLAKE2B bb155ae447ceab425ed02f802e0b734d52e71bd7a6d2900de3f72d657159c086ff2bf7d2cd28f747c34e4db95d0bdcdb2522701a7b90655000b7dd160bf8f17d SHA512 8d2f3c3b591f4af7b3ea09d82e74b7ec12d653ef771b25fb24c25cb0114660922b35c85f910511a5464f914c4785f6f74600cd1af77a7cf572047b71d89ca61b
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.33.7.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild
deleted file mode 100644
index a24bd18a767c..000000000000
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# 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 systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-PATCHES=(
-	"${T}"/dont-call-as-directly-upstream-pr-5436.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
---- a/Makefile
-+++ b/Makefile
-@@ -10,6 +10,8 @@
- BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
- BUILDFLAGS := -tags "$(BUILDTAGS)"
- BUILDAH := buildah
-+AS ?= as
-+STRIP ?= strip
-
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -72,11 +74,11 @@
- bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
-	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
-
--ifneq ($(shell as --version | grep x86_64),)
-+ifneq ($(shell $(AS) --version | grep x86_64),)
- internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
-	$(AS) -o $(patsubst %.s,%.o,$^) $^
-	$(LD) -o $@ $(patsubst %.s,%.o,$^)
--	strip $@
-+	$(STRIP) $@
- else
- .PHONY: internal/mkcw/embed/entrypoint
- endif
-EOF
-
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# 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=""
-
-	tc-export AS LD STRIP
-	export GOMD2MAN="$(command -v go-md2man)"
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.34.3.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild
deleted file mode 100644
index cc06bf2ff42d..000000000000
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# 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 systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-PATCHES=(
-	"${T}"/dont-call-as-directly-upstream-pr-5436.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
---- a/Makefile
-+++ b/Makefile
-@@ -14,6 +14,8 @@
- BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
- BUILDFLAGS := -tags "$(BUILDTAGS)"
- BUILDAH := buildah
-+AS ?= as
-+STRIP ?= strip
-
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -76,14 +78,14 @@
- bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint_amd64.gz
-	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
-
--ifneq ($(shell as --version | grep x86_64),)
-+ifneq ($(shell $(AS) --version | grep x86_64),)
- internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
-	gzip -k9nf $^
-
- internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
-	$(AS) -o $(patsubst %.s,%.o,$^) $^
-	$(LD) -o $@ $(patsubst %.s,%.o,$^)
--	strip $@
-+	$(STRIP) $@
- endif
-EOF
-
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# 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=""
-
-	tc-export AS LD STRIP
-	export GOMD2MAN="$(command -v go-md2man)"
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.35.3.ebuild b/app-containers/buildah/buildah-1.35.3.ebuild
deleted file mode 100644
index 36648c2ae5a7..000000000000
--- a/app-containers/buildah/buildah-1.35.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
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# 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 systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-PATCHES=(
-	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
-	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# 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=""
-
-	tc-export AS LD STRIP
-	export GOMD2MAN="$(command -v go-md2man)"
-	export SELINUXOPT=
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.35.4.ebuild b/app-containers/buildah/buildah-1.35.4.ebuild
deleted file mode 100644
index 79687044616a..000000000000
--- a/app-containers/buildah/buildah-1.35.4.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
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# 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 systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-PATCHES=(
-	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
-	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# 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=""
-
-	tc-export AS LD STRIP
-	export GOMD2MAN="$(command -v go-md2man)"
-	export SELINUXOPT=
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.36.0.ebuild b/app-containers/buildah/buildah-1.36.0.ebuild
deleted file mode 100644
index 2dcea51820e2..000000000000
--- a/app-containers/buildah/buildah-1.36.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# 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 systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# 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=""
-
-	tc-export AS LD STRIP
-	export GOMD2MAN="$(command -v go-md2man)"
-	export SELINUXOPT=
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.37.5.ebuild b/app-containers/buildah/buildah-1.37.5.ebuild
index 2dcea51820e2..d1b02cc1d9f8 100644
--- a/app-containers/buildah/buildah-1.37.5.ebuild
+++ b/app-containers/buildah/buildah-1.37.5.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/buildah.git"
 else
 	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch b/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch
deleted file mode 100644
index 0fc376b1d68b..000000000000
--- a/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c1b43b57bb20f8796002e1d6f93bbdbc02e28f20 Mon Sep 17 00:00:00 2001
-From: Rahil Bhimjiani <me@rahil.rocks>
-Date: Wed, 27 Mar 2024 14:27:09 +0530
-Subject: [PATCH] Makefile - instead of calling `as` directly, use it from env
- var
-
-Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f1ab6b8bf4..7d27a41530 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,6 +16,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)"
- BUILDAH := buildah
- SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
- SELINUXTYPE=container_runtime_exec_t
-+AS ?= as
- 
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -79,7 +80,7 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint_amd64.gz
- 	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
- 	test -z "${SELINUXOPT}" || chcon --verbose -t $(SELINUXTYPE) $@
- 
--ifneq ($(shell as --version | grep x86_64),)
-+ifneq ($(shell $(AS) --version | grep x86_64),)
- internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
- 	gzip -k9nf $^
- 
diff --git a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
deleted file mode 100644
index 0ca0a6602a7d..000000000000
--- a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 2cd31a0698bea846366e8e153619a108484a1a2a
-Author: Rahil Bhimjiani <me@rahil.rocks>
-Date:   Mon Apr 1 09:25:21 2024 +0530
-
-    Makefile: softcode `strip`, use it from env var
-    
-    Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
-
-diff --git a/Makefile b/Makefile
-index 7d27a4153..3a955c85a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,6 +17,7 @@ BUILDAH := buildah
- SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
- SELINUXTYPE=container_runtime_exec_t
- AS ?= as
-+STRIP ?= strip
- 
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -87,7 +88,7 @@ internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
- internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
- 	$(AS) -o $(patsubst %.s,%.o,$^) $^
- 	$(LD) -o $@ $(patsubst %.s,%.o,$^)
--	strip $@
-+	$(STRIP) $@
- endif
- 
- 
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index cba484368025..d4bf32d7a1e4 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -1,13 +1,4 @@
-AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68d8a1375340220778528f472f9026fff63c24cfa11ba48f6157faff3f993c0d9bac3e125de6152045ec3c9876b SHA512 6430e890fa731b4a8646bd001557bc17180c312d1efdccfd3aa611f7402eb8e8cc0ef551b5cfc9b0db60a0e69a6dd90b5c75c46139fa3d9424ae6f9700c91f64
-DIST containers-storage-1.51.0.tar.gz 4283732 BLAKE2B 108401d68e617e6237e68cf2147113680e0452a8d15ee099da9872508800f3e7b8f2c5508e17d9c5f3d58fec4efc1c20f23f1a567fe592533c0e63efd05ae5c8 SHA512 89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1
-DIST containers-storage-1.53.0.tar.gz 4291738 BLAKE2B 939ecca8a948165c42453d5461429d46249d73582869793969f9d4ae52d0a9fec25e6c39cd13190dad0730d9a17de7af1f237b3cf5434fd30f442c78e57ee7b3 SHA512 ea4a1d1899208eb8861e36beba206724b1f55cfd6007bc5a90c3a6a5e02835b4a2985814dc9363c31dcdc81a3fb331b29f51f5523628edb8d9c64c465d6dcaa3
-DIST containers-storage-1.54.0.tar.gz 4165066 BLAKE2B 30f3e4287e9db46fca81ae6c08d3016ec4be6f38a4981d310f06cbc72e4125b458446fe49675f53232efdf0bec58e9cd18aa90424677e1b726338f1fb62b7172 SHA512 e3535ab378bcb7b852d1ebf431e94696f53da469278f618c07dde2d3c8c6b5b3a4c71d65a9c14d1c1b4fa1e41a0550029468ef9ba1f24c1d3294a5aeec55b5fd
-DIST containers-storage-1.55.0.tar.gz 4197147 BLAKE2B 62bf192225383961d045f7128b4da32af2b1c9a5f9844e17b2264e81b8fa4494f6d2705ec6415245c0c5d889604e712d922d76c46e8ec6600dff5476b2a530ff SHA512 4c035385167c4c3f6048f8bc2bbbd3cfe9993390d580449e0e5b52576a27d286bd536799c96e46d946b9bfa61ff7263325145acddd7fabfbfbacb967d81843d3
 DIST containers-storage-1.55.1.tar.gz 4197824 BLAKE2B 5859e2267096541449aeff8576ad1dc00a72993d123ec5571e775f0081a6bc9cfc588bfd522bf7742bd417314e3a699d51e57127f66c152abb7cf805ffe61464 SHA512 3ba244d28e25c6a88f01a73ff26a4a0747c71124a6191d086d8521e1622f36740cfa0b1cbac56f7699a5af9a7001382e71c32fd0644960a53a97c00fd09a754e
-EBUILD containers-storage-1.51.0.ebuild 801 BLAKE2B 271a601daefd6a6be8cdf93a721f1032ba22b2796b916c2064db0a6df0ca451a8e4c01bc2ce5b8ad7bc35490e73ef9ef1e8603c3e873ffbcb611920d5e42d565 SHA512 9cf4a5851dad036a245a31a32d422e97eb7df4167ad4e1942ebda1d4392019a2663b74a8ae1c3eef423c91652421f65c2f6ca535cb845055685dcad87218cf9d
-EBUILD containers-storage-1.53.0.ebuild 745 BLAKE2B 924ce0854421964abe4ea85b49306064a9022c05bbb99b58eadbf21b779966510f014a91e0fa64653c9a365066cedb90b601d5392546978090706dfa6bfdcc5c SHA512 1c4282333c333bf63153ece3d646b05b14e336a36af3a77a0ec5d8938d8ae6c967bee096fadb43b0a4769b7034eb8d65c884c18af72c2ace6dc6fc767d024588
-EBUILD containers-storage-1.54.0.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
-EBUILD containers-storage-1.55.0.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
-EBUILD containers-storage-1.55.1.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
+EBUILD containers-storage-1.55.1.ebuild 752 BLAKE2B 55431167c095cf29881f5921525bb4f271824865460c5d725504e1a1267499bbb5b1598a507f8c1a332057f25c96c7aac4d838055b7a4deabbbe150713cea3e0 SHA512 ce7763d914ff0c82d0af3aca5793117cd8201f0fea56b7f65e1e7034bd93ef50e1820b2b46500dd074660c0d8400c8cee6b26e9d4b39e59656a40691f1d1cae3
 EBUILD containers-storage-9999.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
 MISC metadata.xml 744 BLAKE2B 7d5d87bb4b2ccb68bc4289bc7f3a0d92ff527133f3264baa124e77d5e4602ca7f656a5694d66356a0b4f705606d82f318f5e522e23d776e84e46b148d8e3e968 SHA512 025a1a5456b44aeb87cd5cb645917a779c5330b2ddad64bcd5eb8cf6d87807dd4319b503044d6417f1376eac3e159f3912df2cd15f1173f31b3f927c425791cc
diff --git a/app-containers/containers-storage/containers-storage-1.51.0.ebuild b/app-containers/containers-storage/containers-storage-1.51.0.ebuild
deleted file mode 100644
index e06dc0abad14..000000000000
--- a/app-containers/containers-storage/containers-storage-1.51.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' storage"
-HOMEPAGE="https://github.com/containers/storage"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/storage.git"
-else
-	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/system-md2man-path.patch
-}
-
-src_compile() {
-	emake -C docs containers-storage.conf.5
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C docs install
-
-	insinto /etc/containers
-	doins storage.conf
-}
diff --git a/app-containers/containers-storage/containers-storage-1.53.0.ebuild b/app-containers/containers-storage/containers-storage-1.53.0.ebuild
deleted file mode 100644
index 2b2cde252bcd..000000000000
--- a/app-containers/containers-storage/containers-storage-1.53.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' storage"
-HOMEPAGE="https://github.com/containers/storage"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/storage.git"
-else
-	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_compile() {
-	emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C docs install
-
-	insinto /etc/containers
-	doins storage.conf
-}
diff --git a/app-containers/containers-storage/containers-storage-1.54.0.ebuild b/app-containers/containers-storage/containers-storage-1.54.0.ebuild
deleted file mode 100644
index be92b5c954ce..000000000000
--- a/app-containers/containers-storage/containers-storage-1.54.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' storage"
-HOMEPAGE="https://github.com/containers/storage"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/storage.git"
-else
-	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_compile() {
-	emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C docs install
-
-	insinto /etc/containers
-	doins storage.conf
-}
diff --git a/app-containers/containers-storage/containers-storage-1.55.0.ebuild b/app-containers/containers-storage/containers-storage-1.55.0.ebuild
deleted file mode 100644
index be92b5c954ce..000000000000
--- a/app-containers/containers-storage/containers-storage-1.55.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' storage"
-HOMEPAGE="https://github.com/containers/storage"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/storage.git"
-else
-	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_compile() {
-	emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C docs install
-
-	insinto /etc/containers
-	doins storage.conf
-}
diff --git a/app-containers/containers-storage/containers-storage-1.55.1.ebuild b/app-containers/containers-storage/containers-storage-1.55.1.ebuild
index be92b5c954ce..360694b3adcd 100644
--- a/app-containers/containers-storage/containers-storage-1.55.1.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.55.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/files/system-md2man-path.patch b/app-containers/containers-storage/files/system-md2man-path.patch
deleted file mode 100644
index f7d8d58aeb80..000000000000
--- a/app-containers/containers-storage/files/system-md2man-path.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -1,2 +1,3 @@
--GOMD2MAN = ../tests/tools/build/go-md2man
-+GOMD2MAN = $(shell command -v go-md2man)
-+
- PREFIX ?= ${DESTDIR}/usr
diff --git a/app-containers/k3d/Manifest b/app-containers/k3d/Manifest
index b8d0cf957f5b..bc52ff29d3b3 100644
--- a/app-containers/k3d/Manifest
+++ b/app-containers/k3d/Manifest
@@ -1,7 +1,7 @@
-DIST k3d-5.4.9.tar.gz 7740293 BLAKE2B b7a657720524abac2c36cccef8cf6e9c5588fcc191ecc2a3f7ed138762cc23abdc2b6413c67d426635e50777b8b87fccf93dc7cd88b0dd5c67becbc3f9056472 SHA512 caa6566f79837deb31db991df5475369b4921a5a110b723ad6c76f8ce2349399d0843d3e5de071a4ec50b318157d8fb47cc36018a0af9bb487793269c27027bf
 DIST k3d-5.6.0.tar.gz 8022281 BLAKE2B 93f32f65e6c42650608b94d58d2149c3fec96251500be0d95d5673f07ae8c366d80954afa4d80eec149b7a9e8af7389323c21498910a3010bb80b975f64064d0 SHA512 c13df93499ffde6567e4bf7dcf260cb65ca01c390bf39361122fa61553591f418213049cf29d8dde63896f026a28d96f4e2ab522a143ac66cfa9f3786f8ba9b9
 DIST k3d-5.7.3.tar.gz 9566684 BLAKE2B 9dff7ab447b3fd790a036d61bc3a4bb61238c74eec60aa12a4ff10150ff2f4999a3b1e635aaae6211f4e05ed9c589dc08e08ba511eb7690f857c0dad954b6ce7 SHA512 d6e2f6fb3013429745e1663214c7dd66dd2727b592a32e81f5837bbcc997aee18418366a0e21463ba48a2d72b9a86067f492f1f44c4689a129166dcf018e5642
-EBUILD k3d-5.4.9.ebuild 804 BLAKE2B ccc3251da755fcdd717360a7fffecef1f45d126e0d42948671d5b83721fe84670e51d4c0d222e994c96e9866adb48546af3f5d287e942f9803bc092fef769ea9 SHA512 87771e1e54e17528c58e41c53f2d38e1d83cc69740e5cff9d9c452e650e54bd72a3888730770f963d4efa96fedc5ed0b7e466428a8f3a9216be8dbc81f38d6d8
+DIST k3d-5.7.5.tar.gz 9542352 BLAKE2B 7855f4241577ab2558d3eda7eb866fd456ba3c08a60d8ba1d4c7874d846654f39d7bd618bb010d48543536d5e38847cb715fd0ce5af8a519ce0cc7bd3814a1df SHA512 b14f9ddd521aade832ad5493007be55294648a037bcdaeae7e1f424f60975451872ad1bed895892e51ad22ac86ec6fcdc77c08d2b0422d3aad20ab4b40b9f884
 EBUILD k3d-5.6.0.ebuild 802 BLAKE2B f0dd1a4a0a8558f6338cb7d2564a182196677daacc12ad959b1724ebadd8e418e69caaf46680a1fc087a6db41e632ff7e07204df4e92e96a62adfa4ea3006caf SHA512 290fde415ed21510a978f30ba1560eb8cd7a412c76aefdd2012bcb3573496304dccc22609487d51c59e127430dce12a52222834a6cd035d4926ae102e31eccb5
 EBUILD k3d-5.7.3.ebuild 867 BLAKE2B ebe2e31457023fb8cbf032573a0046ffde8f0c8e65a154c5dbf9581153a35bcd499b077cf17024bbe4083252c381f961980dfb2caff698dbc05d996fd41730e9 SHA512 dd36491e537bcfb7c2602b245bdc4c9cb6d74dc6e9da4dbdde841a1b6d62895864958c9bc776c1faefe2c7d431b5b39247af59bf80f34003a43585f2c2881e5c
+EBUILD k3d-5.7.5.ebuild 867 BLAKE2B 2ab0b8952f07aaafaa906a3d4764a2bba75616573319e775e0e7cfee8863bd1a41cb8b18fd715fac9ac886bd375242432040d05191d482628cbd51b1feaf8efc SHA512 67d347e2ad39719a54a602e7b577ddf5b959f7f4c38652bbe062bd7095e63e435a8edbccd5307e06f0d11108b9d9b1a3946dc00450e0572976dbbaa82d7e1ac8
 MISC metadata.xml 321 BLAKE2B a208d771132d412c9ac0adeb9017eae248d17303824ac7a616301fa0be1ceaed0fa93d43e179730b96dc81e2252afb628c3cfdda601bfbd288eb23e4d8553e3c SHA512 107d2bc402e3c1e1bf26af4427a563902921bcf4f676683f2a33952112fdf1b2d6d5993f18535ab440d985ffeb777f66a85735b91692739764666fb8e6aa898d
diff --git a/app-containers/k3d/k3d-5.4.9.ebuild b/app-containers/k3d/k3d-5.7.5.ebuild
index 6f57b743d680..cf9bfa7e51d5 100644
--- a/app-containers/k3d/k3d-5.4.9.ebuild
+++ b/app-containers/k3d/k3d-5.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit go-module
 DESCRIPTION="k3d creates k3s clusters in docker"
 HOMEPAGE="https://github.com/rancher/k3d"
 
-K3D_K3S_TAG=v1.24.12-k3s1
+K3D_K3S_TAG=v1.31.2-k3s1
 SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
 SLOT="0"
@@ -21,12 +21,16 @@ src_prepare() {
 }
 
 src_compile() {
-	GOWORK=off \
+	local extra_ldflags=(
+		-X "github.com/k3d-io/k3d/v5/version.Version=v${PV}"
+		-X "github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}"
+	)
+	env -u GOWORK \
 	CGO_ENABLED=0 \
 		go build \
 		-mod=vendor \
-		-ldflags "-w -s -X github.com/k3d-io/k3d/v5/version.Version=v${PV} -X github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}" \
-		-o bin/k3d
+		-ldflags "-w -s ${extra_ldflags[*]}" \
+		-o bin/k3d || die
 }
 
 src_install() {
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
author	V3n3RiX <venerix@koprulu.sector>	2024-11-27 02:00:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-11-27 02:00:01 +0000
commit	ead7697a01fd631b56240b2d58aedd98ba7f92d3 (patch)
tree	c73ecbedbb9db967a7dff614f5e8b79eacb79f5d /app-containers
parent	403335d7014372971e9e9267493a808d08bab48e (diff)