Skip to content

Commit

Permalink
app-shells/zsh: version bump to 5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
radhermit committed Dec 11, 2016
1 parent 2d10d53 commit d5971a1
Show file tree
Hide file tree
Showing 4 changed files with 252 additions and 1 deletion.
2 changes: 2 additions & 0 deletions app-shells/zsh/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 31 additions & 0 deletions app-shells/zsh/files/zsh-5.3-init.d-gentoo.diff
Original file line number Diff line number Diff line change
@@ -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'
218 changes: 218 additions & 0 deletions app-shells/zsh/zsh-5.3.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

inherit flag-o-matic prefix

if [[ ${PV} == 9999* ]] ; 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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
fi

DESCRIPTION="UNIX Shell similar to the Korn shell"
HOMEPAGE="http://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 )
"
DEPEND="sys-apps/groff
${RDEPEND}"
PDEPEND="
examples? ( app-doc/zsh-lovers )
"
if [[ ${PV} == 9999* ]] ; then
DEPEND+=" app-text/yodl
doc? (
sys-apps/texinfo
app-text/texi2html
virtual/latex-base
)"
fi

src_prepare() {
if [[ ${PV} != 9999* ]]; 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

# add openrc specific options for init.d completion
eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
fi

cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
eprefixify "${T}"/zprofile || die
if use prefix ; then
sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
else
sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
fi

eapply_user

if [[ ${PV} == 9999* ]] ; then
sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
eautoreconf
fi
}

src_configure() {
local myconf=()

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* ]]; then
myconf+=( --enable-libs=-liconv )
append-ldflags -Wl,-x
fi

econf \
--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 ) \
"${myconf[@]}"

if use static ; then
# compile all modules statically, see Bug #27392
# removed cap and curses because linking failes
sed -e "s,link=no,link=static,g" \
-e "/^name=zsh\/cap/s,link=static,link=no," \
-e "/^name=zsh\/curses/s,link=static,link=no," \
-i "${S}"/config.modules || die
if ! use gdbm ; then
sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
"${S}"/config.modules || die
fi
fi
}

src_compile() {
default

if [[ ${PV} == 9999* ]] && use doc ; then
emake -C Doc everything
fi
}

src_test() {
addpredict /dev/ptmx
local i
for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
rm "${S}"/Test/${i} || die
done
emake check
}

src_install() {
emake DESTDIR="${D}" install $(usex doc "install.info" "")

insinto /etc/zsh
doins "${T}"/zprofile

keepdir /usr/share/zsh/site-functions
insinto /usr/share/zsh/${PV%_*}/functions/Prompts
newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup

local i

# install miscellaneous scripts (bug #54520)
sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-i {Util,Misc}/* || die
for i in Util Misc ; do
insinto /usr/share/zsh/${PV%_*}/${i}
doins ${i}/*
done

# install header files (bug #538684)
insinto /usr/include/zsh
doins config.h Src/*.epro
for i in Src/{zsh.mdh,*.h} ; do
sed -e 's@\.\./config\[email protected]@' \
-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-i "${i}"
doins "${i}"
done

dodoc ChangeLog* META-FAQ NEWS README config.modules

if use doc ; then
pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
docinto html
dodoc Doc/*.html
insinto /usr/share/doc/${PF}
doins Doc/zsh.{dvi,pdf}
popd >/dev/null
fi

docinto StartupFiles
dodoc StartupFiles/z*
}

pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
echo
elog "If you want to enable Portage completions and Gentoo prompt,"
elog "emerge app-shells/gentoo-zsh-completions and add"
elog " autoload -U compinit promptinit"
elog " compinit"
elog " promptinit; prompt gentoo"
elog "to your ~/.zshrc"
echo
elog "Also, if you want to enable cache for the completions, add"
elog " zstyle ':completion::complete:*' use-cache 1"
elog "to your ~/.zshrc"
echo
elog "Note that a system zprofile startup file is installed. This will override"
elog "PATH and possibly other variables that a user may set in ~/.zshenv."
elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
elog "or other user startup files that are sourced after the system zprofile."
echo
elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
elog "one method is to use a separate path-setting file that is conditionally sourced"
elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
echo
elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
echo
fi
}
2 changes: 1 addition & 1 deletion app-shells/zsh/zsh-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d5971a1

Please sign in to comment.