From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 22 May 2021 07:31:18 +0100
Subject: gentoo resync : 22.05.2021

---
 app-shells/bash/Manifest               |  23 ++-
 app-shells/bash/bash-2.05b_p13.ebuild  |  26 ++--
 app-shells/bash/bash-3.0_p22.ebuild    |  34 +++--
 app-shells/bash/bash-3.1_p23.ebuild    |  26 ++--
 app-shells/bash/bash-3.2_p57.ebuild    |  28 ++--
 app-shells/bash/bash-4.0_p44.ebuild    |  26 ++--
 app-shells/bash/bash-4.1_p17.ebuild    |  25 ++--
 app-shells/bash/bash-4.2_p53.ebuild    |  22 +--
 app-shells/bash/bash-4.3_p48-r2.ebuild |  33 +++--
 app-shells/bash/bash-4.4_p23-r2.ebuild |  35 +++--
 app-shells/bash/bash-5.0_p18.ebuild    |  39 +++--
 app-shells/bash/bash-5.1_p4.ebuild     | 261 ---------------------------------
 app-shells/bash/bash-5.1_p8.ebuild     |  43 ++++--
 13 files changed, 215 insertions(+), 406 deletions(-)
 delete mode 100644 app-shells/bash/bash-5.1_p4.ebuild

(limited to 'app-shells/bash')

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ab50937a3c94..64a1bc1cfd79 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -403,16 +403,15 @@ DIST bash51-005 2577 BLAKE2B 573dafdff4a0d11cf6c458d6a3c9087b728542000fce5e16266
 DIST bash51-006 1412 BLAKE2B 3b32c69cef9438f66afaad0279627567d6aac32fabbec5af899552427489f2a87b148a3886bc30139647ec4204241c2e77cad83cdae1251176b7ec54699e1445 SHA512 b9b6e3d71f7b7718e2e8598ec8e337dcc675571fb233c29e5230ebf14eab2249204531f2fe8c4d1459c5fed10acb679048588d1e457e98dbc00ffc4d2cd227e3
 DIST bash51-007 2621 BLAKE2B f2802bc7267efe69abecb5c4d0cf5879bb57219e9e972d4c74f86ca88f99ba4dd3d9314beaca9c426351ffe429ddb4a03615776f569bad9962df7c5094d52a28 SHA512 e4ebdc47e780ddc2588ecdfcfe00cb618039c7044e250ab2b836b0735c461ebacd15beaf2145e277c70b7f51cded55bd8dde7757df810f33f8dae306ee5ba571
 DIST bash51-008 1821 BLAKE2B 9820066c99c8ed5f6322fceb2346f8900ac77b6c50c75de39c9ff7472c33f78b054f8bd0493ce7a4b8e17c70456d867aa6791e892246bce64624549a95c3211d SHA512 97f9558a08a66cc9da62c285bf9118b39328e25ed3b9277728e0539b1ac0adef176a090e39cd96dc03d6fd900d8155bd58040cb3390a09f637bab1de8af3faf6
