[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: 3443c73d1b54989a1abb11005b30416606357534
Author: Yiyang Wu gmail com>
AuthorDate: Thu Feb 8 14:46:17 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Feb 8 17:30:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3443c73d
app-shells/zsh: zprofile: remove using ROOTPATH which is deprecated
Now PATH also contains sbin paths, which make ROOTPATH unnecessary for
root and uid=1000 user.
Closes: https://bugs.gentoo.org/924032
Signed-off-by: Yiyang Wu gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35229
Signed-off-by: Mike Gilbert gentoo.org>
app-shells/zsh/files/zprofile-5 | 24
app-shells/zsh/zsh-5.9-r6.ebuild | 245 +++
2 files changed, 269 insertions(+)
diff --git a/app-shells/zsh/files/zprofile-5 b/app-shells/zsh/files/zprofile-5
new file mode 100644
index ..7bc5e03b5e34
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-5
@@ -0,0 +1,24 @@
+# /etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [[ -e /etc/profile.env ]] ; then
+ . /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
+
+shopts=$-
+setopt nullglob
+for sh in /etc/profile.d/*.sh ; do
+ [[ -r "${sh}" ]] && . "${sh}"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.9-r6.ebuild b/app-shells/zsh/zsh-5.9-r6.ebuild
new file mode 100644
index ..d0239108837f
--- /dev/null
+++ b/app-shells/zsh/zsh-5.9-r6.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic prefix
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+
+SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+ https://www.zsh.org/pub/old/${P}.tar.xz
+ mirror://sourceforge/${PN}/${P}.tar.xz
+ doc? (
+ https://www.zsh.org/pub/${P}-doc.tar.xz
+ mirror://sourceforge/${PN}/${P}-doc.tar.xz
+ )"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/;
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static valgrind"
+
+# Next release should use pcre2:
https://github.com/zsh-users/zsh/commit/b62e911341c8ec7446378b477c47da4256053dc0
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0=
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+ caps? ( sys-libs/libcap )
+ pcre? (
+ >=dev-libs/libpcre-3.9
+ static? ( >=dev-libs/libpcre-3.9[static-libs] )
+ )
+ gdbm? (
+ sys-libs/gdbm:=
+ static? ( sys-libs/gdbm:=[static-libs] )
+ )
+"
+DEPEND="sys-apps/groff
+ valgrind? ( dev-debug/valgrind )
+ ${RDEPEND}"
+PDEPEND="
+ examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == * ]] ; then
+ DEPEND+=" app-text/yodl
+ doc? (
+ sys-apps/texinfo
+ app-text/texi2html
+ virtual/latex-base
+ )"
+fi
+
+PATCHES=(
+ # Add openrc specific options for init.d completion
+ "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+ # Please refer gentoo bug #833981
+ "${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch
+ # bug #869539
+ "${FILESDIR}"/${PN}-5.9-clang-15-configure.patch
+ "${FILESDIR}"/${PN}-5.9-do-not-use-egrep-in-tests.patch
+ # bug #919001
+ "${FILESDIR}"/${PN}-5.9-c99.patch
+ "${FILESDIR}"/${PN}-5.9-relro.patch
+)
+
+src_prepare() {
+ if [[ ${PV} != * ]]; then
+ # fix zshall problem with soelim
+ ln -s Doc man1 || die
+ mv Doc/zshall.1 Doc/zshall.1.soelim || die
+ soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+ fi
+
+ default
+
+ hprefixify configure.ac
+ if [[ ${PV} == * ]] ; then
+ sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-etcdir="${EPREFIX}"/etc/zsh
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+
[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: e544d4c60f846622daf1fffde0fede19dee03a7e
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jul 2 07:47:58 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jul 2 07:48:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e544d4c6
app-shells/zsh: Security cleanup.
Bug: https://bugs.gentoo.org/651860
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-shells/zsh/Manifest| 4 -
app-shells/zsh/files/zprofile-1| 42 ---
app-shells/zsh/files/zprofile-2| 41 ---
app-shells/zsh/zsh-5.3.1.ebuild| 217 -
app-shells/zsh/zsh-5.4.2-r1.ebuild | 211
5 files changed, 515 deletions(-)
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 5e51ca0f300..194f7e89c16 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,7 +1,3 @@
-DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B
dc14f7b6136b73d5cfe8462fe67e20b92ee04741ad8f8a0f8d40bd1f8658261569722b156a075d7b723f2d38d41fc725e227c995eefebde433ea172399b90210
SHA512
27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c
-DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B
b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0
SHA512
25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
-DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B
9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e
SHA512
5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
-DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B
c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378
SHA512
5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B
3d07b336222b08d7deff0ded6f603a47bcdcec978e6ad9c244b25f5249e07c22768ba30e67f02c8ebf4a0a8104997d0aa8959de7e3c39a428dca0b013c56e9b1
SHA512
0bde166bc4a4b8ea7512bd9d3ede53478959cb76ded65488b9a8993734cf2a8ffedcd38254fbf6ff73a5841289cb65715579744b10748afb038c9d93a01f987b
DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B
ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91
SHA512
e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6
DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B
b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e
SHA512
c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
diff --git a/app-shells/zsh/files/zprofile-1 b/app-shells/zsh/files/zprofile-1
deleted file mode 100644
index e78ec265bf5..000
--- a/app-shells/zsh/files/zprofile-1
+++ /dev/null
@@ -1,42 +0,0 @@
-# @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="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${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"
-else
- @ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-
@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
[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: 36ee2193df450e0d142042dbaac9344459b1b7d7
Author: Benda Xu gentoo org>
AuthorDate: Mon Sep 4 06:26:19 2017 +
Commit: Benda XU gentoo org>
CommitDate: Mon Sep 4 06:27:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ee2193
app-shells/zsh: apply prefixify_ro of prefix.eclass to simplify the ebuild.
zprofile-3 is created so that no pattern substitution is needed for
non-Prefix systems.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-shells/zsh/files/zprofile-3| 38 +++
app-shells/zsh/zsh-5.4.2-r1.ebuild | 211 +
2 files changed, 249 insertions(+)
diff --git a/app-shells/zsh/files/zprofile-3 b/app-shells/zsh/files/zprofile-3
new file mode 100644
index 000..6c223a5ef15
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-3
@@ -0,0 +1,38 @@
+# /etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e /etc/profile.env ] ; then
+ . /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
+ PATH="${ROOTPATH}"
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in /etc/profile.d/*.sh ; do
+ [ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.4.2-r1.ebuild
b/app-shells/zsh/zsh-5.4.2-r1.ebuild
new file mode 100644
index 000..79789092e50
--- /dev/null
+++ b/app-shells/zsh/zsh-5.4.2-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic prefix
+
+if [[ ${PV} == * ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
+ doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/;
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0=
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+ caps? ( sys-libs/libcap )
+ pcre? (
+ >=dev-libs/libpcre-3.9
+ static? ( >=dev-libs/libpcre-3.9[static-libs] )
+ )
+ gdbm? ( sys-libs/gdbm )
+ ! Doc/zshall.1 || die
+
+ # add openrc specific options for init.d completion
+ eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+ fi
+
+ eapply_user
+
+ if [[ ${PV} == * ]] ; then
+ sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-etcdir="${EPREFIX}"/etc/zsh
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+ --enable-function-subdirs
+ --with-tcsetpgrp
+ $(use_enable maildir maildir-support)
+ $(use_enable pcre)
+ $(use_enable caps cap)
+ $(use_enable unicode multibyte)
+ $(use_enable gdbm )
+ )
+
+ if use static ; then
+ myconf+=( --disable-dynamic )
+ append-ldflags -static
+ fi
+ if use debug ; then
+ myconf+=(
+ --enable-zsh-debug
+ --enable-zsh-mem-debug
+ --enable-zsh-mem-warning
+ --enable-zsh-secure-free
+ --enable-zsh-hash-debug
+ )
+ fi
+
+ if [[ ${CHOST} == *-darwin*
[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: 86a207399d8e4abaf3a1a3999fbbce2cb068aa30
Author: Tim Harder gentoo org>
AuthorDate: Wed Aug 9 18:52:50 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Wed Aug 9 18:58:52 2017 +
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-.ebuild => zsh-5.4.1.ebuild} | 3 +-
app-shells/zsh/zsh-.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
efc33f3bfc79013dd51c4cde14c99fafe51ee18b69d26d244d1cc3fe2845633edb9183bf2db0e6df02cc4329ca3d59e1dacba9328ed68c72f0e7b8dac35e
diff --git a/app-shells/zsh/files/zprofile-2 b/app-shells/zsh/files/zprofile-2
new file mode 100644
index 000..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-.ebuild b/app-shells/zsh/zsh-5.4.1.ebuild
similarity index 98%
copy from app-shells/zsh/zsh-.ebuild
copy to
[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: d5971a16ad4d85e5cb3332ef5d69ff4236de1261
Author: Tim Harder gentoo org>
AuthorDate: Sun Dec 11 21:59:00 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Sun Dec 11 21:59:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5971a16
app-shells/zsh: version bump to 5.3
app-shells/zsh/Manifest| 2 ++
app-shells/zsh/files/zsh-5.3-init.d-gentoo.diff| 31 ++
app-shells/zsh/{zsh-.ebuild => zsh-5.3.ebuild} | 2 +-
app-shells/zsh/zsh-.ebuild | 2 +-
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 6cf2604..f97838d 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,3 +2,5 @@ DIST zsh-5.0.5-doc.tar.bz2 2940018 SHA256
e4f22bafaa8410bbc2d83f2d748ca476436575
DIST zsh-5.0.5.tar.bz2 3104375 SHA256
6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf SHA512
34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5
WHIRLPOOL
bf02ca194261e15e88a9e26212644aa7be1afcc8e73cd6bb18ffb8e1c1d46a8742fee109d92a3b455c418258df9ae74dece21a05ff0e54e8c370af094512af16
DIST zsh-5.2-doc.tar.xz 3108600 SHA256
328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a SHA512
a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0
WHIRLPOOL
a6b023af9e3d94d31b56aba688c2bf3c16ff6ed1dc9db34dd970c4bf0461e24b7aab0b9113cc5f16bd87ab2ca9d973a990a3721c08500cbcd45fa2fe2d43a260
DIST zsh-5.2.tar.xz 2820108 SHA256
f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d SHA512
9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72
WHIRLPOOL
5348ce11026a4e50d0ecf118cb379e9765cb98fcf32563489fd860ad0234c3f3aefb7f3fe28d18a97f2ddba54dc2b2cf9909b81cdc0e213f26f599ba68fd8833
+DIST zsh-5.3-doc.tar.xz 3161944 SHA256
cdfc6c3f7235b13308af5316cfa87abb5f51b3ec72d45f9043fde6e5b2e8663e SHA512
29d5731d48170e7bc96337e9ae10f58a9f6fcd7698b4dcaacf17b9e490c8084cb781fc3d9a06ddcaddb9d3957b86d9040cc8e7b13d4b5649e2be181508a95ef4
WHIRLPOOL
caf5ef406d7bc616ddd1eeecfd5ed95fa560a49d914059a225569cae63be8c92bd01a88fce4314fb6272218f189c09196bcb3c5a72f737257c7d0263251ad2f1
+DIST zsh-5.3.tar.xz 2928684 SHA256
76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a SHA512
b34da1a062954ccb166b0a22fa48b0d08bdb8f50fd96cb391f04887c0bf416e771ceaa8af8fa7da2dc2e6f7c3ecce5c92c4e3bee21fd93e467849c8febc021b0
WHIRLPOOL
9d52e36528c2272e2de33144bd76ddb50e505ecc2dec13e332c9e9185be1e919b5f4276de052b0d558d5f809c0437d1a85491924a6febd143dcfced53c323c81
diff --git a/app-shells/zsh/files/zsh-5.3-init.d-gentoo.diff
b/app-shells/zsh/files/zsh-5.3-init.d-gentoo.diff
new file mode 100644
index ..9deafd0
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.3-init.d-gentoo.diff
@@ -0,0 +1,31 @@
+--- zsh-5.3/Completion/Unix/Command/_init_d
zsh-5.3/Completion/Unix/Command/_init_d
+@@ -1,6 +1,6 @@
+ #compdef -p */(init|rc[0-9S]#).d/*
+
+-local cmds script
++local cmds script opts
+ local -a flags
+
+ _compskip=all
+@@ -102,10 +102,18 @@
+
+ script=$words[1]
+ [[ $script = */* ]] || script="$(_init_d_fullpath "$script")"
++[[ ! -f $script ]] &&
++{ _message "${words[1]:t} is not an init script" && return }
++
+
+ cmds=( $(_init_d_get_cmds) ) || return 1
+
+-(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds
||
+-cmds=(start stop)
++(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds
++opts=(start stop restart pause zap status ineed iuse needsme usesme broken)
++
++# If we didn't get $cmds from a zstyle, then read init script for opts.
++# If script doesn't specify opts, then default to the standard opts.
++(( $#cmds )) || cmds=( ${(eQz)${(M)${(f)"$(
<$script)"}:#[[:blank:]]#opts=*}#*=} )
++(( $#cmds )) || cmds=($opts)
+
+ _arguments -s -A "-*" $flags ':init.d command:_sub_commands $cmds'
diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-5.3.ebuild
similarity index 99%
copy from app-shells/zsh/zsh-.ebuild
copy to app-shells/zsh/zsh-5.3.ebuild
index 8798b3d..2923214 100644
--- a/app-shells/zsh/zsh-.ebuild
+++ b/app-shells/zsh/zsh-5.3.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
# add openrc specific options for init.d completion
- eapply "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+ eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
fi
cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-.ebuild
index 8798b3d..2923214 100644
--- a/app-shells/zsh/zsh-.ebuild
+++ b/app-shells/zsh/zsh-.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/, app-shells/zsh/files/
commit: 8e4cb2a89d44c72079ff01aff862806f4969ce1b
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Oct 2 13:28:24 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Oct 2 13:28:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4cb2a8
app-shells/zsh: fix build w/gcc-5 #547950
app-shells/zsh/files/zsh-5.1.0-gcc-5.patch | 16
app-shells/zsh/zsh-5.1.1.ebuild| 1 +
2 files changed, 17 insertions(+)
diff --git a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
new file mode 100644
index 000..74756d2
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/547950
+http://www.zsh.org/mla/workers/2015/msg02660.html
+
+fix building w/gcc-5
+
+--- a/Src/Modules/system.mdd
b/Src/Modules/system.mdd
+@@ -15,7 +15,7 @@
+ touch errtmp.out; \
+ else \
+ $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \
+- $(CPP) errtmp.c >errtmp.out; \
++ $(CPP) -P errtmp.c >errtmp.out; \
+ fi
+ $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@
+ rm -f errtmp.c errtmp.out
diff --git a/app-shells/zsh/zsh-5.1.1.ebuild b/app-shells/zsh/zsh-5.1.1.ebuild
index 695369a..295b2ca 100644
--- a/app-shells/zsh/zsh-5.1.1.ebuild
+++ b/app-shells/zsh/zsh-5.1.1.ebuild
@@ -53,6 +53,7 @@ src_prepare() {
soelim Doc/zshall.1.soelim > Doc/zshall.1
epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+ epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
eprefixify "${T}"/zprofile || die
