gentoo auto-resync : 01:05:2024 - 00:00:04

24 files changed, 815 insertions, 878 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8a03a50466cf..e6626ab9aedf 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index d88843c8ecd3..379d01791fb4 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -7,8 +7,8 @@ AUX bash-5.2_p21-wpointer-to-int.patch 512 BLAKE2B 0c7f5eb5b697abf15c1d17888a973
 AUX bash-5.2_p26-memory-leaks.patch 4357 BLAKE2B 1b9f08054b28fa0e73b7b3d4da2674efd75b3ce11392a078d5072ba8e466f4a9c504892f9a1f2f62e4dc39b22050e68d42bcbae8ebe537df699d0c884c89a0b9 SHA512 ad30a74b7f4ecf5f7446867baf9b177fb1036e384b61a2ed73b121b17b7f686f9bdf9295c5c251b11d165f80e6110a2768257a2460c7e93abe78a5f763b972e8
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3494 BLAKE2B e9379c18fca85666cd347d1d8cf5c9859c5865ad7a3ded1ac5724bad6117924231e89dcc21f1a80931591e9a39c1acc3f7be8b2afe38986ea34b3b8fc12f5814 SHA512 a8fa416ab9265055e778fad3e4190ab5f57da0823c12d60a915bb77ba701fe93df8d16e041dd5747ed9db899a2516451b803db648aed0f85f0abb6d98c9414b8
-AUX bashrc-r1 535 BLAKE2B bac05d534c76162950cc6f5046496ef634773ab768f6dc71e4387d2138426fcc06b52b93553db8f51f575bd8aecaf07f353ae7951aa9bb917babb5a58d729ae6 SHA512 cee0680dc31a1f9048ddb0dd41fea808403f17d319a115539486290e14abb359dd461f91963f63fb2c2b6315576baaac999b2e40fe7b33aeb0561b4695b4b9c8
-AUX bashrc.d/10-gentoo-color.bash 2106 BLAKE2B 8b0e8c83aade201ea6f06e7e5a2f090d05aaefc133f964909292b45dd923a960518fa46ed00eeba7baa4638e33fdb08a56d7e2bf196016fff26e7ab4a5f8a5f2 SHA512 5f91451e2da7567a4576ddeceb24da49d834f8a2647759b400392dd3adb9ec97eba0639b92c121ce08c524de729298b3ac211f150a6335010cbc6dbaa91c0163
+AUX bashrc-r1 862 BLAKE2B 93be0cc75a376562f8d2b03660cf30474be54dee8b201a0a679cf5c204f6a913a020236fab47e94ddf25a4eedfce35ec699f22d4ceb526a2a81ecf10c73d5f66 SHA512 bdaf735379affb1969dd7189d24686fa60f22a101493bde5598b2c57e4007db4f88ad08232731133754a21882ded64bb33b295388cdeb9d5b43b0a66de711c13
+AUX bashrc.d/10-gentoo-color.bash 2110 BLAKE2B 7cdfed47d00ffd0d1ba721689019e0abf17714e1d42fa6d5c4fd3f794fd40537872bf0710a11aed097c80ac042d10c9b1cff87faa00dc1e1a6c890696311ab46 SHA512 08b07fa87eb16f8a15a5d9c5ec719a63646a83d631a7a39fcb85a251be93e2459e5da62cd04728fcf58a4d4bef432a87d2396e5842199ba9054947bd4993b047
 AUX bashrc.d/10-gentoo-title.bash 2080 BLAKE2B cb2a116efcebab6f8be38d747ade40382824483af55543455e490a69e339a0f528eeab383df29a05dd269cc011cdfd7da65ac9a2cd8382c9d7f77c37c0f0b8d1 SHA512 a687b895e65011eaf8a04da3284a3ee056265efc5604c478e1b8ab6e84cf5e22583eb7a0e39a9e7525dfbc1d0f04f3bb6c5acbee93fe870774c1c0e1253feee7
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
@@ -452,11 +452,11 @@ EBUILD bash-4.2_p53.ebuild 5157 BLAKE2B 1a58f67c384b6ae781e48ddc2fb131086a23b449
 EBUILD bash-4.3_p48-r2.ebuild 6358 BLAKE2B 532802911ced386ccff0594e5eee739d0d5ebba7e0bf89c431e2769ca7b2dc48f77787f12bcb327f9d394d3bd80680889968c3708ff9f7e64615347fcfd521f5 SHA512 62ed893e23d65d17d0f83d812e616511b4ff2d69a52e6bffb3ed421bb339d18a213a2f1da0239b108e3e81cf0b2f61b4e0cf535964f40dc4577d0cff226fd9bd
 EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d2524545f38a9eb793cd8b9d30ed5cb4ae11078cd7bc940fe3cda3f62797ed53de5ab82f726219c054cdc8779a011a8ea9 SHA512 9b9d12e1408944d18c698b0be9940618c059599138f10b20ed55dc69131aac900e3cae0e0b79a55e77d075f6a03c2970b6d22250afe5c7912c652800fe9a30ef
 EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae
+EBUILD bash-5.1_p16-r10.ebuild 9783 BLAKE2B cbf1943aa04ff0b823b4fc7502865af2d5721efa18ac080753f2fe5c1ed10ec99927cf25175cf157ef89f2be2d17d18e7a500212bf8a4ab5b20430334777a583 SHA512 5fbe74971ac23adabc110882dfe62e70eabea5f8f99493c41ee87e8d78bcbe88cc07978f839d7d602081afda17e7b444054b0fccde3723df6e1b05eccc22d01a
 EBUILD bash-5.1_p16-r6.ebuild 8848 BLAKE2B 994e869b63c30c5a02c61a9f6f0a25137bba2582187163e0b72ecfcf46aa439527516c6e6b503b289dc8b78a3d5353c57d719c997a8587cf758d57e8f9241a98 SHA512 0fdf7410c8ac01ccd0c7638ca50365b734e99fe41056576101fe8ef0f27714e9f39a296ad97342289331730eb988e693b0dba56dc279c0d259758434d178a2a1
 EBUILD bash-5.1_p16-r7.ebuild 8910 BLAKE2B 433123c1a486162fc2b04513ff112d6b063cf9c2dcf133563ce86bd876a922ec5efd829c096829f13e00e6fcf40608654a7206402a4bc17538ac1d66ee5e510b SHA512 fa4a8cf4b9fb32407f9ae1e5a9ccfeaa28ee6f946dcd62d2ffca80a54e11b83a08412879c3affffb7a684430848e7dfbf9b847da943a1431e5f463fbbb8d3801