-EBUILD bash-2.05b_p13.ebuild 4549 BLAKE2B a1d8917f1a837628536bf79c37d57130f076a8317bc61f3d594a24cd864282795440e3e5c2819d4c7491054522048cc4ba71f6cd83b65d4c4c3d5a9bc625421f SHA512 f67fb794e132226c93a79e39921ae86c74c88b8b210a7cedf6f2f3b1f8bb93fcd9b56bcc57cde9a3f888b6636816fbebe488760152e56e230b0019c23650dee1
-EBUILD bash-3.0_p22.ebuild 4623 BLAKE2B 7ef511efe3fdf36b5fe2481f2714427cb1c445c5b3bd51ea804f176074552acf536140463c57c2fd6dbeae2bd0626bd1610e40309988b61ccb48c160ea5fc00c SHA512 e877c108bf6a8044be5325b870db792a600a755a1d93debe6f0f7075ac7976fac8513640e196fec2b0e9d065ab91880bddff273dc564cc244a4dc83c63b1be1d
-EBUILD bash-3.1_p23.ebuild 4366 BLAKE2B edc4fae3b55e7357b022d16f52fb73f3b8bcc667fab09360a63233f48ba54f37e05e3f71cb092b33c58bc31e4334ff2e2156471d3f40892f5754598f902604cb SHA512 bb6516e0e2e1fb777606c1686ae91409961dafb177e13ae4e94ab0fa04db15fef2f6dac9130a486683a6fd456551fb4d0524158a6fc39afb173efd87af9d0be6
-EBUILD bash-3.2_p57.ebuild 4459 BLAKE2B 23363f764816350120875d743e118e893333202e784c095ce2af763b1c460d28737a81d0dd03d9b180b2bdb05a00fe17c44790942de76d6a12ddd2354d75d7a0 SHA512 3ede03a4a34a0c524bc0784f553e32a0781cc1b681c370014459c714403dbf0b0de47356b08defee2e579d8b8b879e3e3043147ea980258d6d7cc4b56002539f
-EBUILD bash-4.0_p44.ebuild 4375 BLAKE2B a7975e0db29fd4dd3686a5e61d0826fb2e7fe18516f308d9d73c5d610449841c9d6de7e7c1869c456072cfb6db74461a9453eee3d27b630d82491d3215d48af0 SHA512 48a083d5f57e1f1c5f2f2aa3602a8b1345623b50da054fe419adbe4cd5790de0fa2b9cf8b9579a056fe534d463b72039acd42defc9191b888bbb29d611600d41
-EBUILD bash-4.1_p17.ebuild 4130 BLAKE2B 23a5ffd5341fb638f405976f37a405f321c9fed27f842f72249bc474ff8fec93ebddb816405808a13b275f488e607655c0f9e47aafe4ec3f464dc5fa91699679 SHA512 d77a8dde63af54d7a032b6a95acfdab1ed588b50a0994173d345e848222e47a00099a1195b59d00f9d13b1fc836d69f097ae45dcb464aab73fb6d04a87784a83
-EBUILD bash-4.2_p53.ebuild 4313 BLAKE2B 39e2d061565c6ecff359b71591e8aabd2dbb4821f6fa8c7938ac557f6fb7472e5387210457e22240c99c788caee40f8612a06f9366b55b7438806745d1e805c6 SHA512 0e81222bce3031774cbbf380899521764c8571c39d78e13a83591d735cd0b6add6072eae8f908eaa323a9ad4a8830848ce2484486b7060fb8ab2b172c2827510
-EBUILD bash-4.3_p48-r2.ebuild 5597 BLAKE2B 280ad021ee5107cddf1511c24199a925208bdc8d9afa1408bd89994c9cb52c7c7fab8f31076307fb6b70a10fcc30f39735992dbda8616cd1e3dac59cdf8663af SHA512 445928a50f4dc6e18f778066d6d5e4f2cd1e9647de1c43e6b3b89b562596cf24a277eb01f325dced549efb97a479c43d6a32a49d6e5c6cf4bead1782cbda4136
-EBUILD bash-4.4_p23-r2.ebuild 5676 BLAKE2B 8dbdfdc76c2d844f119556d7dc7690e86788d46823ed1e5bbd31546eaf9ad03d5cbc83f771b3d56342a4acf843e513f54171161c042430dcfe6b3e44c26912c9 SHA512 bfd35296355f83e92d633024ec756422ee5a74b6a6a2a3750a6d56a9a65465af2dd4aa73713ba0d4500066a1e6a4adcf175e174fd4d427414f8cb6ee989e0ac5
-EBUILD bash-5.0_p18.ebuild 7285 BLAKE2B 0f98107fb95b4e2e7e3d25ea13b1154f5aaef35167243fc9fb86ab078ddcbfcc0cff859d5732d61db02b855cf0fc3372cff65ad66fe62042861dd7d728e9b6e6 SHA512 1cd8cf6afbb1e4c8f3ab9be21b7d4e9cd949b22bfc5f6eb507d1185266dfb10192900d293dd082b8a72766f4488a4444e3d86d829fdbc1b04b1416e27b50ea09
-EBUILD bash-5.1_p4.ebuild 7275 BLAKE2B 017818d2a5347f8daaea32470f3d365de2359c7c65ae6d361f119a7805353bccb4d539f0f414975050ea0169b7591ed993e7a313b3271fed03340f2cc2e5bd51 SHA512 94131f52fffa504048e85be4f3ad6cec37242c363717edd9a400825dea59e8d4fb3083d7286ea0dc876c5c44751db8ec545f37d7e4dd8b03eb76bfdd982fc6f1
-EBUILD bash-5.1_p8.ebuild 7275 BLAKE2B 017818d2a5347f8daaea32470f3d365de2359c7c65ae6d361f119a7805353bccb4d539f0f414975050ea0169b7591ed993e7a313b3271fed03340f2cc2e5bd51 SHA512 94131f52fffa504048e85be4f3ad6cec37242c363717edd9a400825dea59e8d4fb3083d7286ea0dc876c5c44751db8ec545f37d7e4dd8b03eb76bfdd982fc6f1
+EBUILD bash-2.05b_p13.ebuild 4601 BLAKE2B dd5c081b218d969026ab192cb9f295b39830c164b2fc91d8bcd22143f917dfb9bc3a35a6de666563b1d83f658ba443ee58e818563554fe412272b6e4624a9a2b SHA512 65f3c824802a0b515d3e0834f5a5e3982074536389711fa68de71996cc5094284a5431b4d58d0c0758b634ac1f8d0c5dabf3768127cc1186241834af8d65d645
+EBUILD bash-3.0_p22.ebuild 4673 BLAKE2B e5eeb7d1c397954a1167a42f2f882acc062cf9402b3db2f8210082dc66534f119e962b4b916fa05d6b98a1973daa9fc3bfc72d289ca9aa4028374afce3158bf1 SHA512 f7e3bb3a7945c6df97eda66577eb7bbec63f438376799feded831dc8d5494ddea4d0ef3d7808b8645920efd94fdee5e9a22d4b779bf223768a9cc99901759314
+EBUILD bash-3.1_p23.ebuild 4416 BLAKE2B aad2ca16c61480523627b10111ead6e7cbb7bba83f315bc548e948767a343220375ff72b79c42a0f7891d22fb776bd0aeac2fd48ad1edb16e263aa1cadd12790 SHA512 06ddf406ed4dcf08462257c157449d016c8f64bb79d7bdf60dca7f5359987b3c3edc38f302db031b669eec493a6397e77d2362999a1529b6becd46be09f4b437
+EBUILD bash-3.2_p57.ebuild 4515 BLAKE2B 0594aa067efb2eb92ddf3bc929a939869adbdf5d9f362fe0db6c640a3d1b4531ad0a86e214341d46eeb0e0960311d9f553724d5eccbe9c5c91cb86f778a440e1 SHA512 df3197bf7273eb9df7c41a282fcf90bd407b7ffc8516f0b074dfc689ca240bf53fa7a2978e29c12d98db93176cbe917f5ebca1619d733109a955846a3d1aac0e
+EBUILD bash-4.0_p44.ebuild 4425 BLAKE2B 92d1fd560721fdcef6f8d8cac08adc579a3c36b14cce976d2a6eff5feb94051262895994871e17ee68349040b5f6cc285b1777e3741005fe059830c3d6e52dc7 SHA512 8750036c48800afb6680db8ecf1d94ebc8f11faecf4695286a0746f64dd5ef4447d6aff0d1070f68139af15ae6254643381a0cd29b30f087aacf832227328e4d
+EBUILD bash-4.1_p17.ebuild 4157 BLAKE2B 3b13dc7bd1b9b7934a94b9de3d772c815619a43b94d56e8f99e45c081e8979db40a8f641c020c268265e292f28f9b38ba587d934bdf79f61a4dff5f5fa44aafc SHA512 657155a6a270a2dbd7db54a70a5a8c8cbcdc0d64a75960e4f2e78368e4e5dffdd759030f83a495ab1603db5682da6041e2733caacd80c662fb1a6bf775d0902c
+EBUILD bash-4.2_p53.ebuild 4345 BLAKE2B 4a872160fef38f2eb94a625060a637c2e66e01b8f4ea287ccc56bb2eb11f8cbf22fe263172d777c9f0f823ab9d943a3f9aeef11f22fbc330d382b35d715d8141 SHA512 bda1694d2c6d40b9a81ccc785d0efd9df7aa2aaabc4189e9a6df4ad48de8b937fd2551f2b73d176f11206a3e6ad2f095af332bd833757a18f041f79dd0465895
+EBUILD bash-4.3_p48-r2.ebuild 5624 BLAKE2B 4d4056a9a6ee1b0602f106caf0798820953f4d2d0e7bcf6f54923e1edebedb6ea24ccb3dcbb42b3229967e08e162fa89253ae2a03fd7cbe0829ac315616a1681 SHA512 c74853e84737bcc4fbf745e0c49d77d156e69106b2b66fd67885b16cfdb3e59ab84648b03cdf35274402d89a725b79f0da83fe4ab16f9c17a7938da45853692d
+EBUILD bash-4.4_p23-r2.ebuild 5709 BLAKE2B 533de68a81792479a0da8e18a7700d5b29f78370ebaaf582069cfc21177c4cf94754afa5328ec2ee4dbd3807db37cb5e01f40d28d10ffd71e3c62c8f81a62d2d SHA512 d8fe7e91ccf16f972a91263d485d299b5cf79f7676f18f6027d9f808961a3647e6db6b978c7617658b185cc89ebd70de7c25dba318a27ed21bb1310881da0a8c
+EBUILD bash-5.0_p18.ebuild 7319 BLAKE2B f20e7209dca32a56d9b902e856b20cfdba4791c570c06645b7d7f9e15feed3647ae2051d99517ec4b9a0dbc1d81cd05f3a97677b463232e0ade85178601b3662 SHA512 278c0991ae73334c38b03c2881efb63332df74b72cdac7870c2971a878977ec5a52402429f311998fca9aea0d6033c904293266175560bc2081f60032e0e90d1
+EBUILD bash-5.1_p8.ebuild 7301 BLAKE2B 9e90df138be295655467fec50b1f0fd4691f01d631bc007691fd9b252ab1d667a3eabcc0118f333a6e38589f436a407b09f9ec58e8b0c614ea5a320e6de7aa80 SHA512 e9e74d77b59470efb1238b2f40e085766fd7fe78c6332adb62afb5c0c99ab161b25b77491ec7d03dc370a2be1d3ab996fa804651a5e8ec26ba04d4a291f72efd
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index cdacaa870073..5d27c8bf42fa 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -47,18 +47,19 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.05b-destdir.patch
-	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/autoconf-mktime-2.53.patch # bug #220040
 	"${FILESDIR}"/${PN}-2.05b-protos.patch
 	"${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
