[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/

[Sam James]

commit:     30d19b883b320cd72c8ea6ca73ac6f14bdc38106
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Tue May  6 18:05:35 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  7 14:51:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d19b88

app-shells/bash: have 20250430, 20250504 and 9999 use the latest bashrc.d 
drop-ins

This sets the stage for eliminating 10-gentoo-color-r1.bash from FILESDIR.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{bash-5.3_rc1_p20250430.ebuild => bash-5.3_rc1_p20250430-r1.ebuild} | 2 +-
 .../{bash-5.3_rc1_p20250504.ebuild => bash-5.3_rc1_p20250504-r1.ebuild} | 2 +-
 app-shells/bash/bash-9999.ebuild                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/bash/bash-5.3_rc1_p20250430.ebuild 
b/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.3_rc1_p20250430.ebuild
rename to app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
index a71d009bc5db..638ab9434adf 100644
--- a/app-shells/bash/bash-5.3_rc1_p20250430.ebuild
+++ b/app-shells/bash/bash-5.3_rc1_p20250430-r1.ebuild
@@ -318,7 +318,7 @@ src_install() {
        my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
        insinto /etc/bash/bashrc.d
-       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r1.bash 
| newins - 10-gentoo-color.bash
+       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r2.bash 
| newins - 10-gentoo-color.bash
        newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r2.bash 
10-gentoo-title.bash
        if [[ ! ${EPREFIX} ]]; then
                doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash

diff --git a/app-shells/bash/bash-5.3_rc1_p20250504.ebuild 
b/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
similarity index 99%
rename from app-shells/bash/bash-5.3_rc1_p20250504.ebuild
rename to app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
index 36988a5bab4d..62a7031a0d27 100644
--- a/app-shells/bash/bash-5.3_rc1_p20250504.ebuild
+++ b/app-shells/bash/bash-5.3_rc1_p20250504-r1.ebuild
@@ -318,7 +318,7 @@ src_install() {
        my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
        insinto /etc/bash/bashrc.d
-       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r1.bash 
| newins - 10-gentoo-color.bash
+       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r2.bash 
| newins - 10-gentoo-color.bash
        newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r2.bash 
10-gentoo-title.bash
        if [[ ! ${EPREFIX} ]]; then
                doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash

diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 48dc6faddf97..6216b7884332 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -315,7 +315,7 @@ src_install() {
        my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
 
        insinto /etc/bash/bashrc.d
-       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r1.bash 
| newins - 10-gentoo-color.bash
+       my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r2.bash 
| newins - 10-gentoo-color.bash
        newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r2.bash 
10-gentoo-title.bash
        if [[ ! ${EPREFIX} ]]; then
                doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash