7 files changed, 412 insertions, 85 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7b933a8aa765..f3c4ab903235 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ef0ffea2f50b..6773270aad2c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -43,6 +43,7 @@ DIST bash-5.3-beta.tar.gz 10667630 BLAKE2B d6d3a1efd5ed69b131e2831e35c4a62096813
 DIST bash-5.3-beta.tar.gz.sig 94 BLAKE2B a4b85d5755e200abddd5669c3d21b1ee6be8036b27934e25473c14b15ffc1bc7cbbd5a94f39a0dc6bf6050908590509f0ba39d28c33947154cc966e11d454c8c SHA512 72184ca2afe3d0c8c2165516499a61da2aecc0c8c83661cab0038c3d849623115729d2ade73c4b5973ea9b5e8169af4bc2aea51f0b70356af26342285adab2f5
 DIST bash-5.3_beta_p20250212-c3ca11424d2ae66cafa2f931b008dfb728e209a5.tar.gz 15731015 BLAKE2B a2409a10d4ee849ba3589a7eb988b99dacf888933d0d05eddda6f4ed44ddffead761d5530c49d732b158cc818569671c9cf5129b617ccf45f9b9e86659d6d1fd SHA512 166e52bfae6c07f6791c11cd80924419f7c4bbd841bfc69565b2ab298d5179ebc4c639c1dd0491136f10e686f9080c6f23b601e8225fe0dc8b633c7f79977c82
 DIST bash-5.3_beta_p20250224-e608233770b0ba5fe20cb46842992b64f7252383.tar.gz 15744147 BLAKE2B 8c9497c8dc0feefe93bac7351973fc6b2663c75d7ee9e7f6ef44687f84c1c2081fe11685c9535cd0d3185c8d3f37180234f5103483e8dedbcd34b86462ec4bac SHA512 e6aadfcb9ab18a7ba2d2d67d04adef3e7bf2ce72091c222b45267ea26e5fd31ab58cdd574c4f8ebb1e6dee60fe8c4912732bb5a4ac5d8b85d255b50e60ef43dd
+DIST bash-5.3_beta_p20250307-c3997d51f8ba359eeabb45b90b9cdae4fe599b5a.tar.gz 15761772 BLAKE2B c87d4cac04e910bd9f7441b349233c92c53cfa3e74356c3ffc18d236313f8e9d1c7b49ffaa7435aee8b1ef4ce216a74f2ffe5564e30d448d8ce77895df5a2f75 SHA512 b5802f900a081880ae4f3c799bdf98d4bcc70661921d27ab403dcc4acbececc834ffdb3c02d1ea7d24736e122f6a3e9286a1306c3962c8daef94606e8f999c3c
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -482,5 +483,6 @@ EBUILD bash-5.2_p37.ebuild 11864 BLAKE2B fbc51a614a3cd31d434e578600c4b4183520e00
 EBUILD bash-5.3_beta.ebuild 12151 BLAKE2B 5cf02450b8bce041d6f302c2c16b5c722595eafc6db3a2ca1e71828fc13024ec5a43c66112edf885668c64dc4ad4b5806586105d202d6da81374077c1ee54934 SHA512 601a3ed600d8ee0c5be161e8f092083e922c2c85f9e9bedc92ffb15e71aeaae699db6657fa88db3471d781820951bf1b618e2ed511fb832d713975eff1a20913
 EBUILD bash-5.3_beta_p20250212.ebuild 12356 BLAKE2B 491a4cdffebc96282514f8e9c85d716135562d4e2d6bd4273cc8ec22516c37117c17ba8c23b50e5c9653ab7058a423b48502699a3720a5f137f9ace1f93eb42a SHA512 08fa617e2db043d46912ffad181e373235b0a81820f5d7d84928717d4d9f2df0898a6fe11894951ee33596046863fe0e4a77e50ea1cdba2fa9a9f4aae846ed9c
 EBUILD bash-5.3_beta_p20250224.ebuild 12243 BLAKE2B 798413badfe2f1c71de6f71be7b2c2869ec39e1a62d67a002df5cb3b5088bc932b0e5c0a3f9a6f5af14f7fb815c498ef775a1a4a5f149e3cbfe6e4846edcf326 SHA512 444c7ec1164b701211367ad61fd3b5bf81631421a98da9dd572404a06febd6f445475e20f3e5dd951a6ca2e1579297d71e9b1a26f88d6a934ef504d632574e1c