-EBUILD bash-5.1_p16-r9.ebuild 10331 BLAKE2B 680864358c70a5831202cef8b4733bfc66c05d7dca38b1666c43edc0f9daccab8a9823cc920bd427caf40c49261a2c1cb3fe028216f497dcf7e32ebc9f9026e7 SHA512 a8c7ecb8a406e482bf51f22324476ef74a49d32df5cc2ded28b70c17a351119edfd69fcae3e98c95855988a106ba4527ce2263b97f1af309b6e9d19a5409efd4
-EBUILD bash-5.2_p26-r2.ebuild 12191 BLAKE2B 58cb030b75bd82f677526dbe5452ead67e9bd1b3a96ea0b5d20f796027daed04887243a848259a929541cc90c806cf502501b6218c444d6530d605a9f0dc53b1 SHA512 a06e3f052d0e545543cb3f7b1a9ab64a5c1e250aeca1814919555501cfed5f20c9c9fedb2681f0fd0d38f112983dcab659093e1f02857dfddb0d3ec645572482
+EBUILD bash-5.2_p26-r3.ebuild 11328 BLAKE2B d40b46ee1d0ac919bfc2b5184846b1c82422ada48996dce84e2788562552b152f25a5bef16eae0ea4e172957ebf51f416048a03c39dc25c37e9c0186023e6068 SHA512 f1534854c7626071211cd59aecb78d9299bcff664bfc87a828835f9bd5904ea3c8bc0931ee8612c738a9cbef5e948806a72a6fd580cf0eed2789deaa3b4a3c8b
 EBUILD bash-5.2_p26.ebuild 10770 BLAKE2B 051adeaa0222babb768474508b47932dfca26f3600f1adb640e60b1839efc36fe8c327eee0e9de8183d6e8a7e980bf1db2d71ea47d6b9f158dcfd24ebb2a6e55 SHA512 013dfc231bde39ae25ed2bb94faa2b04eb9f8234234e4492ef091edb33a64ad0471e162d3d15dc98eb155f32cc0330a596e9efd7f0066eaf8585d421fd730c64
-EBUILD bash-5.3_alpha-r1.ebuild 12057 BLAKE2B f3c85c8e131f0ee16011e79be5f6c7b6f55fe055f4f5a86e894c90cd55e7212ed6298fe3e56dbf23c4542bb67d95c5e3130167b7f0e171ca892e1b2aaa24af8c SHA512 93cb1723e0fa56c9a33e79795ae1fc1bf2ea7fd62b957ed330973221274aa5deedb2b15df47a0e6af9ea7139ad7561458b8cb358c9e0a3be8313b7b95367143a
-EBUILD bash-9999.ebuild 11748 BLAKE2B b4bc34087a54f5f76e1118fa68896157b8a4c57936418de913d408ba3f8eb7e539f20444855501092f76b877045bb454a0d20100be56cc2354b77c75040adc94 SHA512 e2cdb0204e62447af33df206603d65fe55cf8d33964e2ff16668488702857ee44373da96c8cd5ea52b6b0ed92974505f2b72dc1bd28be2a09d1ca9e823377fdd
+EBUILD bash-5.3_alpha-r2.ebuild 11194 BLAKE2B 759992ec0a7cbae9dc1e2770981ae2872b0419e2e4a20c8c440efb7534efb4f0924478600409fb7976e1cb4eb1bf3f590c15c20817c7f21bb00c28349624ce7a SHA512 23677553a37876fb95fb9e8864a2ad75421e1b7b0081437288eb857fcf075428c80cfbe01550757a79b4421981fdc267c4c1dca8bb9e4986032f60d5fce4cde3
+EBUILD bash-9999.ebuild 11144 BLAKE2B acb7134a25d680e403e58c72a8675bbb40bf812f712e541cf15c4d6958e40d1f394ecd390137cd0f386b00b42a1f5dc1bbc5747fa1346b51f87ab0ce4da92965 SHA512 deac7d0ecf7b0fd74aa8ae080482d2567e35373f307263d7f8526f90fcb153b8c098957a0f639a99d6b7b895b5249a4a91a1313a3db37415894c8bfac61d686a
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r10.ebuild b/app-shells/bash/bash-5.1_p16-r10.ebuild
new file mode 100644
index 000000000000..2f4a6284d0a0
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.1-patches/.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		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.1"
+
+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"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
+
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
+
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+
+	unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+if (( PLEVEL >= 0 )); then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
+BDEPEND="
+	sys-devel/bison
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+	"${FILESDIR}/${PN}-5.1_p16-configure-clang16.patch"
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local -a myconf
+
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset -v YACC
+
+	myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h.
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	use nls || myconf+=( --disable-nls )
+
+	if (( PLEVEL >= 0 )); then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+	else
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
+	dodir /bin
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
+
+	insinto /etc/bash/bashrc.d
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
+	done
+
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
+				else
+					dodoc "${f}"
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1.
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
+	fi
+
+	read -r old_ver <<<"${REPLACING_VERSIONS}"
+	if [[ ! $old_ver ]]; then
+		:
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
+		return
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
+		return
+	fi
+
+	einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
+	einfo ""
+	einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
+	einfo "characteristics of the operating environment, this array may contain commands"
+	einfo "to set the window and pane title. Users that choose to customise this variable"
+	einfo "in ~/.bashrc are advised to append their commands, using the following syntax."
+	einfo ""
+	einfo "PROMPT_COMMAND+=('custom command goes here')"
+	einfo ""
+	einfo "Alternatively, users that wish to opt out of Gentoo's window title setting"
+	einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
+	einfo "as desired. Previously, there was no formally supported method of opting out."
+}
diff --git a/app-shells/bash/bash-5.1_p16-r9.ebuild b/app-shells/bash/bash-5.1_p16-r9.ebuild
deleted file mode 100644
index fefec1f7e54d..000000000000
--- a/app-shells/bash/bash-5.1_p16-r9.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset
-GENTOO_PATCH_DEV="sam"
-GENTOO_PATCH_VER="${PV}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-	case ${PV} in
-		*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		upstream_url_base="mirror://gnu/bash"
-		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
-			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-			SRC_URI+=" ${patch_url}"
-			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-			# Add in the mirror URL too.
-			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
-			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
-
-			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-		done
-
-		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
-	fi
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="sys-devel/bison
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
-
-	"${FILESDIR}"/${PN}-5.1_p16-configure-clang16.patch
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double ; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
-
-			local patch
-			for patch in "${MY_PATCHES[@]}" ; do
-				verify-sig_verify_detached ${patch}{,.sig}
-			done
-		fi
-
-		unpack ${MY_P}.tar.gz
-
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset YACC
-
-	local myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e 's:#GNU#@::'
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]] ; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
-		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
-		return
-	fi
-
-	einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
-	einfo ""
-	einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
-	einfo "characteristics of the operating environment, this array may contain commands"
-	einfo "to set the window and pane title. Users that choose to customise this variable"
-	einfo "in ~/.bashrc are advised to append their commands, using the following syntax."
-	einfo ""
-	einfo "PROMPT_COMMAND+=('custom command goes here')"
-	einfo ""
-	einfo "Alternatively, users that wish to opt out of Gentoo's window title setting"
-	einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
-	einfo "as desired. Previously, there was no formally supported method of opting out."
-}
diff --git a/app-shells/bash/bash-5.2_p26-r2.ebuild b/app-shells/bash/bash-5.2_p26-r3.ebuild
index 64cfa30c6113..3e1775504a62 100644
--- a/app-shells/bash/bash-5.2_p26-r2.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r3.ebuild
@@ -6,86 +6,65 @@ EAPI=8
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
-# Uncomment if we have a patchset
+# Uncomment if we have a patchset.
 #GENTOO_PATCH_DEV="sam"
 #GENTOO_PATCH_VER="${PV}"
 
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
 MY_PATCHES=()
 
