Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/
Date: Sat, 31 Dec 2016 00:16:22
Message-Id: 1483143203.dfe4f93556986be962ddac5d6af5f62e1b9fd62d.radhermit@gentoo
1 commit: dfe4f93556986be962ddac5d6af5f62e1b9fd62d
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 00:13:23 2016 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 00:13:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe4f935
7
8 app-shells/zsh: version bump to 5.3.1
9
10 app-shells/zsh/Manifest | 2 +
11 app-shells/zsh/zsh-5.3.1.ebuild | 218 ++++++++++++++++++++++++++++++++++++++++
12 2 files changed, 220 insertions(+)
13
14 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
15 index f97838d..f5f22ca 100644
16 --- a/app-shells/zsh/Manifest
17 +++ b/app-shells/zsh/Manifest
18 @@ -3,4 +3,6 @@ DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83
19 DIST zsh-5.2-doc.tar.xz 3108600 SHA256 328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a SHA512 a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0 WHIRLPOOL a6b023af9e3d94d31b56aba688c2bf3c16ff6ed1dc9db34dd970c4bf0461e24b7aab0b9113cc5f16bd87ab2ca9d973a990a3721c08500cbcd45fa2fe2d43a260
20 DIST zsh-5.2.tar.xz 2820108 SHA256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d SHA512 9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72 WHIRLPOOL 5348ce11026a4e50d0ecf118cb379e9765cb98fcf32563489fd860ad0234c3f3aefb7f3fe28d18a97f2ddba54dc2b2cf9909b81cdc0e213f26f599ba68fd8833
21 DIST zsh-5.3-doc.tar.xz 3161944 SHA256 cdfc6c3f7235b13308af5316cfa87abb5f51b3ec72d45f9043fde6e5b2e8663e SHA512 29d5731d48170e7bc96337e9ae10f58a9f6fcd7698b4dcaacf17b9e490c8084cb781fc3d9a06ddcaddb9d3957b86d9040cc8e7b13d4b5649e2be181508a95ef4 WHIRLPOOL caf5ef406d7bc616ddd1eeecfd5ed95fa560a49d914059a225569cae63be8c92bd01a88fce4314fb6272218f189c09196bcb3c5a72f737257c7d0263251ad2f1
22 +DIST zsh-5.3.1-doc.tar.xz 3161408 SHA256 d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c WHIRLPOOL 40d10cf9767a168f2619b0bed947d6a05a45bece6a5a5bd353422fef88ca267bf2f03f18f6ce9ee86def9219b13e3c8fa145f73c22bb3f9d786ee6eddd773953
23 +DIST zsh-5.3.1.tar.xz 2928832 SHA256 fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304 WHIRLPOOL cdd62b5c144a7b416bb46b7a14ddc12f5e1ff133acc292abcdc94d402b2c0a6b57667f962cb808bdd52fdedd4b98fb5669327d1754183f242f29bdaea73747fc
24 DIST zsh-5.3.tar.xz 2928684 SHA256 76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a SHA512 b34da1a062954ccb166b0a22fa48b0d08bdb8f50fd96cb391f04887c0bf416e771ceaa8af8fa7da2dc2e6f7c3ecce5c92c4e3bee21fd93e467849c8febc021b0 WHIRLPOOL 9d52e36528c2272e2de33144bd76ddb50e505ecc2dec13e332c9e9185be1e919b5f4276de052b0d558d5f809c0437d1a85491924a6febd143dcfced53c323c81
25
26 diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
27 new file mode 100644
28 index 00000000..2923214
29 --- /dev/null
30 +++ b/app-shells/zsh/zsh-5.3.1.ebuild
31 @@ -0,0 +1,218 @@
32 +# Copyright 1999-2016 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=6
37 +
38 +inherit flag-o-matic prefix
39 +
40 +if [[ ${PV} == 9999* ]] ; then
41 + inherit git-r3 autotools
42 + EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
43 +else
44 + 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"
45 + SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
46 + doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
47 +fi
48 +
49 +DESCRIPTION="UNIX Shell similar to the Korn shell"
50 +HOMEPAGE="http://www.zsh.org/"
51 +
52 +LICENSE="ZSH gdbm? ( GPL-2 )"
53 +SLOT="0"
54 +IUSE="caps debug doc examples gdbm maildir pcre static unicode"
55 +
56 +RDEPEND="
57 + >=sys-libs/ncurses-5.1:0=
58 + static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
59 + caps? ( sys-libs/libcap )
60 + pcre? (
61 + >=dev-libs/libpcre-3.9
62 + static? ( >=dev-libs/libpcre-3.9[static-libs] )
63 + )
64 + gdbm? ( sys-libs/gdbm )
65 +"
66 +DEPEND="sys-apps/groff
67 + ${RDEPEND}"
68 +PDEPEND="
69 + examples? ( app-doc/zsh-lovers )
70 +"
71 +if [[ ${PV} == 9999* ]] ; then
72 + DEPEND+=" app-text/yodl
73 + doc? (
74 + sys-apps/texinfo
75 + app-text/texi2html
76 + virtual/latex-base
77 + )"
78 +fi
79 +
80 +src_prepare() {
81 + if [[ ${PV} != 9999* ]]; then
82 + # fix zshall problem with soelim
83 + ln -s Doc man1 || die
84 + mv Doc/zshall.1 Doc/zshall.1.soelim || die
85 + soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
86 +
87 + # add openrc specific options for init.d completion
88 + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
89 + fi
90 +
91 + cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
92 + eprefixify "${T}"/zprofile || die
93 + if use prefix ; then
94 + sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
95 + else
96 + sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
97 + fi
98 +
99 + eapply_user
100 +
101 + if [[ ${PV} == 9999* ]] ; then
102 + sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
103 + eautoreconf
104 + fi
105 +}
106 +
107 +src_configure() {
108 + local myconf=()
109 +
110 + if use static ; then
111 + myconf+=( --disable-dynamic )
112 + append-ldflags -static
113 + fi
114 + if use debug ; then
115 + myconf+=(
116 + --enable-zsh-debug
117 + --enable-zsh-mem-debug
118 + --enable-zsh-mem-warning
119 + --enable-zsh-secure-free
120 + --enable-zsh-hash-debug
121 + )
122 + fi
123 +
124 + if [[ ${CHOST} == *-darwin* ]]; then
125 + myconf+=( --enable-libs=-liconv )
126 + append-ldflags -Wl,-x
127 + fi
128 +
129 + econf \
130 + --bindir="${EPREFIX}"/bin \
131 + --libdir="${EPREFIX}"/usr/$(get_libdir) \
132 + --enable-etcdir="${EPREFIX}"/etc/zsh \
133 + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
134 + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
135 + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
136 + --enable-function-subdirs \
137 + --with-tcsetpgrp \
138 + $(use_enable maildir maildir-support) \
139 + $(use_enable pcre) \
140 + $(use_enable caps cap) \
141 + $(use_enable unicode multibyte) \
142 + $(use_enable gdbm ) \
143 + "${myconf[@]}"
144 +
145 + if use static ; then
146 + # compile all modules statically, see Bug #27392
147 + # removed cap and curses because linking failes
148 + sed -e "s,link=no,link=static,g" \
149 + -e "/^name=zsh\/cap/s,link=static,link=no," \
150 + -e "/^name=zsh\/curses/s,link=static,link=no," \
151 + -i "${S}"/config.modules || die
152 + if ! use gdbm ; then
153 + sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
154 + "${S}"/config.modules || die
155 + fi
156 + fi
157 +}
158 +
159 +src_compile() {
160 + default
161 +
162 + if [[ ${PV} == 9999* ]] && use doc ; then
163 + emake -C Doc everything
164 + fi
165 +}
166 +
167 +src_test() {
168 + addpredict /dev/ptmx
169 + local i
170 + for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
171 + rm "${S}"/Test/${i} || die
172 + done
173 + emake check
174 +}
175 +
176 +src_install() {
177 + emake DESTDIR="${D}" install $(usex doc "install.info" "")
178 +
179 + insinto /etc/zsh
180 + doins "${T}"/zprofile
181 +
182 + keepdir /usr/share/zsh/site-functions
183 + insinto /usr/share/zsh/${PV%_*}/functions/Prompts
184 + newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
185 +
186 + local i
187 +
188 + # install miscellaneous scripts (bug #54520)
189 + sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
190 + -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
191 + -i {Util,Misc}/* || die
192 + for i in Util Misc ; do
193 + insinto /usr/share/zsh/${PV%_*}/${i}
194 + doins ${i}/*
195 + done
196 +
197 + # install header files (bug #538684)
198 + insinto /usr/include/zsh
199 + doins config.h Src/*.epro
200 + for i in Src/{zsh.mdh,*.h} ; do
201 + sed -e 's@\.\./config\.h@config.h@' \
202 + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
203 + -i "${i}"
204 + doins "${i}"
205 + done
206 +
207 + dodoc ChangeLog* META-FAQ NEWS README config.modules
208 +
209 + if use doc ; then
210 + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
211 + docinto html
212 + dodoc Doc/*.html
213 + insinto /usr/share/doc/${PF}
214 + doins Doc/zsh.{dvi,pdf}
215 + popd >/dev/null
216 + fi
217 +
218 + docinto StartupFiles
219 + dodoc StartupFiles/z*
220 +}
221 +
222 +pkg_postinst() {
223 + if [[ -z ${REPLACING_VERSIONS} ]] ; then
224 + echo
225 + elog "If you want to enable Portage completions and Gentoo prompt,"
226 + elog "emerge app-shells/gentoo-zsh-completions and add"
227 + elog " autoload -U compinit promptinit"
228 + elog " compinit"
229 + elog " promptinit; prompt gentoo"
230 + elog "to your ~/.zshrc"
231 + echo
232 + elog "Also, if you want to enable cache for the completions, add"
233 + elog " zstyle ':completion::complete:*' use-cache 1"
234 + elog "to your ~/.zshrc"
235 + echo
236 + elog "Note that a system zprofile startup file is installed. This will override"
237 + elog "PATH and possibly other variables that a user may set in ~/.zshenv."
238 + elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
239 + elog "or other user startup files that are sourced after the system zprofile."
240 + echo
241 + elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
242 + elog "one method is to use a separate path-setting file that is conditionally sourced"
243 + elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
244 + elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
245 + echo
246 + elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
247 + echo
248 + fi
249 +}