commit: d5971a16ad4d85e5cb3332ef5d69ff4236de1261
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 21:59:00 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 21:59:00 2016 +0000
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-9999.ebuild => zsh-5.3.ebuild} | 2 +-
app-shells/zsh/zsh-9999.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 00000000..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-9999.ebuild b/app-shells/zsh/zsh-5.3.ebuild
similarity index 99%
copy from app-shells/zsh/zsh-9999.ebuild
copy to app-shells/zsh/zsh-5.3.ebuild
index 8798b3d..2923214 100644
--- a/app-shells/zsh/zsh-9999.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-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 8798b3d..2923214 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.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
