gentoo auto-resync : 28:04:2024 - 23:59:44

7 files changed, 58 insertions, 26 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index b59d7b758a2f..8a03a50466cf 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 76c143e5258d..d88843c8ecd3 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -8,8 +8,8 @@ AUX bash-5.2_p26-memory-leaks.patch 4357 BLAKE2B 1b9f08054b28fa0e73b7b3d4da2674e
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3494 BLAKE2B e9379c18fca85666cd347d1d8cf5c9859c5865ad7a3ded1ac5724bad6117924231e89dcc21f1a80931591e9a39c1acc3f7be8b2afe38986ea34b3b8fc12f5814 SHA512 a8fa416ab9265055e778fad3e4190ab5f57da0823c12d60a915bb77ba701fe93df8d16e041dd5747ed9db899a2516451b803db648aed0f85f0abb6d98c9414b8
 AUX bashrc-r1 535 BLAKE2B bac05d534c76162950cc6f5046496ef634773ab768f6dc71e4387d2138426fcc06b52b93553db8f51f575bd8aecaf07f353ae7951aa9bb917babb5a58d729ae6 SHA512 cee0680dc31a1f9048ddb0dd41fea808403f17d319a115539486290e14abb359dd461f91963f63fb2c2b6315576baaac999b2e40fe7b33aeb0561b4695b4b9c8
-AUX bashrc.d/10-gentoo-color.bash 2087 BLAKE2B 05c5fafacd862f9d2da1deab9cebc09bd2855103b5693d85bc92b13003d6ce1de183cdfd0e06c4b8102f7ab3e7ad0bda5a825d257e99f98a8a66b901d646ceb2 SHA512 89ee045c258489cffcfcf8ea19aeced957edfddcae6b5e94c6f57e07210e6695c9f8939dae7e0e32a5498deae040c80ab894ce1f80ee4a4a2dad3e47a5289fa7
-AUX bashrc.d/10-gentoo-title.bash 2062 BLAKE2B 8ccb72bb2a898db367a3c26da00ceb94d0a65b42b983bff19a793a7031d63f1f803e40d370c6aa289e2992b1ab812dbab41906c3f1cfaf9060bb6852d4585952 SHA512 75f7a37e8558d8b72632d0405cee68f13a01bbd4f82c983ac04b7515b6e470c108b6c01b01f25f974fba8b4c82a0e9d4d18d55b7da3877190345476c94714e40
+AUX bashrc.d/10-gentoo-color.bash 2106 BLAKE2B 8b0e8c83aade201ea6f06e7e5a2f090d05aaefc133f964909292b45dd923a960518fa46ed00eeba7baa4638e33fdb08a56d7e2bf196016fff26e7ab4a5f8a5f2 SHA512 5f91451e2da7567a4576ddeceb24da49d834f8a2647759b400392dd3adb9ec97eba0639b92c121ce08c524de729298b3ac211f150a6335010cbc6dbaa91c0163
+AUX bashrc.d/10-gentoo-title.bash 2080 BLAKE2B cb2a116efcebab6f8be38d747ade40382824483af55543455e490a69e339a0f528eeab383df29a05dd269cc011cdfd7da65ac9a2cd8382c9d7f77c37c0f0b8d1 SHA512 a687b895e65011eaf8a04da3284a3ee056265efc5604c478e1b8ab6e84cf5e22583eb7a0e39a9e7525dfbc1d0f04f3bb6c5acbee93fe870774c1c0e1253feee7
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
@@ -454,9 +454,9 @@ EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d252454
 EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae
 EBUILD bash-5.1_p16-r6.ebuild 8848 BLAKE2B 994e869b63c30c5a02c61a9f6f0a25137bba2582187163e0b72ecfcf46aa439527516c6e6b503b289dc8b78a3d5353c57d719c997a8587cf758d57e8f9241a98 SHA512 0fdf7410c8ac01ccd0c7638ca50365b734e99fe41056576101fe8ef0f27714e9f39a296ad97342289331730eb988e693b0dba56dc279c0d259758434d178a2a1
 EBUILD bash-5.1_p16-r7.ebuild 8910 BLAKE2B 433123c1a486162fc2b04513ff112d6b063cf9c2dcf133563ce86bd876a922ec5efd829c096829f13e00e6fcf40608654a7206402a4bc17538ac1d66ee5e510b SHA512 fa4a8cf4b9fb32407f9ae1e5a9ccfeaa28ee6f946dcd62d2ffca80a54e11b83a08412879c3affffb7a684430848e7dfbf9b847da943a1431e5f463fbbb8d3801
