commit:     2334eb2d0b76ee113e0bf438c6e719a90c95b235
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Thu Feb  8 07:39:02 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 17:36:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2334eb2d

sys-apps/baselayout: ROOTPATH should have host paths on Prefix

Same as PATH, ROOTPATH should be modified to contain host paths. This
fixes app-shells/zsh not having host paths when EUID=1000 or root user,
because it sets ROOTPATH as PATH in /etc/zsh/zprofile, which make zsh's
behavior align with bash.

Closes: https://bugs.gentoo.org/924032
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35225
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../{baselayout-2.14-r1.ebuild => baselayout-2.14-r2.ebuild}           | 3 ++-
 sys-apps/baselayout/baselayout-9999.ebuild                             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.14-r1.ebuild 
b/sys-apps/baselayout/baselayout-2.14-r2.ebuild
similarity index 99%
rename from sys-apps/baselayout/baselayout-2.14-r1.ebuild
rename to sys-apps/baselayout/baselayout-2.14-r2.ebuild
index d95e2efe9ff4..72bb2496fd2d 100644
--- a/sys-apps/baselayout/baselayout-2.14-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -209,6 +209,7 @@ src_prepare() {
                hprefixify -w '/PATH=/' etc/env.d/50baselayout
                hprefixify -w 1 etc/env.d/50baselayout
                echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+               echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
                echo MANPATH=/usr/share/man >> etc/env.d/99host
 
                # change branding

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild 
b/sys-apps/baselayout/baselayout-9999.ebuild
index b1f52aa3baa7..76beeff5aac8 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -209,6 +209,7 @@ src_prepare() {
                hprefixify -w '/PATH=/' etc/env.d/50baselayout
                hprefixify -w 1 etc/env.d/50baselayout
                echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+               echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
                echo MANPATH=/usr/share/man >> etc/env.d/99host
 
                # change branding

Reply via email to