sys-apps/portage: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28918
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

2 files changed, 0 insertions, 83 deletions

diff --git a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch b/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
deleted file mode 100644
index 90c678998a05..000000000000
--- a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/gentoo/portage/commit/69cac73ba0a7bcf2e2cff88c60d389895a550623
-
-From 69cac73ba0a7bcf2e2cff88c60d389895a550623 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 30 Nov 2022 01:09:12 +0000
-Subject: [PATCH] ebuild.sh: disable patsub_replacement in Bash 5.2
-
-patsub_replacement is a new option in bash-5.2 that is also default-on
-in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
-hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
-and eclasses.
-
-Thanks to Kerin for both raising this & being persistent with trying
-to get Bash 5.2 to be suitable for use in Gentoo.
-
-Bug: https://bugs.gentoo.org/881383
-Thanks-to: Kerin Millar <kfm@plushkava.net>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/ebuild.sh
-+++ b/bin/ebuild.sh
-@@ -18,6 +18,7 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
- # used instead.
- __check_bash_version() {
- 	# Figure out which min version of bash we require.
-+	# Adjust patsub_replacement logic below on new EAPI!
- 	local maj min
- 	if ___eapi_bash_3_2 ; then
- 		maj=3 min=2
-@@ -50,6 +51,19 @@ __check_bash_version() {
- 	if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then
- 		shopt -s compat32
- 	fi
-+
-+	# patsub_replacement is a new option in bash-5.2 that is also default-on
-+	# in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
-+	# hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
-+	# and eclasses.
-+	#
-+	# New EAPI note: a newer EAPI (after 8) may well adopt Bash 5.2 as its minimum version.
-+	# If it does, this logic will need to be adjusted to only disable patsub_replacement
-+	# for < ${new_api}!
-+	if (( BASH_VERSINFO[0] >= 6 || ( BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 2 ) )) ; then
-+		shopt -u patsub_replacement
-+	fi
-+
- }
- __check_bash_version
- 
-
diff --git a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch b/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
deleted file mode 100644
index 4a4e68f2690a..000000000000
--- a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/gentoo/portage/commit/0fdbbbdb5a80e331adf701f2b2c1f096695447c4
-
-From 0fdbbbdb5a80e331adf701f2b2c1f096695447c4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 20 Nov 2022 23:32:08 +0000
-Subject: [PATCH] install-qa-check.d/90gcc-warnings: don't make implicit func
- decls fatal for now
-
-We need to do this at some point (as Clang 16 and GCC 14 are doing it, and
-they indicate runtime problems anyway), but there's too much breakage for now.
-
-We did find some extra bugs though. The main issue is too much high-profile
-stuff breaks rather than the total number of bugs, wrt Portage behaviour
-changing being suitable or not.
-
-Bug: https://bugs.gentoo.org/870412
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/install-qa-check.d/90gcc-warnings
-+++ b/bin/install-qa-check.d/90gcc-warnings
-@@ -153,9 +153,10 @@ gcc_warn_check() {
- 			#	always_overflow=yes
- 			#fi
- 
--			if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then
--				implicit_func_decl=yes
--			fi
-+			# Disabled for now because too many failures. bug #870412.
-+			#if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then
-+			#	implicit_func_decl=yes
-+			#fi
- 
- 			if [[ ${always_overflow} = yes || ${implicit_func_decl} = yes ]] ; then
- 				eerror
-