-is_release() {
-	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		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.2_p1"
 
 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"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
-elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		upstream_url_base="mirror://gnu/bash"
-		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
-			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
 
-			SRC_URI+=" ${patch_url}"
-			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
 
-			# Add in the mirror URL too.
-			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
-			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
 
-			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-		done
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
 
-		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
-	fi
-else
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+	unset -v my_urls my_p my_patch_idx my_patch_ver
 fi
 
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
 fi
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
@@ -94,85 +73,89 @@ DEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	nls? ( virtual/libintl )
 "
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
 fi
 RDEPEND="
 	${DEPEND}
 "
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
 BDEPEND="
 	pgo? ( dev-util/gperf )
 	verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-# EAPI 8 tries to append it but it doesn't exist here
+# EAPI 8 tries to append it but it doesn't exist here.
 QA_CONFIGURE_OPTIONS="--disable-static"
 
 PATCHES=(
 	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
-	# Patches from Chet sent to bash-bug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-	"${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
-	"${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
-	"${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
-	"${FILESDIR}"/${PN}-5.2_p21-configure-strtold.patch
-	"${FILESDIR}"/${PN}-5.2_p26-memory-leaks.patch
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+	"${FILESDIR}/${PN}-5.2_p15-random-ub.patch"
+	"${FILESDIR}/${PN}-5.2_p15-configure-clang16.patch"
+	"${FILESDIR}/${PN}-5.2_p21-wpointer-to-int.patch"
+	"${FILESDIR}/${PN}-5.2_p21-configure-strtold.patch"
+	"${FILESDIR}/${PN}-5.2_p26-memory-leaks.patch"
 )
 
 pkg_setup() {
 	# bug #7332
-	if is-flag -malign-double ; then
+	if is-flag -malign-double; then
 		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
 
-	if use bashlogger ; then
+	if use bashlogger; then
 		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
 		ewarn "This will log ALL output you enter into the shell, you have been warned."
 	fi
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
 
-			local patch
-			for patch in "${MY_PATCHES[@]}" ; do
-				verify-sig_verify_detached ${patch}{,.sig}
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
 			done
 		fi
 
-		unpack ${MY_P}.tar.gz
+		unpack "${MY_P}.tar.gz"
 
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
 		fi
 	fi
 }
 
 src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
 
 	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
 	rm tests/run-jobs || die
@@ -182,14 +165,16 @@ src_prepare() {
 }
 
 src_configure() {
+	local -a myconf
+
 	# Upstream only test with Bison and require GNUisms like YYEOF and
 	# YYERRCODE. The former at least may be in POSIX soon:
 	# https://www.austingroupbugs.net/view.php?id=1269.
 	# configure warns on use of non-Bison but doesn't abort. The result
 	# may misbehave at runtime.
-	unset YACC
+	unset -v YACC
 
-	local myconf=(
+	myconf=(
 		--disable-profiling
 
 		# Force linking with system curses ... the bundled termcap lib
@@ -207,7 +192,7 @@ src_configure() {
 		$(use_with mem-scramble bash-malloc)
 	)
 
-	# For descriptions of these, see config-top.h
+	# For descriptions of these, see config-top.h.
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
 	append-cppflags \
 		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
@@ -218,13 +203,9 @@ src_configure() {
 		-DSSH_SOURCE_BASHRC \
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf+=( --disable-nls )
 
-	if is_release ; then
+	if (( PLEVEL >= 0 )); then
 		# Historically, we always used the builtin readline, but since
 		# our handling of SONAME upgrades has gotten much more stable
 		# in the PM (and the readline ebuild itself preserves the old
@@ -238,17 +219,15 @@ src_configure() {
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
 	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
 		export ac_cv_func_dl{close,open,sym}=no \
 			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
 
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
 	fi
 
 	# bug #444070
@@ -258,20 +237,37 @@ src_configure() {
 }
 
 src_compile() {
-	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
-	# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
-	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
 
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
 
 	# Build Bash and run its tests to generate profiles.
-	if use pgo ; then
+	if (( ${#pgo_generate_flags[@]} )); then
 		# Used in test suite.
-		unset A
+		unset -v A
 
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
 
 		if tc-is-clang; then
 			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
@@ -279,14 +275,14 @@ src_compile() {
 
 		# Rebuild Bash using the profiling data we just generated.
 		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
 	fi
 }
 
 src_test() {
 	# Used in test suite.
-	unset A
+	unset -v A
 
 	default
 }
@@ -306,7 +302,7 @@ src_install() {
 	}
 
 	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
@@ -318,51 +314,34 @@ src_install() {
 	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
 	done
 
-	local sed_args=(
-		-e 's:#GNU#@::'
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
 
 		insinto /usr/include/bash-plugins
 		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
 	fi
 
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
 				else
-					dodoc ${f}
+					dodoc "${f}"
 				fi
 			done
 		done
 	fi
 
-	# Install bash_builtins.1 and rbash.1
+	# Install bash_builtins.1 and rbash.1.
 	emake -C doc DESTDIR="${D}" install_builtins
 	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
 	doman "${T}"/rbash.1
@@ -372,26 +351,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
 	fi
 }
 
 pkg_postinst() {
 	local old_ver
 
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
 	fi
 
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]] ; then
+	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
 		return
 	fi
 
diff --git a/app-shells/bash/bash-5.3_alpha-r1.ebuild b/app-shells/bash/bash-5.3_alpha-r2.ebuild
index 9b535f0e39eb..f33bf717eac6 100644
--- a/app-shells/bash/bash-5.3_alpha-r1.ebuild
+++ b/app-shells/bash/bash-5.3_alpha-r2.ebuild
@@ -6,86 +6,65 @@ EAPI=8
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
-# Uncomment if we have a patchset
+# Uncomment if we have a patchset.
 #GENTOO_PATCH_DEV="sam"
 #GENTOO_PATCH_VER="${PV}"
 
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
 MY_PATCHES=()
 
-is_release() {
-	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.3-patches/.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		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"
 
 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"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
-elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		upstream_url_base="mirror://gnu/bash"
-		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
-			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
 
-			SRC_URI+=" ${patch_url}"
-			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
 
-			# Add in the mirror URL too.
-			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
-			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
 
-			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-		done
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
 
-		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
-	fi
-else
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+	unset -v my_urls my_p my_patch_idx my_patch_ver
 fi
 
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
 fi
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
@@ -94,80 +73,84 @@ DEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	nls? ( virtual/libintl )
 "
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
 fi
 RDEPEND="
 	${DEPEND}
 "
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
 BDEPEND="
 	pgo? ( dev-util/gperf )
 	verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-# EAPI 8 tries to append it but it doesn't exist here
+# EAPI 8 tries to append it but it doesn't exist here.
 QA_CONFIGURE_OPTIONS="--disable-static"
 
 PATCHES=(
 	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
-	# Patches from Chet sent to bash-bug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
 )
 
 pkg_setup() {
 	# bug #7332
-	if is-flag -malign-double ; then
+	if is-flag -malign-double; then
 		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
 
-	if use bashlogger ; then
+	if use bashlogger; then
 		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
 		ewarn "This will log ALL output you enter into the shell, you have been warned."
 	fi
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
 
-			local patch
-			for patch in "${MY_PATCHES[@]}" ; do
-				verify-sig_verify_detached ${patch}{,.sig}
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
 			done
 		fi
 
-		unpack ${MY_P}.tar.gz
+		unpack "${MY_P}.tar.gz"
 
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
 		fi
 	fi
 }
 
 src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
 
 	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
 	rm tests/run-jobs || die
@@ -177,18 +160,20 @@ src_prepare() {
 }
 
 src_configure() {
+	local -a myconf
+
 	# Upstream only test with Bison and require GNUisms like YYEOF and
 	# YYERRCODE. The former at least may be in POSIX soon:
 	# https://www.austingroupbugs.net/view.php?id=1269.
 	# configure warns on use of non-Bison but doesn't abort. The result
 	# may misbehave at runtime.
-	unset YACC
+	unset -v YACC
 
 	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
 	# upstream to Chet by email.
 	filter-lto
 
-	local myconf=(
+	myconf=(
 		--disable-profiling
 
 		# Force linking with system curses ... the bundled termcap lib
@@ -206,7 +191,7 @@ src_configure() {
 		$(use_with mem-scramble bash-malloc)
 	)
 
-	# For descriptions of these, see config-top.h
+	# For descriptions of these, see config-top.h.
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
 	append-cppflags \
 		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
@@ -217,13 +202,9 @@ src_configure() {
 		-DSSH_SOURCE_BASHRC \
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf+=( --disable-nls )
 
-	if is_release ; then
+	if (( PLEVEL >= 0 )); then
 		# Historically, we always used the builtin readline, but since
 		# our handling of SONAME upgrades has gotten much more stable
 		# in the PM (and the readline ebuild itself preserves the old
@@ -237,17 +218,15 @@ src_configure() {
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
 	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
 		export ac_cv_func_dl{close,open,sym}=no \
 			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
 
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
 	fi
 
 	# bug #444070
@@ -257,20 +236,37 @@ src_configure() {
 }
 
 src_compile() {
-	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
-	# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
-	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
 
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
 
 	# Build Bash and run its tests to generate profiles.
-	if use pgo ; then
+	if (( ${#pgo_generate_flags[@]} )); then
 		# Used in test suite.
-		unset A
+		unset -v A
 
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
 
 		if tc-is-clang; then
 			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
@@ -278,14 +274,14 @@ src_compile() {
 
 		# Rebuild Bash using the profiling data we just generated.
 		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
 	fi
 }
 
 src_test() {
 	# Used in test suite.
-	unset A
+	unset -v A
 
 	default
 }
@@ -305,7 +301,7 @@ src_install() {
 	}
 
 	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
@@ -317,51 +313,34 @@ src_install() {
 	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
 	done
 
-	local sed_args=(
-		-e 's:#GNU#@::'
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
 
 		insinto /usr/include/bash-plugins
 		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
 	fi
 
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
 				else
-					dodoc ${f}
+					dodoc "${f}"
 				fi
 			done
 		done
 	fi
 
-	# Install bash_builtins.1 and rbash.1
+	# Install bash_builtins.1 and rbash.1.
 	emake -C doc DESTDIR="${D}" install_builtins
 	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
 	doman "${T}"/rbash.1
@@ -371,26 +350,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
 	fi
 }
 
 pkg_postinst() {
 	local old_ver
 
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
 	fi
 
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]] ; then
+	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
 		return
 	fi
 
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 036e48751a1f..5c1278219ddb 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -6,86 +6,65 @@ EAPI=8
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
-# Uncomment if we have a patchset
+# Uncomment if we have a patchset.
 #GENTOO_PATCH_DEV="sam"
 #GENTOO_PATCH_VER="${PV}"
 
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
 MY_PATCHES=()
 
-is_release() {
-	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
+# Determine the patchlevel.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		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"
 
 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"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
-elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		upstream_url_base="mirror://gnu/bash"
-		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
-			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
 
-			SRC_URI+=" ${patch_url}"
-			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
 
-			# Add in the mirror URL too.
-			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
-			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
 
-			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-		done
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
 
-		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
-	fi
-else
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+	unset -v my_urls my_p my_patch_idx my_patch_ver
 fi
 
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
 fi
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
@@ -94,80 +73,84 @@ DEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	nls? ( virtual/libintl )
 "
-if is_release ; then
+if (( PLEVEL >= 0 )); then
 	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
 fi
 RDEPEND="
 	${DEPEND}
 "
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
 BDEPEND="
 	pgo? ( dev-util/gperf )
 	verify-sig? ( sec-keys/openpgp-keys-chetramey )
 "
 
-# EAPI 8 tries to append it but it doesn't exist here
+# EAPI 8 tries to append it but it doesn't exist here.
 QA_CONFIGURE_OPTIONS="--disable-static"
 
 PATCHES=(
 	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
-	# Patches from Chet sent to bash-bug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
 )
 
 pkg_setup() {
 	# bug #7332
-	if is-flag -malign-double ; then
+	if is-flag -malign-double; then
 		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
 
-	if use bashlogger ; then
+	if use bashlogger; then
 		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
 		ewarn "This will log ALL output you enter into the shell, you have been warned."
 	fi
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
 
-			local patch
-			for patch in "${MY_PATCHES[@]}" ; do
-				verify-sig_verify_detached ${patch}{,.sig}
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
 			done
 		fi
 
-		unpack ${MY_P}.tar.gz
+		unpack "${MY_P}.tar.gz"
 
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
 		fi
 	fi
 }
 
 src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
 
 	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
 	rm tests/run-jobs || die
@@ -177,18 +160,20 @@ src_prepare() {
 }
 
 src_configure() {
+	local -a myconf
+
 	# Upstream only test with Bison and require GNUisms like YYEOF and
 	# YYERRCODE. The former at least may be in POSIX soon:
 	# https://www.austingroupbugs.net/view.php?id=1269.
 	# configure warns on use of non-Bison but doesn't abort. The result
 	# may misbehave at runtime.
-	unset YACC
+	unset -v YACC
 
 	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
 	# upstream to Chet by email.
 	filter-lto
 
-	local myconf=(
+	myconf=(
 		--disable-profiling
 
 		# Force linking with system curses ... the bundled termcap lib
@@ -206,7 +191,7 @@ src_configure() {
 		$(use_with mem-scramble bash-malloc)
 	)
 
-	# For descriptions of these, see config-top.h
+	# For descriptions of these, see config-top.h.
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
 	append-cppflags \
 		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
@@ -217,13 +202,9 @@ src_configure() {
 		-DSSH_SOURCE_BASHRC \
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf+=( --disable-nls )
 
-	if is_release ; then
+	if (( PLEVEL >= 0 )); then
 		# Historically, we always used the builtin readline, but since
 		# our handling of SONAME upgrades has gotten much more stable
 		# in the PM (and the readline ebuild itself preserves the old
@@ -237,17 +218,15 @@ src_configure() {
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
 	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
 		export ac_cv_func_dl{close,open,sym}=no \
 			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
 
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
 	fi
 
 	# bug #444070
@@ -257,20 +236,37 @@ src_configure() {
 }
 
 src_compile() {
-	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
-	# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
-	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
 
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
 
 	# Build Bash and run its tests to generate profiles.
-	if use pgo ; then
+	if (( ${#pgo_generate_flags[@]} )); then
 		# Used in test suite.
-		unset A
+		unset -v A
 
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
 
 		if tc-is-clang; then
 			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
@@ -278,14 +274,14 @@ src_compile() {
 
 		# Rebuild Bash using the profiling data we just generated.
 		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
 	fi
 }
 
 src_test() {
 	# Used in test suite.
-	unset A
+	unset -v A
 
 	default
 }
@@ -295,63 +291,56 @@ src_install() {
 
 	default
 
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
 	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
-	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
 	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/bashrc.d/*.bash
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
 	done
 
-	local sed_args=(
-		-e 's:#GNU#@::'
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
 
 		insinto /usr/include/bash-plugins
 		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
 	fi
 
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
 				else
-					dodoc ${f}
+					dodoc "${f}"
 				fi
 			done
 		done
 	fi
 
-	# Install bash_builtins.1 and rbash.1
+	# Install bash_builtins.1 and rbash.1.
 	emake -C doc DESTDIR="${D}" install_builtins
 	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
 	doman "${T}"/rbash.1
@@ -361,26 +350,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
 	fi
 }
 
 pkg_postinst() {
 	local old_ver
 
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
 	fi
 
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]] ; then
+	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
 		return
 	fi
 
diff --git a/app-shells/bash/files/bashrc-r1 b/app-shells/bash/files/bashrc-r1
index 61202b61f141..6f4631568119 100644
--- a/app-shells/bash/files/bashrc-r1
+++ b/app-shells/bash/files/bashrc-r1
@@ -5,8 +5,14 @@ if [[ $- != *i* ]]; then
 	return
 fi
 
-# Disable completion when the input buffer is empty. Requires readline support.
-shopt -s no_empty_cmd_completion 2>/dev/null
+# A convenient function to determine whether bash has readline support.
+genfun_has_readline() [[ $(shopt -p direxpand 2>/dev/null) ]]
+
+# The following two shell options require for bash to have readline support.
+genfun_has_readline &&
+
+# Disable completion when the input buffer is empty.
+shopt -s no_empty_cmd_completion &&
 
 # Append to HISTFILE rather than overwrite upon exiting, per bug #139609.
 shopt -s histappend
@@ -14,8 +20,13 @@ shopt -s histappend
 # Initialise PROMPT_COMMAND as an array, which is permitted as of bash 5.1.
 PROMPT_COMMAND=()
 
+# Don't let the user influence the order of sourcing for bash 5.3 or greater.
+unset -v GLOBSORT
+
 for _ in /etc/bash/bashrc.d/*; do
 	if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
 		source "$_"
 	fi
 done
+
+unset -f genfun_has_readline
diff --git a/app-shells/bash/files/bashrc.d/10-gentoo-color.bash b/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
index 66afdcaa9557..6192bfaf4394 100644
--- a/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
@@ -14,28 +14,27 @@ elif unset -v COLORTERM; ! gentoo_color=$(tput colors 2>/dev/null); then
 	# and which remain (somewhat) popular. This will rarely happen, so the
 	# list need not be exhaustive.
 	case ${TERM} in
-		*color*     |\
-		*direct*    |\
-		[Ekx]term*  |\
-		alacritty   |\
-		aterm       |\
-		dtterm      |\
-		foot*       |\
-		jfbterm     |\
-		linux       |\
-		mlterm      |\
-		rxvt*       |\
-		screen*     |\
-		st-256color |\
-		tmux*       |\
-		wsvt25*     ) gentoo_color=1
+		*color*    |\
+		*direct*   |\
+		[Ekx]term* |\
+		alacritty  |\
+		aterm      |\
+		dtterm     |\
+		foot*      |\
+		jfbterm    |\
+		linux      |\
+		mlterm     |\
+		rxvt*      |\
+		screen*    |\
+		tmux*      |\
+		wsvt25*    ) gentoo_color=1
 	esac
 elif (( gentoo_color == 16777216 )); then
 	# Truecolor support is available. Advertise it.
 	export COLORTERM=truecolor
 fi
 
-if (( gentoo_color <= 0 )); then
+if (( gentoo_color <= 0 )) || ! genfun_has_readline; then
 	# Define a prompt without color.
 	PS1='\u@\h \w \$ '
 elif (( EUID == 0 )); then
@@ -47,7 +46,7 @@ else
 fi
 
 if (( gentoo_color > 0 )); then
-	# Colorize the output of grep and several coreutils utilities.
+	# Colorize the output of diff(1), grep(1) and a few coreutils utilities.
 	for _ in diff dir grep ls vdir; do
 		alias "$_=$_ --color=auto"
 	done
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 9fe7b4f69c36..72385c10cb7d 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,4 +1,4 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-5.0-1.1.2.tar.bz2 574210 BLAKE2B 6de1cac2cb66022f60ab7f0385361762fedee56c26729f22acb070e24a7bcf317700fb5db314c1592b8f9ccf9f7d07bfc80afd5fc88a753d0ad2954325a7f078 SHA512 32ff6d315e8cf9d59485802d5284fde53fa2d9f40ec238428a479f8a1ed1359e9bea2946b192b78534e7ac835491d5d64d73f536c8dfa93583b4c6d55d4d4545
-EBUILD bashdb-5.0.1.1.2.ebuild 1081 BLAKE2B c0bafeb58dd2bd2054184498eebd6d4ca6a4fc867f5a0ee67ee0322dba3603e211c90e8bc1c76aa47fc8a1988ff0fc1d3f27be451cfe8ef1fab05301c21f222d SHA512 6c4f259252dc1a56870c6b72d18520e2f4149d181bba5abd042459bfe07d3a2204728c3f160722c66c47b5565be5e8873e0ce9a4c262fb31ccdf963209a7236a
+EBUILD bashdb-5.0.1.1.2.ebuild 1094 BLAKE2B 9cd6a55f0bcead36a35628e280263790af566e879291b1abd7aed4a1a58ab1f12906eedeff9b6412459ec07e9fd2f1c6b793694b62059a7a03ed4bf6f759eec1 SHA512 39b26b6ceb6d2728b0d39c1641f1c1bf7a35e5411176aaea163eb01b2741954aff4ff6e9748f2f060f7861784326afd534e266cbc4004e63b1b92c52c0b17637
 MISC metadata.xml 244 BLAKE2B c23abbab2e247161218cc0dc192e9307a9ebc48213c4ce2091ee62160b15a84e7ccdbba84b0059e8b535d00345a4f75bc91acc19583293ffa0c6068ad322d9f7 SHA512 e3052359d186fd6b92658206ff83c39396fdd873c4fec15f8c010068ffd3079bc507c0e9530da1f77e701f45157eb817187e952800c01a2c17cf6ced1c9d9262
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
index 01b050fcc7fb..925af5a823fa 100644
--- a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_P="${PN}-${PV:0:3}-${PV:4}"
 DESCRIPTION="bash source code debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2
+SRC_URI="https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2
 	test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
 
 LICENSE="GPL-2"
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index 392771cf10a9..3cba3869b5ac 100644
--- a/app-shells/bashish/Manifest
+++ b/app-shells/bashish/Manifest
@@ -1,3 +1,3 @@
 DIST bashish-2.2.4.tar.gz 241565 BLAKE2B 06a7f350669afc7f5139bdf0ab620b787c71d729f0a0e73a532fdb4c3c93792a6715b962a71f1004d2937c8f69171a4b73524aec7ca86fe8d1642262b2750060 SHA512 667ad91c71c99b2f0975eaf64ce4c2be1e60ce921e7232842fae62b6fdd9eca073c5941d5fd9b1af0d77dbb08e9ace3e0c43ed113761c2442f99f762ad581d46
-EBUILD bashish-2.2.4.ebuild 356 BLAKE2B 9175e9efb274354677f85532de4c540efc6252cecceac032bf09fa76a5d910b3579e096c0c2d83b42c71a174d828a3f697eda84ea8900310f2282d7f0ed72851 SHA512 5942584ebe7b3112e74287cafba8740158ae378296b1b28b29319f3bde5c20c2715dac2ae6a470a708a44772aee204ba3ba41ada82df13ff214f5b26154f3f2c
+EBUILD bashish-2.2.4.ebuild 369 BLAKE2B 8844bd32fc6026301f10e11ee062d13ac06d76cd524519c05351a3a28d777541586978ab076b4f941641eb234dfca09cbe0b087f073b4cff6c05c8f9ba71f425 SHA512 eceeb531dc25896fcf38b16527ecf34f0aeecd1f158d66fbf482800298c0f289b5ffaca9566f9e00ab81e6d825b94de1c0bac5da62236b8a536417e656846f94
 MISC metadata.xml 245 BLAKE2B cd7efd42387bca0f2cb665130c867ea3e6ed875c6ee7c81cfc594e6a0326266bf3528e8ec0c85e524c3efcaaf46a4a5978ceeb9c21427d48a3f92f7a99ac175b SHA512 2e4e0e254aecd7ac1e6a6a2b06b1d631f0d2129e56338c321033c6e22fcb09f4796b0612f36a3d0a70a08d08245bb0cf01e2cd490b179e7c4c3db41e6b1b2015
diff --git a/app-shells/bashish/bashish-2.2.4.ebuild b/app-shells/bashish/bashish-2.2.4.ebuild
index e10a381bafc5..e97ec99ec2ac 100644
--- a/app-shells/bashish/bashish-2.2.4.ebuild
+++ b/app-shells/bashish/bashish-2.2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Text console theme engine"
 HOMEPAGE="http://bashish.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bashish/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/bashish/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-shells/ccsh/Manifest b/app-shells/ccsh/Manifest
index d8e1d48d294f..f20aaae3acad 100644
--- a/app-shells/ccsh/Manifest
+++ b/app-shells/ccsh/Manifest
@@ -1,3 +1,3 @@
 DIST ccsh-0.0.4.tar.gz 11625 BLAKE2B c8cdc2dc01381f7e2c03292fb2212efce4637ea963aca53041d57045253b617213bca805942a88062d1aac961232b299de084fad43d18f9f7dcf3922a04fb792 SHA512 114c471870a23682ebc6bf1967bb82af55eb8a56abcb3472492d08a39906d9a6476adb619f2b9a6097c4ccf75f9ea266d297e50de39a277aea4eadea15cc06ba
-EBUILD ccsh-0.0.4-r5.ebuild 533 BLAKE2B 33ae2a2c31955fc55e566393604c35a0a6617127def0ebb821da699257b373ea00a0d54e0211dff7387a103889f52a1461739d6bfbc0fb318764e7e8701b242f SHA512 fc4b3191fc83a23e0b0624d9004c9e793443c00e9a51c4a38f71addca6c0364d29c6cb162a45139fb57367f23067cda83f3f7d1f6fdc1469fe2a9f3f342db71d
+EBUILD ccsh-0.0.4-r5.ebuild 546 BLAKE2B 034e5e733396c1bda34a17d5f6214f7ca346ac304708b9aed42a5efc87524271a317cf7881662360309708942488605d09764f3ed8d2492255cebb15d7edcc42 SHA512 20dc906ecd56ffe7bd132ca656327aff1d8bd0a0c7237dd94985304a9dffe1e6284dfef57b2524f9c13a2804a851d5ad886d5abe58a5186da6ed506f79ec7312
 MISC metadata.xml 242 BLAKE2B d3f00a454c71c76550a570d9b93e506e4af1cd47da59bda4a88ab95b6c252c317e51b8de7a80316a6ad7cc3371a9dbba6603d0d5385102d36480832e05437e80 SHA512 f3cc7499369a76a9cf98fc769721a53c0bd4f8a630bea83ff0fd4123cc9fb7588520683e8531e97e30f49fbd296b478263341d35a17e3379e7c823c74aaa98d4
diff --git a/app-shells/ccsh/ccsh-0.0.4-r5.ebuild b/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
index 92438f82af20..bbe29d9c0d20 100644
--- a/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
+++ b/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="UNIX Shell for people already familiar with the C language"
 HOMEPAGE="https://ccsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccsh/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/ccsh/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-shells/heirloom-sh/Manifest b/app-shells/heirloom-sh/Manifest
index 7bd3ba7dd097..1bc964890f1c 100644
--- a/app-shells/heirloom-sh/Manifest
+++ b/app-shells/heirloom-sh/Manifest
@@ -1,4 +1,4 @@
 AUX heirloom-sh-glibc-2.34.patch 354 BLAKE2B 311f48551a12e8bed01ee265976a449c5e6d12b88f3d2a692d91947b8017d2453c47ac0609028c4021a86e61c406bb143abafffadb191552f79dbf1d2f090328 SHA512 94cd1363e6f8b8bd7b9da0acb636c9ad1de6e86814fbc174d0b87d43aa4f63a2b01e26bf4b328615f6b7c6b3df9b2fcbcc2b833c6f4046e00610f63de69f116c
 DIST heirloom-sh-050706.tar.bz2 82725 BLAKE2B e4d3900e542dd6f9dca3cb043b6212ea5d560196cc419c25a8127470156c7af0f4d608107d745bef3357c873f41d0eaa6ae6e766140dc7f8cdbeab187e4ffc60 SHA512 3a0dbec19eb093b6a818910a1b24f2d7328dc785dc12cd0097c37f98e7ac558d31cda8717381d814259bd54f5de12e50cc8d9d617bd4e09c4a903ef63838807f
-EBUILD heirloom-sh-050706-r1.ebuild 704 BLAKE2B 79085ff6eef4444a70f480a40b8b7b5c09eee76e1c74ce615442c20df249620f115aedf90b79347596f680d09ff949978b04a7c7a608c8c27c5298aa6a576c92 SHA512 7aa5d93e77f909967ed8df632b97384ecec53e8406fb8c37857f225f155b83026779f2a62ac100ece8809cbc78184887b063109b0f6104f141a8a25b5eb72c62
+EBUILD heirloom-sh-050706-r1.ebuild 717 BLAKE2B 7eaf614b65e785bdd35f5d1c4b59ea2c7d95c2ac24e64398a30ddf389d74c9e2ee00de5a3bba5fc3813b904d91df19e220a4c09dcbd6a81d860222bfda62c35a SHA512 d44d5f74eb0db9d540947dad179f6dac4f12cd40e0e159232b6a60628a66f91c19145a497278001745ef8d56eeb7d907e9158d7b86a858f897acf17c589be98d
 MISC metadata.xml 326 BLAKE2B 0dfb457fed04d8be93db25e5b16632a9bc690f67f2d7c23dc843dcb2e340973d3371f2143891de81853f313669b5a86efd64abfab3bb811724a21dab4669dbc4 SHA512 33676299467864f7f1a57faf0ef0d385af243a3c313dd40f84adc1cfbf291b83654b170d25600b8ecc303d42a4423e9f35d78450a3542ce7e99c64c56a961920
diff --git a/app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild b/app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild
index a67c4acb2d51..fc3adec709e8 100644
--- a/app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild
+++ b/app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ RESTRICT="test"
 
 DESCRIPTION="Heirloom Bourne Shell, derived from OpenSolaris code SVR4/SVID3"
 HOMEPAGE="http://heirloom.sourceforge.net/sh.html"
-SRC_URI="mirror://sourceforge/heirloom/${P}.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/heirloom/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 4deaf6e60216..aa73eec46fe7 100644
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@@ -6,5 +6,5 @@ AUX squirrelsh-no-strip.patch 903 BLAKE2B cefa3bb32d03e26f9aba808fcdfd9d8c7a7d2c
 AUX squirrelsh-remove-forced-abi.patch 653 BLAKE2B 92710dce7c0375d8a2a5a9cde5300f9d7630a9296e82a2c7b15311f1298615e85a974af9fa77def60ef2a0e966e00decc5e4ac236f6c1e4257f1e4241277c85f SHA512 6e2b43c7ecff32fda8e2655722f97f48a0a92f6fe5e1e3aeb28bc3b5459fccefa3aa4c04aca016001661af229c59982caf7b09209d7004c2dd397493c873cd50
 AUX squirrelsh-rename-LDFLAGS.patch 4981 BLAKE2B 405bf56a8dec4ac1c0e62d3cbdc4c3b6fbcd38b443304607b42f85132e22ebb79211939fa651271db56702b7de5b0f46515f38ea57ed43b048fad14aeee6bb6b SHA512 eb8058878bd23332dd58970caac5121838bd52b7a63249013b305b09a95a1ca5914a526e4d0d052772f32086d1e2237feae56bfc4549987e71a6db60ffff6cd3
 DIST squirrelsh-1.2.7-src.tar.bz2 673462 BLAKE2B a2e6a1e0c3e3c5eeb329ec33596514e09657439723d34069b66b744f525318d237d15e951bf4c8fe364d50091cd8dcb2d25cae837ebdfd5a219c0bab20d1adce SHA512 7db82cad969ba209cae6b2d1c4cf76ba10acbf79c051f4340556ae81dc98d36dfb6f1f6993e9198e5a5254eaaab3fbaca3d01fc547c2f303572060b2093af78a
-EBUILD squirrelsh-1.2.7-r1.ebuild 1317 BLAKE2B 9eaf01883265320f257d8253528e2cdb7b198764936a5c68a09ca95d657b1b91fbb5e38a9265126bcc9c88ad5ccae3b23b784729644e42e6bf1ceb43d0703040 SHA512 f857da270cc1ad3fadf7723d1122c77848ed5ec88446c52d4610b042e8c74429d9c2eacc68c360354a5fc2c273b67b979f5fe50f2cd32714ff8ae281582c3689
+EBUILD squirrelsh-1.2.7-r1.ebuild 1330 BLAKE2B f387fb7a65c3fee2cb404b4b08b9ebe33b35baff52e50612d1d29169b92c9f8e0364810b4f9aaa230b3afb223d9ea1fe7803dd2c0aff0b8cad7e13265f938caa SHA512 d237f684f6ac110b0aa4268895835a79a5422bff6e737800e3c71b4f9d2f8d500fc6cc8fae07f8b4caa170c73541e6acda9c2f1fe9253d62b64afcc045b44f96
 MISC metadata.xml 248 BLAKE2B adbfd1f3d31aac1d9331ecddb0749fd1a9139c28cd880ede04560ee2c8a760de99813b4c867df0a1f9c20a4d5b01f8bacc9e5327c097001d802748a77af8f0a3 SHA512 097dccbb7f6f015abc4741bedf802e2659e864a9aca4d55eaee6cb0664364cac362dbe607b278eddfe052cc9f76a52ea861e6bbfaf967d9bf9e7703358872ada
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild
index d39612f468fd..940022cf1d35 100644
--- a/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
 HOMEPAGE="https://squirrelsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 8fa5d8d774c2..2efda26fc48b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -9,8 +9,8 @@ AUX zsh-5.9-musl-V09datetime-test-fix.patch 641 BLAKE2B 693f3caf1e98ba971d776f1a
 AUX zsh-5.9-relro.patch 2397 BLAKE2B 42dc7f483ad7f586b450fea41a884bd08d6edc5e5abd0ca023845ee00cc307b66bc3890a3b06a0d81f50fe4ece76f547f5efdfbb7813537fe32c0a3ba89ad5ab SHA512 35fdb43f7adf4c579f235beab6c924bc5977c5fef5e9945c86a6b0acef2ae435bbb08ea35bfbe286460c6df5fb26b24b7f8daa8daa288db6a3cad8b1948d329c
 DIST zsh-5.9-doc.tar.xz 3130444 BLAKE2B 96b635b438f8a90bc1f3c15c8a287ab392ba830e975e49b7f1c09d12de44c250dcf33d1d6dc93b58693839af2e57eb5c9d4e874ca08dd82fe876cb5ca26e6508 SHA512 5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860
 DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681ec533ce1039041d0e93143ebd7e0e73a9aed0789e27ca42d58a55f3b6e2c7d89113ab3ee99112dec46d1 SHA512 d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
-EBUILD zsh-5.9-r3.ebuild 6435 BLAKE2B a8f7b2986af71f78382d2885a9166b63cfe67fe144f57407e215ef6eea23552038c81e23392599b96b95f62ab5726f1d2b6595f3045fed3a5acc13d646beb486 SHA512 4281936a4a39508e4293a9e5a5b8714e23aef1b733741e5fa93f101af647444f03b08bbb90a0c4e9420618717bb917b1a978c2bc2f1e2c41e8fc5d80856c7989
-EBUILD zsh-5.9-r4.ebuild 6639 BLAKE2B 9ddb9d9d50dc2c33a5b40a9520935a4be4b323cd5d4d1254509e9f7e1352da718b882cf77ccfb4817cec04c6f7b9249d424ebe41186897f616c9b98e73fb0fec SHA512 504a68c4256702f50f9da8df5e46cce2cfe02978e3ac42500f6c6372f6136fa3d0478e14b6f7bd48da894ecadad4bb8db6c4255d944f69ebe329177f8a396fb0
-EBUILD zsh-5.9-r5.ebuild 6734 BLAKE2B 56ad1485c0dc8f8648150318f3a8d2b964cffbc8ee30009bbf31f13e59080995de156c514452bf2b303ee14e5dc5885061b89817b12e192719b3afd6c25df074 SHA512 23c476a147196ee9379645544a3e6bbca458a49b30be05a6e972d368f4e46ed04d586a1c319c0ac990f64ef3614bdd1efbe820e03c82825fd4906777b354b464
-EBUILD zsh-5.9-r6.ebuild 6726 BLAKE2B b0d2f69ec810ea4ff01012b98fae77f4a8f219ea1dae5cd1ad3b23bb63d58805a037fb8de4f294e1968e36c15bb554f45fbf8efa290c651581509fe0024007f8 SHA512 d9cfa8408f5328c193969c6e519bef553aee667bc110231da23b56ec92ca55ef9a0737afbb7a96abb3a3c7cd5b9e9e4ee22f1378df463ff65ac2b49a97ea527b
+EBUILD zsh-5.9-r3.ebuild 6461 BLAKE2B 848f4889733ad50dbe7b9b5a01e940b82c05a288f1645d2972664cfa1e4f487dcde70e18da67733d5b63ce4156867e87ca46afcb9739b4c120c25174908da238 SHA512 c53e8691d0e163b9ff673b9027b002077e4001b6aa4809c064389ffefdcc56140d32c6e08b229aaf20af9e41354ee07e11b328fe550744b4781a9247c9fbf117
+EBUILD zsh-5.9-r4.ebuild 6665 BLAKE2B 6456b27f90b440d91528c70850fa9188ff89ec0465cbfdbaa4d8cbcd2f0b9ff19eae5760a75d7db17de8a71407a81993a005440cd1834ce00c7a9a2469bfb759 SHA512 fd38838fcdb2e997b168e5c85771717e132798f11f9503bb87cea97e1c8e8972bc507fccbc2869900a50489a36860f093dd71257d7481d2b90d4e9df6dba277e
+EBUILD zsh-5.9-r5.ebuild 6760 BLAKE2B 966d7925065384ac60f34f23ed87e23386da2b99a8e948ca50b85db1a67dd70919ab60c6a3168d178ebccf3fe9af8a5e6d64b1ac2dc1a48e12c448487632fab9 SHA512 3d8ace1afa83e342bb585a73abe4eac2f2f2f3a144e7ac0d953050ea36d459340f2a8cdb21f2c1e1803f5b6989ed3951905d394e8ceebb6536886320b99be31b
+EBUILD zsh-5.9-r6.ebuild 6752 BLAKE2B 56f033bb13af2170a7222cc2dfafcb9655c0e8779252519ae2d5c1db31c2ae06dc2b91d24d1a88fc1838b4b843e88ca2cc4b083d92f0939b74a7befae7d1c912 SHA512 54f72065bbec7b6f7fd136ca91e81a070bf2289f90aeaffa15404ce1e21ca222e84f3cdd0bd5f25d8930337ec46bdf6f2553552a9d7b67981fd61a985fe20a41
 MISC metadata.xml 685 BLAKE2B 4e9a3a03df89f28b2636ce9f08067f499054bfa1439eb76bca27654a823ef2e2af3d0e6fa46f6e64082b0b56661fccaac3a30db98a4d8a4060d5cb90871baa6a SHA512 cae2243e4d9748bd02315cce89d1df07d56f6d1f7d097e3cdf6d324c1fe656a87d03d248461bf17674a786c2acb4ee0b3e0e7cc602a53109de7c111f097f5a09
diff --git a/app-shells/zsh/zsh-5.9-r3.ebuild b/app-shells/zsh/zsh-5.9-r3.ebuild
index b980463b0839..24cfcd8f29e3 100644
--- a/app-shells/zsh/zsh-5.9-r3.ebuild
+++ b/app-shells/zsh/zsh-5.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,10 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
-		mirror://sourceforge/${PN}/${P}.tar.xz
+		https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 		doc? (
 			https://www.zsh.org/pub/${P}-doc.tar.xz
-			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+			https://downloads.sourceforge.net/${PN}/${P}-doc.tar.xz
 		)"
 fi
 
diff --git a/app-shells/zsh/zsh-5.9-r4.ebuild b/app-shells/zsh/zsh-5.9-r4.ebuild
index 6581458b8737..a6c1c113a3cd 100644
--- a/app-shells/zsh/zsh-5.9-r4.ebuild
+++ b/app-shells/zsh/zsh-5.9-r4.ebuild
@@ -9,10 +9,10 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 
 SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 	https://www.zsh.org/pub/old/${P}.tar.xz
-	mirror://sourceforge/${PN}/${P}.tar.xz
+	https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 	doc? (
 		https://www.zsh.org/pub/${P}-doc.tar.xz
-		mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		https://downloads.sourceforge.net/${PN}/${P}-doc.tar.xz
 	)"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
diff --git a/app-shells/zsh/zsh-5.9-r5.ebuild b/app-shells/zsh/zsh-5.9-r5.ebuild
index b9e6c959df35..98e76e13d19a 100644
--- a/app-shells/zsh/zsh-5.9-r5.ebuild
+++ b/app-shells/zsh/zsh-5.9-r5.ebuild
@@ -9,10 +9,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 
 SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 	https://www.zsh.org/pub/old/${P}.tar.xz
-	mirror://sourceforge/${PN}/${P}.tar.xz
+	https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 	doc? (
 		https://www.zsh.org/pub/${P}-doc.tar.xz
-		mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		https://downloads.sourceforge.net/${PN}/${P}-doc.tar.xz
 	)"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
diff --git a/app-shells/zsh/zsh-5.9-r6.ebuild b/app-shells/zsh/zsh-5.9-r6.ebuild
index ae1bfb9b4e17..9663bada88a7 100644
--- a/app-shells/zsh/zsh-5.9-r6.ebuild
+++ b/app-shells/zsh/zsh-5.9-r6.ebuild
@@ -9,10 +9,10 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 
 SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 	https://www.zsh.org/pub/old/${P}.tar.xz
-	mirror://sourceforge/${PN}/${P}.tar.xz
+	https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 	doc? (
 		https://www.zsh.org/pub/${P}-doc.tar.xz
-		mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		https://downloads.sourceforge.net/${PN}/${P}-doc.tar.xz
 	)"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"