gentoo auto-resync : 01:04:2024 - 08:13:46

10 files changed, 58 insertions, 528 deletions

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 93af86afb89d..fea54e34218d 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,17 +1,10 @@
 AUX dont-call-as-directly-upstream-pr-5436.patch 1230 BLAKE2B 991ffcf879c2cb6dbce7ff33805d4fe89e9e40d846a4b2a03a5252833f0cd5f17f32f1e605645d6eedd0fcc1a4a2034588644dbe9dd18c97c0fb501fb8df7cf2 SHA512 9dbb9b91fb367ff59b78dd5c2ac86f47b7db0ced6d6bb2c84761c6d919bb4d86743dd5c9150336e961ec71c61c3aef5350a82a9c84d204cd101c09ca72a5b2b5
-DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9 SHA512 82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
-DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec SHA512 86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
+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.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
 DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
-DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B 31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc SHA512 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
 DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B 014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d SHA512 ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
-EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
-EBUILD buildah-1.33.6.ebuild 2909 BLAKE2B 028314b5c62013ce5ebd147a45944e5e27f2150ad51f2fc566c5ebe45a64ad78ea068962b41dbb5fb657312bf5a48f06e75a920b0f9a4190a06c0b96f7ce02c8 SHA512 48e37433580225f5dbaccbdb2748d7e9715793692c5a2a570ef7cfafcb1994d72583b1bba46c17d81bc5e53603f9ea8f2ac5d8fdcde7377641dd58d08d1040ac
-EBUILD buildah-1.33.7.ebuild 3892 BLAKE2B 9eec9455730d71ee3fbb95c6533502c3c08fa71d12ed8118025f801fe9617afa81a8db997a84398bbf395ee5a5ce2df1964be91899c69c1a60ff223aab490a0a SHA512 1c4a000d06f31a3b44539e901cb5a942049bddcb2558b63e1ad805060adf7c8fe53674c3f0561f177939c65864101dbd93edc76c9bb175be2ded760d06feae27
-EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 005d1365c73b062d304f8cc729af70d27cb7ab8d74d94799ec7d4a5d293bf3cc2a436ec6d05de539f72c8c1af019ed3cc67312d67276ae5e611cb0e9893e1da8 SHA512 f7f3594f3c75db2fe2ea40645d398b64662d804a22510b22f3cc386b9827e3ce51fc4ee89230495454bc7783ae43185ddd576b85bf3433f29db345d04766c7b5
-EBUILD buildah-1.34.3.ebuild 3854 BLAKE2B ba3db2a4288bf268198dc4e0ae75be770c09a2c6356febf71d4f1793156c36643024bb32ac42f63b337d42fe8a067cf2483dc11d198fcaa3277c51365a994fc4 SHA512 f8aa9aa58274c5cb2d5722f880ac4c454445aa266eab10150719bc27f1b5a7c0c443020670bdf9c8c8730d7245c3d9b757dd77b9aca3250fdd23b5cff96d5386
-EBUILD buildah-1.35.1.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
-EBUILD buildah-1.35.3.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
-EBUILD buildah-9999.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
+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 3184 BLAKE2B c4921b642a814ab645fce1c7e36bccfcc0714564f6e915582b9ccf061a366103f5f962f8cbd05c4e644f2445400266b1ff74ac1b26286fefe7057348c30c3579 SHA512 defa4e45ba7c327732ce5422803a056e93b3ec2a69631596d1c41eee4606e23bd9d115492b5dec398f00bca6c27dde7a1c06c08087b3ac7eb2aec27c997982d0
+EBUILD buildah-9999.ebuild 3124 BLAKE2B 329e87ab012af334b5c59edd87dc9be3de2d99d732112ccad276e3250fc8f03046bbc0088d5de0f4cfc958a398582410ce1a23cc69d8242f9eef82edbe82e00d SHA512 685ed84503d4d745d73fe549b271735762dc9bebfa8f1bd5fe5d87ddd26b9a5487900aa1ec77e09f7b95d0da23040861fb1eecd5367547eaff20b7ba5534f858
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.33.5.ebuild b/app-containers/buildah/buildah-1.33.5.ebuild
deleted file mode 100644
index d258b206eb6a..000000000000
--- a/app-containers/buildah/buildah-1.33.5.ebuild
+++ /dev/null
@@ -1,125 +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
-
-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 doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.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}"
-
-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
-		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=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.33.6.ebuild b/app-containers/buildah/buildah-1.33.6.ebuild
deleted file mode 100644
index 0a54ae957f04..000000000000
--- a/app-containers/buildah/buildah-1.33.6.ebuild
+++ /dev/null
@@ -1,125 +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
-
-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 doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.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}"
-
-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
-		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=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.33.7.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild
index 60b99c3a6057..a24bd18a767c 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
 	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -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,7 +73,7 @@
+@@ -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
 
@@ -77,6 +78,11 @@ src_prepare() {
  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
@@ -139,7 +145,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-1.34.0.ebuild b/app-containers/buildah/buildah-1.34.0.ebuild
deleted file mode 100644
index 6237903cb5cc..000000000000
--- a/app-containers/buildah/buildah-1.34.0.ebuild
+++ /dev/null
@@ -1,125 +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
-
-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 doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.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}"
-
-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
-		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=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.34.3.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild
index 4b82e782d4f3..cc06bf2ff42d 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
 	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -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)
-@@ -77,7 +77,7 @@
+@@ -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
 
@@ -76,6 +77,13 @@ src_prepare() {
 +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
@@ -138,7 +146,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-1.35.1.ebuild b/app-containers/buildah/buildah-1.35.1.ebuild
deleted file mode 100644
index b0b39faf03cb..000000000000
--- a/app-containers/buildah/buildah-1.35.1.ebuild
+++ /dev/null
@@ -1,132 +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
-)
-
-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
-	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
index b0b39faf03cb..e1c7e23390e5 100644
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -46,6 +46,7 @@ BDEPEND="dev-go/go-md2man"
 
 PATCHES=(
 	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
 )
 
 pkg_pretend() {
@@ -117,7 +118,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index b0b39faf03cb..987715de5560 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -45,7 +45,7 @@ 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() {
@@ -117,7 +117,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
new file mode 100644
index 000000000000..0ca0a6602a7d
--- /dev/null
+++ b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
@@ -0,0 +1,29 @@
+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
+ 
+