+EBUILD bash-5.3_beta_p20250307.ebuild 12243 BLAKE2B ef6ac03cba8dea0a2ce49a083cf0062c93307c16dfc9d63c81260c93823429e34190c417db92dd5e65d4e93292be479d779ff8b2f7a7e562f32e8e6a44fe6e70 SHA512 41903336d9d4db541d221ef12f6d8114c1815a50ce671b80a8697bcc84f0247cd46d505b1638045382216459ee5db2b89ca54f42a10121c9a93f21321758bb51
 EBUILD bash-9999.ebuild 12038 BLAKE2B f9460ae9aed945ed02ea4e7e53f5ea9e74d5acd466694fdd204aa59e71271eef04d44ea56a5373cb4049dd8fdc00fec2faced0173d15285ee22aaa903956b147 SHA512 37876e786d586618050f0b9d64445478202dd4bf729114052195b525ce2bb495dfe33149262a1c5637ce8ed5ba5e2107761ad16dd9e8fe3362722fcd0e7c6dcc
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.3_beta_p20250307.ebuild b/app-shells/bash/bash-5.3_beta_p20250307.ebuild
new file mode 100644
index 000000000000..1b010d24a08b
--- /dev/null
+++ b/app-shells/bash/bash-5.3_beta_p20250307.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2025 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="c3997d51f8ba359eeabb45b90b9cdae4fe599b5a"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
+	S=${WORKDIR}/${PN}-${BASH_COMMIT}
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
+
+	# 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 ~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
+
+	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
+
+	# builtins/evalstring.c needs y.tab.h but can't (easily) specify the dep on it from above
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" y.tab.h
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
+
+	# 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[*]}" y.tab.h
+		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
+	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 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-r8"; then
+		return
+	fi
+
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files 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, it may contain a command to set
+the terminal's window title. Those who were 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 set the window title in the case
+that the terminal is controlled by sshd(8), unless screen is launched on the
+remote side or the terminal reliably supports saving and restoring the title
+(as alacritty, foot and tmux do). Those wanting for the title to be set
+regardless 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/hstr/Manifest b/app-shells/hstr/Manifest
index d9c6050e74be..5de194fd1223 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,6 +1,4 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2493 BLAKE2B 32e198aea7efd9416526feaf85e06029f05ec26aa982ceaacbb7f505ff8a4e7995a8222a3f033ca270b9f09ecf0465b56f9c3ec5b15dd202fa26e0f7e011062d SHA512 3c43179ce88a35599d44c60af5f4287383c0612eace067f2097e26bb2ab6d05573e8486ae83b9d1f6d222a65fb4466c64c4d0a34b15cce8bef4b75af0ec0b7ab
-DIST hstr-2.2.tar.gz 1246786 BLAKE2B f14091fea391dada79798c957b0b1094aff73b7ab4f8d9fd53c1070924556a7ff59f6f5a2e49b36dcd46ca6f93c5f8cd0fcfef07d5f7458d4bbe021546ccdc7a SHA512 c133edaa63a2be76356c08e52303d4133b11803e3ac6f915566a8d1b4651991b14d43974618061b2fc98c49e21b650ff6b9ac8168512e76566e327f90a550e4a
 DIST hstr-2.6.tar.gz 1249557 BLAKE2B 147ec4a0db98444bce2e9abcd0d6105dc777b52848d831b9df13ad1d897e372b891de1cb3fd2b43c4f046144214903f6d391955ad9699017805538377d5786dc SHA512 5b9a6f2ce1914dad2f245148e5b8e10d98abc7e5830118686693790a6d8a3e4c1acaea7b9ed3841467e43f2a3ee34d6d4a114c116a049595178fef2272ed8f54
-EBUILD hstr-2.2-r1.ebuild 703 BLAKE2B 218054027f539c1e36210cf32788cacc3fc5e9b3f5961d7ac64f3c26b10faef223e19e34d7b4a4059bab2960593e77402cef401f6c8c211c205364bf9a5d45c2 SHA512 3972c456e737bade36e91e7770ae2620701dd7d58681da0c7c46ede8919eb6b2cfe4dfe6f7951a8890f8886e666259fedf2e1d4bc12504747ca52832abd15d67
 EBUILD hstr-2.6.ebuild 703 BLAKE2B db75404d487c1b417b0b29e260e1f2caf15fdcfe9e6d453bffaaf0d0bfabbe428fd0b45d06793c596d746a67425a23aa37ea4d43bde830cf49e7e757b23b4f29 SHA512 756e8ba1b2fcb1c3f8ac3edcc14e81cd759c6d498439982f136c6272f8c3bf447700a7999232e08d2c20be7917c4ab8b1d168d7f326017b7f00002269f85ea13
 MISC metadata.xml 342 BLAKE2B b7c8a2588c2a0bf55ede19dce406c6d757c2653855f3b7892bff46b4656f526169c062d0fb0b5402fd13be99d758628249f28937cdeef2c6caed8ba951fb4647 SHA512 732c863030e0edd9b00813223013de836655908b6400b7af660c88e3f2eedd91c67395b12cb200662ec118d5f6cbcd1db13bc53391b96e79a8deae641d29836b
