commit:     86a207399d8e4abaf3a1a3999fbbce2cb068aa30
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 18:52:50 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 18:58:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a20739

app-shells/zsh: version bump to 5.4.1

Also, apply patch by Mike Gilbert to set PATH=${ROOTPATH} if EUID = 0;
otherwise, leave it alone. Leave prefix as-is for now.

Bug: https://bugs.gentoo.org/255695
Bug: https://bugs.gentoo.org/621334

 app-shells/zsh/Manifest                            |  2 ++
 app-shells/zsh/files/zprofile-2                    | 41 ++++++++++++++++++++++
 .../zsh/{zsh-9999.ebuild => zsh-5.4.1.ebuild}      |  3 +-
 app-shells/zsh/zsh-9999.ebuild                     |  3 +-
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index f5f22ca42b3..72c3a8796c3 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,3 +6,5 @@ DIST zsh-5.3-doc.tar.xz 3161944 SHA256 
cdfc6c3f7235b13308af5316cfa87abb5f51b3ec7
 DIST zsh-5.3.1-doc.tar.xz 3161408 SHA256 
d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed SHA512 
27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c
 WHIRLPOOL 
40d10cf9767a168f2619b0bed947d6a05a45bece6a5a5bd353422fef88ca267bf2f03f18f6ce9ee86def9219b13e3c8fa145f73c22bb3f9d786ee6eddd773953
 DIST zsh-5.3.1.tar.xz 2928832 SHA256 
fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da SHA512 
25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
 WHIRLPOOL 
cdd62b5c144a7b416bb46b7a14ddc12f5e1ff133acc292abcdc94d402b2c0a6b57667f962cb808bdd52fdedd4b98fb5669327d1754183f242f29bdaea73747fc
 DIST zsh-5.3.tar.xz 2928684 SHA256 
76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a SHA512 
b34da1a062954ccb166b0a22fa48b0d08bdb8f50fd96cb391f04887c0bf416e771ceaa8af8fa7da2dc2e6f7c3ecce5c92c4e3bee21fd93e467849c8febc021b0
 WHIRLPOOL 
9d52e36528c2272e2de33144bd76ddb50e505ecc2dec13e332c9e9185be1e919b5f4276de052b0d558d5f809c0437d1a85491924a6febd143dcfced53c323c81
+DIST zsh-5.4.1-doc.tar.xz 3197560 SHA256 
b8b1a40aeec852806ad2b74b0a0c534320bf517e2fe2a087c0c9d39e75dc29f1 SHA512 
2cc2c87dd408fba68a483fb33323abb2d3ecd66c2f4042fd4e1cff13d83df819075f54ef72c9ab6dfc98638948653e4210f2b8c0ea5c40e3b993e93bd77ee8a0
 WHIRLPOOL 
d279964f59386d9a4cecf53998bb90b5c99b9331a06641bbe352445f27f8d6868214ea257e238e3179bdda0a22e46d4716853209ae4f01ad232ffe7615dec785
+DIST zsh-5.4.1.tar.xz 2972824 SHA256 
94cbd57508287e8faa081424509738d496f5f41e32ed890e3a5498ce05d3633b SHA512 
c666c54b05e2707e3a3cf9a87a17863792f0c89ec14f5fdc85a3064f26249cfba42a2953bc76bb90205fb87a08c203a165a5240c9fd6c489c13d8cc82ee6e979
 WHIRLPOOL 
efc33f3bfc79013dd51c4cde14c99fafe51ee18b69d2aaaa6d244d1cc3fe2845633edb9183bf2db0e6df02cc4329ca3d59e1dacba9328ed68c72f0e7b8dac35e

diff --git a/app-shells/zsh/files/zprofile-2 b/app-shells/zsh/files/zprofile-2
new file mode 100644
index 00000000000..9c4313c4494
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-2
@@ -0,0 +1,41 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+       . "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings.  For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+       @ZSH_NOPREFIX@PATH="${ROOTPATH}"
+       
@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
+@ZSH_PREFIX@else
+       
@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
+       [ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-5.4.1.ebuild
similarity index 98%
copy from app-shells/zsh/zsh-9999.ebuild
copy to app-shells/zsh/zsh-5.4.1.ebuild
index a2f821d3dbc..8919a5c5da5 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-5.4.1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
                static? ( >=dev-libs/libpcre-3.9[static-libs] )
        )
        gdbm? ( sys-libs/gdbm )
+       !<sys-apps/baselayout-2.4.1
 "
 DEPEND="sys-apps/groff
        ${RDEPEND}"
@@ -56,7 +57,7 @@ src_prepare() {
                eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
        fi
 
-       cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+       cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
        eprefixify "${T}"/zprofile || die
        if use prefix ; then
                sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' 
"${T}"/zprofile || die

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index a2f821d3dbc..8919a5c5da5 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
                static? ( >=dev-libs/libpcre-3.9[static-libs] )
        )
        gdbm? ( sys-libs/gdbm )
+       !<sys-apps/baselayout-2.4.1
 "
 DEPEND="sys-apps/groff
        ${RDEPEND}"
@@ -56,7 +57,7 @@ src_prepare() {
                eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
        fi
 
-       cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+       cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
        eprefixify "${T}"/zprofile || die
        if use prefix ; then
                sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' 
"${T}"/zprofile || die

Reply via email to