10 files changed, 435 insertions, 12 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ec1d24529fe3..b13fe675b62b 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 2f0d70158d72..f3ab0daafd64 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -41,6 +41,7 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42 SHA512 52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
 DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589 SHA512 c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
+DIST bash-5.3_alpha_p20240628-5e28a1813ce7d08628c8df584ea36515091c6d9b.tar.xz 8528432 BLAKE2B d920640b0ba0ae38dbb98b48a9e4dd6635a05d7f86fcf26a4f2c79f6a4338e4f25ff20119f9a1df451d23d9cc381862963dcf9c135050102e8159eccbe5f7314 SHA512 cc60f94083b378ac51fda973f834f10477ac6ebcfc682f934426db3fd6ca4506e5ed1c64311c67d5d9d70b62ab2bf9900ee66f1aa96a7bce7198d69edf9131ca
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -457,5 +458,6 @@ EBUILD bash-5.1_p16-r13.ebuild 10298 BLAKE2B b3b7bc3a466859b81e86b2201de8cdb4860
 EBUILD bash-5.1_p16-r6.ebuild 8999 BLAKE2B e9208661767c61fbd9b06a61111db58908897bdb2d722b7ccbe5d79cd6d2e2543b6c1c89688e62f51ecdb36f107e74727dc6985396a20d8db8682c9036a6db7d SHA512 3fa9c420bbbc154569eb2a9ebb96681b4f10bb6cdbec43608d171f1d9c46a169d7f6cf8b3f419ff395ebe5dee852fa8c46ccd74c10ee9f0f10a6a281da679f5d
 EBUILD bash-5.2_p26-r6.ebuild 11693 BLAKE2B 7c95bd57481d0cc1c1765b1369178367e1fda1fea39da0e4bec48cd17a2feb21718551bc6b8750807c2f74d885e07eb337a3f11e4d9775dd4eba95191aa3ce51 SHA512 df4385c766d6db4183db901f363389c5ac6dbff09e131743db2439942b2fb43440b2a50e77233b5980509d02139eabd91a9083746cfd268eaf42a205ffdc9c30
 EBUILD bash-5.3_alpha-r5.ebuild 11566 BLAKE2B ab99c9907fce433ca5f21140c311b693ecdf4e2bb5356e16d3dc13c986f6f32284f7121b07a17340fdf2890ac8108e6c3dab0bcb3446f66447f741fd5e50c342 SHA512 8706a6346161c7a3159593f9bfcae1bb16c08f22bff648b6580f33708246f3eee2f7f3cd97eca8fd315b7b8f7daf22fcd4b7814e536a9c34d211738cccd36918