-	"${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-2.05b-rbash.patch # bug #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
 	"${FILESDIR}"/${PN}-2.05b-jobs.patch
 	"${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -84,7 +85,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -121,16 +128,13 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	# This old autoconf script does not re-exec itself properly and fails when
 	# /bin/sh is not bash.  Rather than try to regen everything, just force the
 	# use of bash directly.
-	CONFIG_SHELL="/bin/bash" econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index 9cb8f4f7c86e..1b23a376b371 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -46,22 +46,25 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/autoconf-mktime-2.53.patch
 	"${FILESDIR}"/${PN}-3.0-protos.patch
-	"${FILESDIR}"/${PN}-3.0-rbash.patch #26854
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	"${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
-	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
+	"${FILESDIR}"/${PN}-3.0-rbash.patch # bug #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${FILESDIR}"/${PN}-3.0-darwin-conn.patch # bug #79124
+
+	# Read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
 	"${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
-	"${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
+
+	"${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch # bug #87093
 	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
+	"${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch # bug #92349
 	"${FILESDIR}"/${PN}-3.0-strnlen.patch
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -87,7 +90,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -124,12 +133,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 1b7c72acdbfd..dc0a34675c7b 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -46,19 +46,20 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/autoconf-mktime-2.53.patch # bug #220040
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
 	"${FILESDIR}"/${PN}-3.1-protos.patch
 	"${FILESDIR}"/${PN}-3.1-ulimit.patch
 	"${FILESDIR}"/${PN}-3.0-read-memleak.patch
 	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
