commit:     b607b26fff6dd73d886f2dc0afc1cf439510e509
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 03:09:30 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 03:10:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b607b26f

sys-apps/baselayout: don't prune /usr/local/sbin from PATH on merged-usr

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../baselayout/{baselayout-2.8-r2.ebuild => baselayout-2.8-r3.ebuild}    | 1 -
 sys-apps/baselayout/baselayout-9999.ebuild                               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.8-r2.ebuild 
b/sys-apps/baselayout/baselayout-2.8-r3.ebuild
similarity index 99%
rename from sys-apps/baselayout/baselayout-2.8-r2.ebuild
rename to sys-apps/baselayout/baselayout-2.8-r3.ebuild
index c6296f1a6f94..b7fc36bdb833 100644
--- a/sys-apps/baselayout/baselayout-2.8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.8-r3.ebuild
@@ -218,7 +218,6 @@ src_prepare() {
        # don't want symlinked directories in PATH on systems with usr-merge
        if ! use split-usr && ! use prefix-guest; then
                sed \
-                       -e 's|/usr/local/sbin:||g' \
                        -e 's|:/usr/sbin:|:|g' \
                        -e 's|:/sbin:|:|g' \
                        -e 's|:/bin:|:|g' \

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild 
b/sys-apps/baselayout/baselayout-9999.ebuild
index c6296f1a6f94..b7fc36bdb833 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -218,7 +218,6 @@ src_prepare() {
        # don't want symlinked directories in PATH on systems with usr-merge
        if ! use split-usr && ! use prefix-guest; then
                sed \
-                       -e 's|/usr/local/sbin:||g' \
                        -e 's|:/usr/sbin:|:|g' \
                        -e 's|:/sbin:|:|g' \
                        -e 's|:/bin:|:|g' \

Reply via email to