-EBUILD bash-5.1_p16-r8.ebuild 10022 BLAKE2B b0355d509dee82c19b6f8c7361f022608b835e50e9f415da91f42b3c3dd52ad780192e4b72a292553df5b63cf70315aee13ee081987cf6bfd7d8bb2af4abb165 SHA512 594fd22cab7864f5ce3fbb55d7615432f7f1b4d7cdc142e59ae2f8f9ed190a1f4d0f6cfdfbcf49b61afb26ea77163a8a1b87fae95cf8280169aee51e4d1def9d
-EBUILD bash-5.2_p26-r1.ebuild 11882 BLAKE2B e3cbc8d0c8a6e54b8a9da113fb81713cb06ed38a64175ed0dc50cdad4fb04e844847e967b22603c36a6096e5570bc6f792b13769938404845fc63bee269feaad SHA512 cd2bb29f3b3e27cf89863f17b26c10a00f0added9d4c277e2c1e24ebda46230a4f17ee2fbceb6c10a181803cffa0c7cb2b44c1ab4cc2335f3e1fbd1f9183cf22
+EBUILD bash-5.1_p16-r9.ebuild 10331 BLAKE2B 680864358c70a5831202cef8b4733bfc66c05d7dca38b1666c43edc0f9daccab8a9823cc920bd427caf40c49261a2c1cb3fe028216f497dcf7e32ebc9f9026e7 SHA512 a8c7ecb8a406e482bf51f22324476ef74a49d32df5cc2ded28b70c17a351119edfd69fcae3e98c95855988a106ba4527ce2263b97f1af309b6e9d19a5409efd4
+EBUILD bash-5.2_p26-r2.ebuild 12191 BLAKE2B 58cb030b75bd82f677526dbe5452ead67e9bd1b3a96ea0b5d20f796027daed04887243a848259a929541cc90c806cf502501b6218c444d6530d605a9f0dc53b1 SHA512 a06e3f052d0e545543cb3f7b1a9ab64a5c1e250aeca1814919555501cfed5f20c9c9fedb2681f0fd0d38f112983dcab659093e1f02857dfddb0d3ec645572482
 EBUILD bash-5.2_p26.ebuild 10770 BLAKE2B 051adeaa0222babb768474508b47932dfca26f3600f1adb640e60b1839efc36fe8c327eee0e9de8183d6e8a7e980bf1db2d71ea47d6b9f158dcfd24ebb2a6e55 SHA512 013dfc231bde39ae25ed2bb94faa2b04eb9f8234234e4492ef091edb33a64ad0471e162d3d15dc98eb155f32cc0330a596e9efd7f0066eaf8585d421fd730c64
