| 1 |
commit: b7d61574506baf1f3a9b016d627f994cded1c9a9 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Jan 1 13:42:19 2023 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 1 18:16:14 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d61574 |
| 7 |
|
| 8 |
sys-apps/portage: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28918 |
| 12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 13 |
|
| 14 |
...ortage-3.0.39-bash-5.2-patsub_replacement.patch | 49 ---------------------- |
| 15 |
...rtage-3.0.39-implicit-func-decls-no-fatal.patch | 34 --------------- |
| 16 |
2 files changed, 83 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index 90c678998a05..000000000000 |
| 21 |
--- a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,49 +0,0 @@ |
| 24 |
-https://github.com/gentoo/portage/commit/69cac73ba0a7bcf2e2cff88c60d389895a550623 |
| 25 |
- |
| 26 |
-From 69cac73ba0a7bcf2e2cff88c60d389895a550623 Mon Sep 17 00:00:00 2001 |
| 27 |
-From: Sam James <sam@g.o> |
| 28 |
-Date: Wed, 30 Nov 2022 01:09:12 +0000 |
| 29 |
-Subject: [PATCH] ebuild.sh: disable patsub_replacement in Bash 5.2 |
| 30 |
- |
| 31 |
-patsub_replacement is a new option in bash-5.2 that is also default-on |
| 32 |
-in that release. The default value is not gated by BASH_COMPAT (see bug #881383), |
| 33 |
-hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds |
| 34 |
-and eclasses. |
| 35 |
- |
| 36 |
-Thanks to Kerin for both raising this & being persistent with trying |
| 37 |
-to get Bash 5.2 to be suitable for use in Gentoo. |
| 38 |
- |
| 39 |
-Bug: https://bugs.gentoo.org/881383 |
| 40 |
-Thanks-to: Kerin Millar <kfm@×××××××××.net> |
| 41 |
-Signed-off-by: Sam James <sam@g.o> |
| 42 |
---- a/bin/ebuild.sh |
| 43 |
-+++ b/bin/ebuild.sh |
| 44 |
-@@ -18,6 +18,7 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1 |
| 45 |
- # used instead. |
| 46 |
- __check_bash_version() { |
| 47 |
- # Figure out which min version of bash we require. |
| 48 |
-+ # Adjust patsub_replacement logic below on new EAPI! |
| 49 |
- local maj min |
| 50 |
- if ___eapi_bash_3_2 ; then |
| 51 |
- maj=3 min=2 |
| 52 |
-@@ -50,6 +51,19 @@ __check_bash_version() { |
| 53 |
- if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then |
| 54 |
- shopt -s compat32 |
| 55 |
- fi |
| 56 |
-+ |
| 57 |
-+ # patsub_replacement is a new option in bash-5.2 that is also default-on |
| 58 |
-+ # in that release. The default value is not gated by BASH_COMPAT (see bug #881383), |
| 59 |
-+ # hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds |
| 60 |
-+ # and eclasses. |
| 61 |
-+ # |
| 62 |
-+ # New EAPI note: a newer EAPI (after 8) may well adopt Bash 5.2 as its minimum version. |
| 63 |
-+ # If it does, this logic will need to be adjusted to only disable patsub_replacement |
| 64 |
-+ # for < ${new_api}! |
| 65 |
-+ if (( BASH_VERSINFO[0] >= 6 || ( BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 2 ) )) ; then |
| 66 |
-+ shopt -u patsub_replacement |
| 67 |
-+ fi |
| 68 |
-+ |
| 69 |
- } |
| 70 |
- __check_bash_version |
| 71 |
- |
| 72 |
- |
| 73 |
|
| 74 |
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 |
| 75 |
deleted file mode 100644 |
| 76 |
index 4a4e68f2690a..000000000000 |
| 77 |
--- a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch |
| 78 |
+++ /dev/null |
| 79 |
@@ -1,34 +0,0 @@ |
| 80 |
-https://github.com/gentoo/portage/commit/0fdbbbdb5a80e331adf701f2b2c1f096695447c4 |
| 81 |
- |
| 82 |
-From 0fdbbbdb5a80e331adf701f2b2c1f096695447c4 Mon Sep 17 00:00:00 2001 |
| 83 |
-From: Sam James <sam@g.o> |
| 84 |
-Date: Sun, 20 Nov 2022 23:32:08 +0000 |
| 85 |
-Subject: [PATCH] install-qa-check.d/90gcc-warnings: don't make implicit func |
| 86 |
- decls fatal for now |
| 87 |
- |
| 88 |
-We need to do this at some point (as Clang 16 and GCC 14 are doing it, and |
| 89 |
-they indicate runtime problems anyway), but there's too much breakage for now. |
| 90 |
- |
| 91 |
-We did find some extra bugs though. The main issue is too much high-profile |
| 92 |
-stuff breaks rather than the total number of bugs, wrt Portage behaviour |
| 93 |
-changing being suitable or not. |
| 94 |
- |
| 95 |
-Bug: https://bugs.gentoo.org/870412 |
| 96 |
-Signed-off-by: Sam James <sam@g.o> |
| 97 |
---- a/bin/install-qa-check.d/90gcc-warnings |
| 98 |
-+++ b/bin/install-qa-check.d/90gcc-warnings |
| 99 |
-@@ -153,9 +153,10 @@ gcc_warn_check() { |
| 100 |
- # always_overflow=yes |
| 101 |
- #fi |
| 102 |
- |
| 103 |
-- if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then |
| 104 |
-- implicit_func_decl=yes |
| 105 |
-- fi |
| 106 |
-+ # Disabled for now because too many failures. bug #870412. |
| 107 |
-+ #if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then |
| 108 |
-+ # implicit_func_decl=yes |
| 109 |
-+ #fi |
| 110 |
- |
| 111 |
- if [[ ${always_overflow} = yes || ${implicit_func_decl} = yes ]] ; then |
| 112 |
- eerror |
| 113 |
- |
Archives