-EBUILD bash-9999.ebuild 11516 BLAKE2B 2aede2b5d922fa6113da3f2d2dc372787374ffcdfa3ecb4803bc32e81ae96fd70a2349eb6708846011b9e555e3b7e94dfb97077d68ed0b1629df5992df98a90b SHA512 dc358a2f67639624483331d7883ebf5aa3320bf29a3ceb70464b61f768229be7cef68043b996e60385c8a853b1c1692d5da02a53e5a45765e2cde60fc9869ac8
+EBUILD bash-5.3_alpha_p20240628.ebuild 12127 BLAKE2B 06c2d0c5d44ff9d765e6cf636cdd6540d43750aa81b8111f85a90314a370a206c9f085ce3395e6e59a5b5a70bc5d9e6045614a8002aa8bfe5b618bc027f487a4 SHA512 f8b3d0fbdab8311fae6c8a51290844b2d93f618b43ab951f89bd64d217961005c81b5499da8cbb901dff2d17172c8bcc351d6a966cd804783f190e0b7db09acc
+EBUILD bash-9999.ebuild 12127 BLAKE2B 06c2d0c5d44ff9d765e6cf636cdd6540d43750aa81b8111f85a90314a370a206c9f085ce3395e6e59a5b5a70bc5d9e6045614a8002aa8bfe5b618bc027f487a4 SHA512 f8b3d0fbdab8311fae6c8a51290844b2d93f618b43ab951f89bd64d217961005c81b5499da8cbb901dff2d17172c8bcc351d6a966cd804783f190e0b7db09acc
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.3_alpha_p20240628.ebuild b/app-shells/bash/bash-5.3_alpha_p20240628.ebuild
new file mode 100644
index 000000000000..cbe731019ccf
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240628.ebuild
@@ -0,0 +1,411 @@
+# 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.
+case ${PV} in
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	*)
+		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
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+	# It can be useful to have snapshots in the pre-release period once
+	# the first alpha is out, as various bugs get reported and fixed from
+	# the alpha, and the next pre-release is usually quite far away.
+	#
+	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
+	BASH_COMMIT="5e28a1813ce7d08628c8df584ea36515091c6d9b"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	S=${WORKDIR}/${PN}-${BASH_COMMIT}
+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} )"
+	S=${WORKDIR}/${MY_P}
+
+	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
+
+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 pgo +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="
+	pgo? ( dev-util/gperf )
+	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"
+)
+
+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
+	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+		default
+	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
+
+	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
+	rm tests/run-jobs || 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
+
+	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
+	# upstream to Chet by email.
+	filter-lto
+
+	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() {
+	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
+
+	# Build Bash and run its tests to generate profiles.
+	if (( ${#pgo_generate_flags[@]} )); then
+		# Used in test suite.
+		unset -v A
+
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
+		fi
+
+		# 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
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset -v A
+
+	default
+}
+
+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
+	if [[ ! ${EPREFIX} ]]; then
+		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
+	fi
+
+	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-r6"; then
+		return
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
+		return
+	fi
+
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, this array may contain a command
+to set the terminal's window title. Those already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash manipulate the window title in the case
+that the terminal is controlled by sshd(8), unless screen or tmux are in use.
+Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
+a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
+}
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 7ef121e1c56f..cbe731019ccf 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -17,13 +17,13 @@ MY_PATCHES=()
 
 # 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
 		;;
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
 	*)
 		PLEVEL=0
 esac
@@ -39,6 +39,15 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+	# It can be useful to have snapshots in the pre-release period once
+	# the first alpha is out, as various bugs get reported and fixed from
+	# the alpha, and the next pre-release is usually quite far away.
+	#
+	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
+	BASH_COMMIT="5e28a1813ce7d08628c8df584ea36515091c6d9b"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	S=${WORKDIR}/${PN}-${BASH_COMMIT}
 else
 	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
 
@@ -52,6 +61,7 @@ else
 	done
 
 	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+	S=${WORKDIR}/${MY_P}
 
 	unset -v my_urls my_p my_patch_idx my_patch_ver
 fi
@@ -60,8 +70,6 @@ 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
@@ -114,6 +122,8 @@ src_unpack() {
 
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
+	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+		default
 	else
 		if use verify-sig; then
 			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 72385c10cb7d..fc43f4822066 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 1094 BLAKE2B 9cd6a55f0bcead36a35628e280263790af566e879291b1abd7aed4a1a58ab1f12906eedeff9b6412459ec07e9fd2f1c6b793694b62059a7a03ed4bf6f759eec1 SHA512 39b26b6ceb6d2728b0d39c1641f1c1bf7a35e5411176aaea163eb01b2741954aff4ff6e9748f2f060f7861784326afd534e266cbc4004e63b1b92c52c0b17637
+EBUILD bashdb-5.0.1.1.2.ebuild 1070 BLAKE2B 44d18df6f661b4e44ac2e430e802d458ecc2d79589b33051b473c69875a323dbe0626ced7b22273db3f1770a9b86d770a16367eccdc7683351bfb9a9b5dffcf3 SHA512 6e7a98fc01d65cb2c546b0389f64dcef46cca129dc8a20ff2c999624ea4a9e5e6ccc75f1c33b0455386f9497e4390b887c1170f627e62b3f0aa91df62b56e5bc
 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 925af5a823fa..d73f4c54fbbd 100644
--- a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
@@ -7,7 +7,7 @@ MY_P="${PN}-${PV:0:3}-${PV:4}"
 DESCRIPTION="bash source code debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/"
 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 )"
+	test? ( mirror://gentoo/30/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index b98f5910c6dd..84fece9596bb 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -5,6 +5,6 @@ DIST fzf-0.52.1.tar.gz 274817 BLAKE2B a42e694ab3a34025ecee5343e8eeb43221f66989fe
 DIST fzf-0.53.0-deps.tar.xz 5882848 BLAKE2B b7faec7c2afd60642c27afa6f3c7a99fc1409d73c7d95f2f79737af3034769cef97aab11b5054f0209430d4ab038b5663e0af71e1768f674f815c7cd7dc08c66 SHA512 862e3bf23647735b888861898fd041e1d3e3dc6dcc7197b382fe790323d4904fc95fd20168d76656655e8c02ffd3cb0ee60da8df72689a94252a293f567ad5b6
 DIST fzf-0.53.0.tar.gz 286797 BLAKE2B f6355c168f2b587cc2d0b21ef483812db7e077e4bf19517a4fc8fed43dd6b3f557ce1a28630075b4f1e6238aacf02ce10ceb1afd4d7fe5ca6e2453c132c56d80 SHA512 4122b49e8fec936ec4da79cdb7a7ed1891caadf842008ae36aac5ce0aa1c2263bed68fa0332f2cb4f2b38551469af0f14874410407b922827e62767032e92393
 EBUILD fzf-0.51.0.ebuild 1973 BLAKE2B 0ed04f173792943f5896e4b2891cfee9e7652a654e6226b35ff80fc85a60adbd118fcdef54cbec407d3b5301c5156a6e559ba25a7d6bf52fd8939fedb72e5292 SHA512 db05e2b339e31c16d7ec3e4f5552d0ddd4dbac141396917754031747a91e949c062ad481eb682ad7922c0177787c30c60fd553ef7ac2ebed72a346bf984ff8a6
-EBUILD fzf-0.52.1.ebuild 1976 BLAKE2B ba93dab453075a3d08ce3ce11d7cec3ac3377305a7ff7de1165b359db9d03114aa227d05a012c464ecfad7876bebb404e79e3d1007dd92e827ba2517f2f966e4 SHA512 e39e8cccbec100da4bebc38d9312ce0201af9244bd6cd745623133dc2ae714896db0f183233392ca35ddac497958c34fa1ddd80bf1593fc2d74d9ba9a493537a
+EBUILD fzf-0.52.1.ebuild 1974 BLAKE2B a360fcaac1ecc9daa41b28b92d007e00815d902f453fbb3ab5d82031c951c4ad3f179a5f953b77ec50e1b4698e2701cfa08cb07cf3c809a57d97a906c54ac2e2 SHA512 28b1a5375392d1898cd5b5433e57e77675bc414d0aa650fd256c5623c69a4c848dbcd6e7eb81cbd485fb897a2af32f94067ec51276020f2b0f1efdf54930d481
 EBUILD fzf-0.53.0.ebuild 1976 BLAKE2B ba93dab453075a3d08ce3ce11d7cec3ac3377305a7ff7de1165b359db9d03114aa227d05a012c464ecfad7876bebb404e79e3d1007dd92e827ba2517f2f966e4 SHA512 e39e8cccbec100da4bebc38d9312ce0201af9244bd6cd745623133dc2ae714896db0f183233392ca35ddac497958c34fa1ddd80bf1593fc2d74d9ba9a493537a
 MISC metadata.xml 245 BLAKE2B 09740ccf075e53d0d7f0a31addb391335518828e2c889718899491764305e6fef814d1ff7f1228d4b3c2b3b18470873d3c71338154a833d3a7d13280c393a879 SHA512 4de0cd558c25997c8473254016ddf6371da40c183b7ff0d7ad873135e12f52f8de12c40dc6ee03aa1fc2e44898fa050c9730e76f7960d908a5fa6645a66a7679
diff --git a/app-shells/fzf/fzf-0.52.1.ebuild b/app-shells/fzf/fzf-0.52.1.ebuild
index 29107a6ca464..344014ebbe84 100644
--- a/app-shells/fzf/fzf-0.52.1.ebuild
+++ b/app-shells/fzf/fzf-0.52.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
 
 LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index 68adcc2f64ec..575d0fc84ccf 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-syntax-highlighting-0.7.1.tar.gz 133554 BLAKE2B cd55a0ad69670b25edc4bfa78ad76d1e2ef501deeca3e93adbef0aca305896722b4906d7717be3ad61bc0cf6b6496e217626406e5ff4168ece4b75bffd94bbf0 SHA512 e7e86b88cdac9b9ed5f973823ba8efff99dd720b9ed929f765f9f9266b9d6e147274f5957ceb630d51a660e396fc22e97f10cfbc5cdde941b907f3773bb1ea2b
 DIST zsh-syntax-highlighting-0.8.0.tar.gz 155914 BLAKE2B bdb95dc825514e2c0ced2a33133967089fdbd851e00874f68497cd5daae2010f5335fb173569f5af6aea65f4e23744076c420ebc957b7bdba325fcec573d3805 SHA512 58593c8bf3fa1476ecf0fceb1fc4eab986a778de657d359a28fe48798e787896fbf2588441c69b017a08227ab44dd46473afb16e0f125aae59cc58004bfa8c2e
 EBUILD zsh-syntax-highlighting-0.7.1.ebuild 1018 BLAKE2B 279a334ffdfcdef463dc27c13ed5afca44fe4d2d7a1a242ddde7938647b66573d0f42058bed9e22700e78df689603b5b1afa3e7924603427600aeed5aef4bd9a SHA512 bee2209b751da5b355cfa81fb195bf10b505cf295351cd7b14bf042514e1b804c9437839a23900be66c1c63d6809a7980a68b28d6ed605314e43b5e96ac69d18
-EBUILD zsh-syntax-highlighting-0.8.0.ebuild 1024 BLAKE2B 5ac156c722b27dc8193549e46b1fa640e6a3445bc8918262b70a6ccc7bdf7e6ab8f447ae04fc73c94209b6cb94160b080b701f4fdd40db3da99001d78ff6c40c SHA512 a2d8a1c7dbb8c77e6bf06f0be938f64d1d9c23d9938e53d43d7fb61e4ad941b6868c052c6c1227019c9be535717f4ae6448a4451f04c025374c459ffa52d015b
+EBUILD zsh-syntax-highlighting-0.8.0.ebuild 1022 BLAKE2B 20b3f49072e700ce0e0128e8cc4948cbd1ffce326cc76701c1062e708ef358defc34cd495a91e4bd7d95e5196ef01c6286509ba1a7b52659120ed1e1c37f539b SHA512 937d9fb66cac697905060393c93baae4f1f80877f8fb250b68afedb36a2009acdca8c8b051b31c134441c848611889a06936f98b76007d11367498e8cf9a8691
 EBUILD zsh-syntax-highlighting-9999.ebuild 1024 BLAKE2B 5ac156c722b27dc8193549e46b1fa640e6a3445bc8918262b70a6ccc7bdf7e6ab8f447ae04fc73c94209b6cb94160b080b701f4fdd40db3da99001d78ff6c40c SHA512 a2d8a1c7dbb8c77e6bf06f0be938f64d1d9c23d9938e53d43d7fb61e4ad941b6868c052c6c1227019c9be535717f4ae6448a4451f04c025374c459ffa52d015b
 MISC metadata.xml 809 BLAKE2B 650c47118a2d670a3ad61d294e3d95a674d564064d53cf0ec962d665447c91787822ed218d039ee199b65aa39308494757aaeda24e99d132a5a0d96c745e27fd SHA512 28f3c2358a09c5f40a13a264884a9e52ec8adf3b5b45b643ac73c627a02035dff24badf6e4442828fdf836f5adeab4bed7171f7ad6701ab534fa4d79e8de0374
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0.ebuild
index 0b1f5c2efd49..33fbe3d0710d 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
 else
 	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="Fish shell like syntax highlighting for zsh"