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: Mon, 04 Feb 2019 12:00:41
Message-Id: 1549281626.8a013bba39fe6c55500499ed293e1f01341af386.polynomial-c@gentoo
1 commit: 8a013bba39fe6c55500499ed293e1f01341af386
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 4 12:00:26 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 4 12:00:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a013bba
7
8 app-shells/zsh: Bump to version 5.7.1
9
10 Package-Manager: Portage-2.3.59, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-shells/zsh/Manifest | 2 +
14 app-shells/zsh/zsh-5.7.1.ebuild | 216 ++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 218 insertions(+)
16
17 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
18 index 382379183ed..b65727d06f4 100644
19 --- a/app-shells/zsh/Manifest
20 +++ b/app-shells/zsh/Manifest
21 @@ -1,4 +1,6 @@
22 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
23 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
24 DIST zsh-5.7-doc.tar.xz 3062428 BLAKE2B 1ee818fd3625c3c96add6fb8f0ccb42dd05eeb33b4f4513e4e436974f835465fdb9dd4092c652bcda24762bc39307946e14c4969e03038ae43f77c24871a5449 SHA512 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
25 +DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
26 +DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
27 DIST zsh-5.7.tar.xz 3124708 BLAKE2B 6b3822d3bb647aaf1072b9d499dbe9a65dc6cec0b83fb7fb09050e26bcc71fc0fb2846a1b754f9f206b602632add39e52465c1092f131f9000a149dbd2b469de SHA512 cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
28
29 diff --git a/app-shells/zsh/zsh-5.7.1.ebuild b/app-shells/zsh/zsh-5.7.1.ebuild
30 new file mode 100644
31 index 00000000000..7455f193772
32 --- /dev/null
33 +++ b/app-shells/zsh/zsh-5.7.1.ebuild
34 @@ -0,0 +1,216 @@
35 +# Copyright 1999-2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +inherit flag-o-matic prefix
41 +
42 +if [[ ${PV} == 9999* ]] ; then
43 + inherit git-r3 autotools
44 + EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
45 +else
46 + 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"
47 + SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
48 + https://www.zsh.org/pub/old/${P}.tar.xz
49 + mirror://sourceforge/${PN}/${P}.tar.xz
50 + doc? (
51 + https://www.zsh.org/pub/${P}-doc.tar.xz
52 + mirror://sourceforge/${PN}/${P}-doc.tar.xz
53 + )"
54 +fi
55 +
56 +DESCRIPTION="UNIX Shell similar to the Korn shell"
57 +HOMEPAGE="https://www.zsh.org/"
58 +
59 +LICENSE="ZSH gdbm? ( GPL-2 )"
60 +SLOT="0"
61 +IUSE="caps debug doc examples gdbm maildir pcre static unicode"
62 +
63 +RDEPEND="
64 + >=sys-libs/ncurses-5.1:0=
65 + static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
66 + caps? ( sys-libs/libcap )
67 + pcre? (
68 + >=dev-libs/libpcre-3.9
69 + static? ( >=dev-libs/libpcre-3.9[static-libs] )
70 + )
71 + gdbm? ( sys-libs/gdbm:= )
72 + !<sys-apps/baselayout-2.4.1
73 +"
74 +DEPEND="sys-apps/groff
75 + ${RDEPEND}"
76 +PDEPEND="
77 + examples? ( app-doc/zsh-lovers )
78 +"
79 +if [[ ${PV} == 9999* ]] ; then
80 + DEPEND+=" app-text/yodl
81 + doc? (
82 + sys-apps/texinfo
83 + app-text/texi2html
84 + virtual/latex-base
85 + )"
86 +fi
87 +
88 +src_prepare() {
89 + if [[ ${PV} != 9999* ]]; then
90 + # fix zshall problem with soelim
91 + ln -s Doc man1 || die
92 + mv Doc/zshall.1 Doc/zshall.1.soelim || die
93 + soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
94 +
95 + # add openrc specific options for init.d completion
96 + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
97 + fi
98 +
99 + default
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 + --bindir="${EPREFIX}"/bin
110 + --libdir="${EPREFIX}"/usr/$(get_libdir)
111 + --enable-etcdir="${EPREFIX}"/etc/zsh
112 + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
113 + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
114 + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
115 + --enable-function-subdirs
116 + --with-tcsetpgrp
117 + $(use_enable maildir maildir-support)
118 + $(use_enable pcre)
119 + $(use_enable caps cap)
120 + $(use_enable unicode multibyte)
121 + $(use_enable gdbm)
122 + )
123 +
124 + if use static ; then
125 + myconf+=( --disable-dynamic )
126 + append-ldflags -static
127 + fi
128 + if use debug ; then
129 + myconf+=(
130 + --enable-zsh-debug
131 + --enable-zsh-mem-debug
132 + --enable-zsh-mem-warning
133 + --enable-zsh-secure-free
134 + --enable-zsh-hash-debug
135 + )
136 + fi
137 +
138 + if [[ ${CHOST} == *-darwin* ]]; then
139 + myconf+=( --enable-libs=-liconv )
140 + append-ldflags -Wl,-x
141 + fi
142 +
143 + econf "${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 + export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
181 + newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
182 +
183 + keepdir /usr/share/zsh/site-functions
184 + insinto /usr/share/zsh/${PV%_*}/functions/Prompts
185 + newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
186 +
187 + local i
188 +
189 + # install miscellaneous scripts (bug #54520)
190 + sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
191 + -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
192 + -i {Util,Misc}/* || die
193 + for i in Util Misc ; do
194 + insinto /usr/share/zsh/${PV%_*}/${i}
195 + doins ${i}/*
196 + done
197 +
198 + # install header files (bug #538684)
199 + insinto /usr/include/zsh
200 + doins config.h Src/*.epro
201 + for i in Src/{zsh.mdh,*.h} ; do
202 + sed -e 's@\.\./config\.h@config.h@' \
203 + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
204 + -i "${i}"
205 + doins "${i}"
206 + done
207 +
208 + dodoc ChangeLog* META-FAQ NEWS README config.modules
209 +
210 + if use doc ; then
211 + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
212 + docinto html
213 + dodoc Doc/*.html
214 + insinto /usr/share/doc/${PF}
215 + doins Doc/zsh.{dvi,pdf}
216 + popd >/dev/null
217 + fi
218 +
219 + docinto StartupFiles
220 + dodoc StartupFiles/z*
221 +}
222 +
223 +pkg_postinst() {
224 + if [[ -z ${REPLACING_VERSIONS} ]] ; then
225 + echo
226 + elog "If you want to enable Portage completions and Gentoo prompt,"
227 + elog "emerge app-shells/gentoo-zsh-completions and add"
228 + elog " autoload -U compinit promptinit"
229 + elog " compinit"
230 + elog " promptinit; prompt gentoo"
231 + elog "to your ~/.zshrc"
232 + echo
233 + elog "Also, if you want to enable cache for the completions, add"
234 + elog " zstyle ':completion::complete:*' use-cache 1"
235 + elog "to your ~/.zshrc"
236 + echo
237 + elog "Note that a system zprofile startup file is installed. This will override"
238 + elog "PATH and possibly other variables that a user may set in ~/.zshenv."
239 + elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
240 + elog "or other user startup files that are sourced after the system zprofile."
241 + echo
242 + elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
243 + elog "one method is to use a separate path-setting file that is conditionally sourced"
244 + elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
245 + elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
246 + echo
247 + elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
248 + echo
249 + fi
250 +}