Gentoo Archives: gentoo-commits

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