diff --git a/app-shells/hstr/hstr-2.2-r1.ebuild b/app-shells/hstr/hstr-2.2-r1.ebuild
deleted file mode 100644
index ced186d9d6b4..000000000000
--- a/app-shells/hstr/hstr-2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)]"
-
-DEPEND="
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-fix-ncurses-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-
-	tc-export PKG_CONFIG
-
-	eautoreconf
-}
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 7824d65af58c..6ca5252d9424 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,5 +1,3 @@
-DIST loksh-7.5.tar.xz 212104 BLAKE2B c5897860ca9ce7614921e890ec2ba6f464f600df9410082256e7b4cb53c15fbacb2f46fb8eada77910c19a260338f8e2fb55e3b324c96ab82e44f502859769a2 SHA512 9aee8219a4d63d06c95df2347611a04664ec344c2cb4c3d5d14bdea6b9cabc424246b0e070c901b4a5e38f5784b2c43f5c3c78b01f74cbdce46eded6fda043db
 DIST loksh-7.6.tar.xz 212080 BLAKE2B 845fbda4b0ff17c432a6ab2b506ad02bc2f9a36873d20ba3ab7b4bf5eeff6609f61c0223f9d18933314bca22b45c02313cdab6cb69bed73227918516b8be186a SHA512 c03a298e93bff3c689591a9864eeb5daa661b6b0b783102a271f7ebb08297a4939d8c923233fc23892b83c86d7102f9ae022f4b4d3fdf33e095e86690014fb24
-EBUILD loksh-7.5.ebuild 727 BLAKE2B 0deac3e8979718ebd4d0483eb0100a214f36494a397899349287891fa506a9520ef4d5576494539749322b29de5ee1c1cc1051aa2cfcb2c2209db633af6de712 SHA512 fd067713bf670a9ee284f4d13fd233e73fc24fa655775be15515cbb87376ae593a3a29e4d1494bf3c386b1b455b0cf5bb5353f9be15f668da13173869d160a17
 EBUILD loksh-7.6.ebuild 727 BLAKE2B 0deac3e8979718ebd4d0483eb0100a214f36494a397899349287891fa506a9520ef4d5576494539749322b29de5ee1c1cc1051aa2cfcb2c2209db633af6de712 SHA512 fd067713bf670a9ee284f4d13fd233e73fc24fa655775be15515cbb87376ae593a3a29e4d1494bf3c386b1b455b0cf5bb5353f9be15f668da13173869d160a17
 MISC metadata.xml 393 BLAKE2B f13c9b5bd5fb387fd3bc7997fc2582e8c4aab50f12d8d8f869d00d15cf25eb42ebb3119ecfe20613c21761c8644a2910c4b4412e83ded7237b8183a461580e9c SHA512 760ce11686f921dd27bb9463c072d4ba6984efd59a0e93aca693cd3fd542376cefd41189c19b93f9ff33524e3faf6ecc36f3af673bcafe0166fe1936422a74e0
diff --git a/app-shells/loksh/loksh-7.5.ebuild b/app-shells/loksh/loksh-7.5.ebuild
deleted file mode 100644
index 125286a698b0..000000000000
--- a/app-shells/loksh/loksh-7.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/dimkr/${PN}.git"
-else
-	SRC_URI="https://github.com/dimkr/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-
-DEPEND="
-	sys-libs/ncurses
-"
-RDEPEND="
-	${DEPEND}
-	!app-shells/ksh
-"
-
-src_prepare() {
-	default
-
-	sed -i "/install_dir/s@loksh@${PF}@" ./meson.build || die
-}
-
-src_configure() {
-	# we want it as /bin/ksh
-	meson_src_configure --bindir=../bin
-}