-EBUILD bash-5.3_alpha.ebuild 11748 BLAKE2B b4bc34087a54f5f76e1118fa68896157b8a4c57936418de913d408ba3f8eb7e539f20444855501092f76b877045bb454a0d20100be56cc2354b77c75040adc94 SHA512 e2cdb0204e62447af33df206603d65fe55cf8d33964e2ff16668488702857ee44373da96c8cd5ea52b6b0ed92974505f2b72dc1bd28be2a09d1ca9e823377fdd
+EBUILD bash-5.3_alpha-r1.ebuild 12057 BLAKE2B f3c85c8e131f0ee16011e79be5f6c7b6f55fe055f4f5a86e894c90cd55e7212ed6298fe3e56dbf23c4542bb67d95c5e3130167b7f0e171ca892e1b2aaa24af8c SHA512 93cb1723e0fa56c9a33e79795ae1fc1bf2ea7fd62b957ed330973221274aa5deedb2b15df47a0e6af9ea7139ad7561458b8cb358c9e0a3be8313b7b95367143a
 EBUILD bash-9999.ebuild 11748 BLAKE2B b4bc34087a54f5f76e1118fa68896157b8a4c57936418de913d408ba3f8eb7e539f20444855501092f76b877045bb454a0d20100be56cc2354b77c75040adc94 SHA512 e2cdb0204e62447af33df206603d65fe55cf8d33964e2ff16668488702857ee44373da96c8cd5ea52b6b0ed92974505f2b72dc1bd28be2a09d1ca9e823377fdd
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r8.ebuild b/app-shells/bash/bash-5.1_p16-r9.ebuild
index 41b73878797e..fefec1f7e54d 100644
--- a/app-shells/bash/bash-5.1_p16-r8.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r9.ebuild
@@ -249,16 +249,26 @@ src_install() {
 
 	default
 
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
 	dodir /bin
 	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
-	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
 	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/bashrc.d/*.bash
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
diff --git a/app-shells/bash/bash-5.2_p26-r1.ebuild b/app-shells/bash/bash-5.2_p26-r2.ebuild
index 0e803fa5048c..64cfa30c6113 100644
--- a/app-shells/bash/bash-5.2_p26-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r2.ebuild
@@ -296,16 +296,26 @@ src_install() {
 
 	default
 
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
 	dodir /bin
 	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
-	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
 	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/bashrc.d/*.bash
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
diff --git a/app-shells/bash/bash-5.3_alpha.ebuild b/app-shells/bash/bash-5.3_alpha-r1.ebuild
index 036e48751a1f..9b535f0e39eb 100644
--- a/app-shells/bash/bash-5.3_alpha.ebuild
+++ b/app-shells/bash/bash-5.3_alpha-r1.ebuild
@@ -295,16 +295,26 @@ src_install() {
 
 	default
 
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
 	dodir /bin
 	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
-	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
 	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/bashrc.d/*.bash
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
 
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
diff --git a/app-shells/bash/files/bashrc.d/10-gentoo-color.bash b/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
index 5a6df5690c08..66afdcaa9557 100644
--- a/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
@@ -14,20 +14,21 @@ elif unset -v COLORTERM; ! gentoo_color=$(tput colors 2>/dev/null); then
 	# and which remain (somewhat) popular. This will rarely happen, so the
 	# list need not be exhaustive.
 	case ${TERM} in
-		*color*    |\
-		*direct*   |\
-		[Ekx]term* |\
-		alacritty  |\
-		aterm      |\
-		dtterm     |\
-		foot*      |\
-		jfbterm    |\
-		linux      |\
-		mlterm     |\
-		rxvt*      |\
-		screen*    |\
-		tmux*      |\
-		wsvt25*    ) gentoo_color=1
+		*color*     |\
+		*direct*    |\
+		[Ekx]term*  |\
+		alacritty   |\
+		aterm       |\
+		dtterm      |\
+		foot*       |\
+		jfbterm     |\
+		linux       |\
+		mlterm      |\
+		rxvt*       |\
+		screen*     |\
+		st-256color |\
+		tmux*       |\
+		wsvt25*     ) gentoo_color=1
 	esac
 elif (( gentoo_color == 16777216 )); then
 	# Truecolor support is available. Advertise it.
@@ -47,7 +48,7 @@ fi
 
 if (( gentoo_color > 0 )); then
 	# Colorize the output of grep and several coreutils utilities.
-	for _ in diff dir egrep fgrep grep ls vdir; do
+	for _ in diff dir grep ls vdir; do
 		alias "$_=$_ --color=auto"
 	done
 
diff --git a/app-shells/bash/files/bashrc.d/10-gentoo-title.bash b/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
index 56afcf213045..1fbf17c26327 100644
--- a/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
@@ -45,6 +45,7 @@ case ${TERM} in
 	foot*         |\
 	rxvt-unicode* |\
 	screen*       |\
+	st-256color   |\
 	tmux*         |\
 	xterm*        )
 		genfun_set_win_title() {