commit: b614863f02f4b89e7e178ff79784d9a8b581bf13
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 7 15:00:42 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 7 16:07:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b614863f
app-shells/bash: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/bash/bash-5.3_rc1.ebuild | 1 +
app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild | 8 +++-----
app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild | 8 +++-----
app-shells/bash/bash-9999.ebuild | 9 +++++----
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/app-shells/bash/bash-5.3_rc1.ebuild
b/app-shells/bash/bash-5.3_rc1.ebuild
index d495d9e3b911..87d04b1c1f27 100644
--- a/app-shells/bash/bash-5.3_rc1.ebuild
+++ b/app-shells/bash/bash-5.3_rc1.ebuild
@@ -26,6 +26,7 @@ case ${PV} in
;;
*)
PLEVEL=0
+ ;;
esac
# The version of readline this bash normally ships with. Note that we only use
diff --git a/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
b/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
index 638ab9434adf..02e45fa7d9b3 100644
--- a/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
+++ b/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
@@ -15,7 +15,7 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
MY_PATCHES=()
-# Determine the patchlevel.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
case ${PV} in
9999|*_alpha*|*_beta*|*_rc*)
# Set a negative patchlevel to indicate that it's a pre-release.
@@ -26,11 +26,12 @@ case ${PV} in
;;
*)
PLEVEL=0
+ ;;
esac
# The version of readline this bash normally ships with. Note that we only use
# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_beta"
+READLINE_VER="8.3_rc1"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html
https://git.savannah.gnu.org/cgit/bash.git";
@@ -264,8 +265,6 @@ src_compile() {
fi
fi
- # builtins/evalstring.c needs y.tab.h but can't (easily) specify the
dep on it from above
- emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" y.tab.h
emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS}
${pgo_generate_flags[*]}" all others
@@ -282,7 +281,6 @@ src_compile() {
# Rebuild Bash using the profiling data we just generated.
emake clean
- emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" y.tab.h
emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS}
${pgo_use_flags[*]}" all others
fi
diff --git a/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
b/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
index 62a7031a0d27..04dd9c2d72ba 100644
--- a/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
+++ b/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
@@ -15,7 +15,7 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
MY_PATCHES=()
-# Determine the patchlevel.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
case ${PV} in
9999|*_alpha*|*_beta*|*_rc*)
# Set a negative patchlevel to indicate that it's a pre-release.
@@ -26,11 +26,12 @@ case ${PV} in
;;
*)
PLEVEL=0
+ ;;
esac
# The version of readline this bash normally ships with. Note that we only use
# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_beta"
+READLINE_VER="8.3_rc1"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html
https://git.savannah.gnu.org/cgit/bash.git";
@@ -264,8 +265,6 @@ src_compile() {
fi
fi
- # builtins/evalstring.c needs y.tab.h but can't (easily) specify the
dep on it from above
- emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" y.tab.h
emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS}
${pgo_generate_flags[*]}" all others
@@ -282,7 +281,6 @@ src_compile() {
# Rebuild Bash using the profiling data we just generated.
emake clean
- emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" y.tab.h
emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
use plugins && emake -C examples/loadables CFLAGS="${CFLAGS}
${pgo_use_flags[*]}" all others
fi
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 6216b7884332..04dd9c2d72ba 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -15,7 +15,7 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
MY_PATCHES=()
-# Determine the patchlevel.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
case ${PV} in
9999|*_alpha*|*_beta*|*_rc*)
# Set a negative patchlevel to indicate that it's a pre-release.
@@ -26,11 +26,12 @@ case ${PV} in
;;
*)
PLEVEL=0
+ ;;
esac
# The version of readline this bash normally ships with. Note that we only use
# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
+READLINE_VER="8.3_rc1"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html
https://git.savannah.gnu.org/cgit/bash.git";
@@ -45,8 +46,8 @@ elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
# the alpha, and the next pre-release is usually quite far away.
#
# i.e. if it's worth packaging the alpha, it's worth packaging a
followup.
- BASH_COMMIT="d3e86e66ce857a8dc02e3116fd98b6e5b34d6364"
-
SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz
-> ${P}-${BASH_COMMIT}.tar.xz"
+ BASH_COMMIT="535a8150b65ee6888f54f602274dbbdcd77c788e"
+
SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz
-> ${P}-${BASH_COMMIT}.tar.gz"
S=${WORKDIR}/${PN}-${BASH_COMMIT}
else
my_urls=(
{'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
