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

9 files changed, 2 insertions, 793 deletions

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
- 
-