-	"${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+	"${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch # bug #118257
+	"${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch # bug #131875
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -84,7 +85,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -121,12 +128,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index be7420d869e7..b1de2bcaee50 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -46,21 +46,22 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.59.patch #220040
+	"${FILESDIR}"/autoconf-mktime-2.59.patch # bug #220040
 	"${FILESDIR}"/${PN}-3.2-loadables.patch
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
 	"${FILESDIR}"/${PN}-3.2-protos.patch
-	"${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
-	"${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-3.2-session-leader.patch # bug #231775
+	"${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch # bug #211947
 	"${FILESDIR}"/${PN}-3.2-process-subst.patch
 	"${FILESDIR}"/${PN}-3.2-ulimit.patch
 	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
-	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+	"${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch # bug #131875
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -86,7 +87,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -123,12 +130,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 2814366f9f94..c66b53fb1d0c 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -46,18 +46,19 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-configure.patch #304901
+	"${FILESDIR}"/${PN}-4.0-configure.patch # bug #304901
 	"${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
 
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	"${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch # bug #211947
 	"${FILESDIR}"/${PN}-4.0-negative-return.patch
-	"${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+	"${FILESDIR}"/${PN}-4.0-parallel-build.patch # bug #267613
 	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -80,13 +81,19 @@ src_prepare() {
 	default
 
 	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
-	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in || die #267613
+	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in || die # bug #267613
 }
 
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -120,12 +127,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index da915e1f0dd5..7ae8ac6934df 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -46,14 +46,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
+	"${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #bug #303411
 
 	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #bug #431850
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -81,7 +82,16 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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
+
+		# bug #335896
+		--without-lispdir
+
 		$(use_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -92,8 +102,6 @@ src_configure() {
 		$(use_enable readline bang-history)
 	)
 
-	myconf+=( --without-lispdir ) #335896
-
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
 	append-cppflags \
@@ -117,12 +125,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 30c860c3ff58..44b74704aa85 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -42,21 +42,22 @@ LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
-# we only need yacc when the .y files get patched (bash42-005)
+# We only need yacc when the .y files get patched (bash42-005)
 BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
+	"${FILESDIR}"/${PN}-4.2-execute-job-control.patch # bug #383237
 	"${FILESDIR}"/${PN}-4.2-parallel-build.patch
 	"${FILESDIR}"/${PN}-4.2-no-readline.patch
-	"${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
+	"${FILESDIR}"/${PN}-4.2-read-retry.patch # bug #447810
 	"${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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"
@@ -86,7 +87,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--with-installed-readline=.
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -120,12 +127,9 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=6.2
 
-	# 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 :(.
+	# bug #444070
+	tc-export AR
 
-	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 14f08b6aed1d..d013a6fda2ae 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
@@ -45,24 +45,26 @@ DEPEND=">=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	!<sys-apps/portage-2.1.6.7_p1"
-# we only need yacc when the .y files get patched (bash42-005)
+# We only need yacc when the .y files get patched (bash42-005)
 BDEPEND="virtual/yacc"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
 	"${FILESDIR}"/${PN}-4.3-arrayfunc.patch
 	"${FILESDIR}"/${PN}-4.3-protos.patch
-	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
+	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch # bug #600174
 )
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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."
@@ -84,7 +86,7 @@ src_prepare() {
 		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 	fi
 
-	# Avoid regenerating docs after patches #407985
+	# Avoid regenerating docs after patches, bug #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/* || die
 
@@ -95,7 +97,13 @@ src_configure() {
 	local myconf=(
 		--docdir='$(datarootdir)'/doc/${PF}
 		--htmldir='$(docdir)/html'
+
+		# 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_with afs)
 		$(use_enable net net-redirections)
 		--disable-profiling
@@ -119,7 +127,7 @@ src_configure() {
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
 	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
+	# 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 )
@@ -133,28 +141,27 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER}
 
-	# 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 :(.
-
 	if [[ ${PV} != *_rc* ]] ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins; then
+	if use plugins ; then
 		append-ldflags -Wl,-rpath,/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
-	tc-export AR #444070
+
+	# bug #444070
+	tc-export AR
+
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 3badc1359f27..d7671fb9e0cb 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
@@ -57,17 +57,19 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-# we only need yacc when the .y files get patched (bash42-005)
+# We only need yacc when the .y files get patched (bash42-005)
 #BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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."
@@ -82,8 +84,8 @@ src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
-	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
-	eapply "${FILESDIR}/${PN}-4.4-set-SHOBJ_STATUS.patch" #644720
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" # bug #644720
+	eapply "${FILESDIR}/${PN}-4.4-set-SHOBJ_STATUS.patch" # bug #644720
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
@@ -95,7 +97,7 @@ src_prepare() {
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches #407985
+	# Avoid regenerating docs after patches, bug #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/* || die
 
@@ -105,7 +107,13 @@ src_prepare() {
 src_configure() {
 	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)
@@ -127,7 +135,7 @@ src_configure() {
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
 	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
+	# 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 )
@@ -141,28 +149,27 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER%%_*}
 
-	# 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 :(.
-
 	if is_release ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins; then
+	if use plugins ; then
 		append-ldflags -Wl,-rpath,/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
-	tc-export AR #444070
+
+	# bug #444070
+	tc-export AR
+
 	econf "${myconf[@]}"
 }
 
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 80582cbf2ae4..3ea29fe66b10 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
@@ -57,7 +57,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-# we only need yacc when the .y files get patched (bash42-005)
+# We only need yacc when the .y files get patched (bash42-005)
 #BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
@@ -69,11 +69,13 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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."
@@ -98,7 +100,7 @@ src_prepare() {
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches #407985
+	# Avoid regenerating docs after patches, bug #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/* || die
 
@@ -109,7 +111,13 @@ src_prepare() {
 src_configure() {
 	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)
@@ -131,7 +139,7 @@ src_configure() {
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
 	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
+	# 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 )
@@ -145,28 +153,27 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER%%_*}
 
-	# 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 :(.
-
 	if is_release ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins; then
+	if use plugins ; then
 		append-ldflags -Wl,-rpath,/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
-	tc-export AR #444070
+
+	# bug #444070
+	tc-export AR
+
 	econf "${myconf[@]}"
 }
 
@@ -190,7 +197,9 @@ src_install() {
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
 	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
 	keepdir /etc/bash/bashrc.d
+
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
@@ -200,12 +209,15 @@ src_install() {
 		-e "s:#${USERLAND}#@::"
 		-e '/#@/d'
 	)
+
 	if ! use readline ; then
-		sed_args+=( #432338
+		# 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 \
@@ -214,6 +226,7 @@ src_install() {
 	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
diff --git a/app-shells/bash/bash-5.1_p4.ebuild b/app-shells/bash/bash-5.1_p4.ebuild
deleted file mode 100644
index d3193239c760..000000000000
--- a/app-shells/bash/bash-5.1_p4.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 yacc when the .y files get patched (bash42-005)
-#BDEPEND="virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		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() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# 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 #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-		--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%%_*}
-
-	# 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 :(.
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/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
-	tc-export AR #444070
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-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
-
-	doman doc/*.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
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp="${T}"/sh
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild
index d3193239c760..a8f2880bece7 100644
--- a/app-shells/bash/bash-5.1_p8.ebuild
+++ b/app-shells/bash/bash-5.1_p8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
@@ -47,7 +47,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
@@ -58,7 +58,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-# we only need yacc when the .y files get patched (bash42-005)
+# We only need yacc when the .y files get patched (bash42-005)
 #BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
@@ -69,11 +69,13 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if is-flag -malign-double ; then #7332
+	# 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."
@@ -98,7 +100,7 @@ src_prepare() {
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 
-	# Avoid regenerating docs after patches #407985
+	# Avoid regenerating docs after patches, bug #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/* || die
 
@@ -109,7 +111,13 @@ src_prepare() {
 src_configure() {
 	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)
@@ -131,7 +139,7 @@ src_configure() {
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 
 	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
+	# 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 )
@@ -145,28 +153,27 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER%%_*}
 
-	# 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 :(.
-
 	if is_release ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi
 
-	if use plugins; then
+	if use plugins ; then
 		append-ldflags -Wl,-rpath,/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
-	tc-export AR #444070
+
+	# bug #444070
+	tc-export AR
+
 	econf "${myconf[@]}"
 }
 
@@ -190,7 +197,9 @@ src_install() {
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
 	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
 	keepdir /etc/bash/bashrc.d
+
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
@@ -200,12 +209,15 @@ src_install() {
 		-e "s:#${USERLAND}#@::"
 		-e '/#@/d'
 	)
+
 	if ! use readline ; then
-		sed_args+=( #432338
+		# 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 \
@@ -214,6 +226,7 @@ src_install() {
 	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
@@ -244,7 +257,7 @@ pkg_preinst() {
 	fi
 
 	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# Rewrite the symlink to ensure that its mtime changes. Having /bin/sh
 		# missing even temporarily causes a fatal error with paludis.
 		local target=$(readlink "${EROOT}"/bin/sh)
 		local tmp="${T}"/sh
-- 
cgit v1.2.3