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, 17 Feb 2020 08:14:37
Message-Id: 1581927195.7b812055ea01188c49c1cc5cb349b7d0ac899bea.polynomial-c@gentoo
1 commit: 7b812055ea01188c49c1cc5cb349b7d0ac899bea
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 17 08:13:15 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 17 08:13:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b812055
7
8 app-shells/zsh: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-shells/zsh/Manifest | 2 -
14 app-shells/zsh/zsh-5.6.2.ebuild | 211 ---------------------------------------
15 app-shells/zsh/zsh-5.7.1.ebuild | 216 ----------------------------------------
16 3 files changed, 429 deletions(-)
17
18 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
19 index 0441d140d04..1a144b9f3a0 100644
20 --- a/app-shells/zsh/Manifest
21 +++ b/app-shells/zsh/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
24 -DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
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.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52
28
29 diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
30 deleted file mode 100644
31 index aa8fb589ad6..00000000000
32 --- a/app-shells/zsh/zsh-5.6.2.ebuild
33 +++ /dev/null
34 @@ -1,211 +0,0 @@
35 -# Copyright 1999-2020 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-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 - doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
50 -fi
51 -
52 -DESCRIPTION="UNIX Shell similar to the Korn shell"
53 -HOMEPAGE="https://www.zsh.org/"
54 -
55 -LICENSE="ZSH gdbm? ( GPL-2 )"
56 -SLOT="0"
57 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
58 -
59 -RDEPEND="
60 - >=sys-libs/ncurses-5.1:0=
61 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
62 - caps? ( sys-libs/libcap )
63 - pcre? (
64 - >=dev-libs/libpcre-3.9
65 - static? ( >=dev-libs/libpcre-3.9[static-libs] )
66 - )
67 - gdbm? ( sys-libs/gdbm:= )
68 - !<sys-apps/baselayout-2.4.1
69 -"
70 -DEPEND="sys-apps/groff
71 - ${RDEPEND}"
72 -PDEPEND="
73 - examples? ( app-doc/zsh-lovers )
74 -"
75 -if [[ ${PV} == 9999* ]] ; then
76 - DEPEND+=" app-text/yodl
77 - doc? (
78 - sys-apps/texinfo
79 - app-text/texi2html
80 - virtual/latex-base
81 - )"
82 -fi
83 -
84 -src_prepare() {
85 - if [[ ${PV} != 9999* ]]; then
86 - # fix zshall problem with soelim
87 - ln -s Doc man1 || die
88 - mv Doc/zshall.1 Doc/zshall.1.soelim || die
89 - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
90 -
91 - # add openrc specific options for init.d completion
92 - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
93 - fi
94 -
95 - eapply_user
96 -
97 - if [[ ${PV} == 9999* ]] ; then
98 - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
99 - eautoreconf
100 - fi
101 -}
102 -
103 -src_configure() {
104 - local myconf=(
105 - --bindir="${EPREFIX}"/bin
106 - --libdir="${EPREFIX}"/usr/$(get_libdir)
107 - --enable-etcdir="${EPREFIX}"/etc/zsh
108 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
109 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
110 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
111 - --enable-function-subdirs
112 - --with-tcsetpgrp
113 - $(use_enable maildir maildir-support)
114 - $(use_enable pcre)
115 - $(use_enable caps cap)
116 - $(use_enable unicode multibyte)
117 - $(use_enable gdbm)
118 - )
119 -
120 - if use static ; then
121 - myconf+=( --disable-dynamic )
122 - append-ldflags -static
123 - fi
124 - if use debug ; then
125 - myconf+=(
126 - --enable-zsh-debug
127 - --enable-zsh-mem-debug
128 - --enable-zsh-mem-warning
129 - --enable-zsh-secure-free
130 - --enable-zsh-hash-debug
131 - )
132 - fi
133 -
134 - if [[ ${CHOST} == *-darwin* ]]; then
135 - myconf+=( --enable-libs=-liconv )
136 - append-ldflags -Wl,-x
137 - fi
138 -
139 - econf "${myconf[@]}"
140 -
141 - if use static ; then
142 - # compile all modules statically, see Bug #27392
143 - # removed cap and curses because linking failes
144 - sed -e "s,link=no,link=static,g" \
145 - -e "/^name=zsh\/cap/s,link=static,link=no," \
146 - -e "/^name=zsh\/curses/s,link=static,link=no," \
147 - -i "${S}"/config.modules || die
148 - if ! use gdbm ; then
149 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
150 - "${S}"/config.modules || die
151 - fi
152 - fi
153 -}
154 -
155 -src_compile() {
156 - default
157 -
158 - if [[ ${PV} == 9999* ]] && use doc ; then
159 - emake -C Doc everything
160 - fi
161 -}
162 -
163 -src_test() {
164 - addpredict /dev/ptmx
165 - local i
166 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
167 - rm "${S}"/Test/${i} || die
168 - done
169 - emake check
170 -}
171 -
172 -src_install() {
173 - emake DESTDIR="${D}" install $(usex doc "install.info" "")
174 -
175 - insinto /etc/zsh
176 - export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
177 - newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
178 -
179 - keepdir /usr/share/zsh/site-functions
180 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
181 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
182 -
183 - local i
184 -
185 - # install miscellaneous scripts (bug #54520)
186 - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
187 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
188 - -i {Util,Misc}/* || die
189 - for i in Util Misc ; do
190 - insinto /usr/share/zsh/${PV%_*}/${i}
191 - doins ${i}/*
192 - done
193 -
194 - # install header files (bug #538684)
195 - insinto /usr/include/zsh
196 - doins config.h Src/*.epro
197 - for i in Src/{zsh.mdh,*.h} ; do
198 - sed -e 's@\.\./config\.h@config.h@' \
199 - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
200 - -i "${i}"
201 - doins "${i}"
202 - done
203 -
204 - dodoc ChangeLog* META-FAQ NEWS README config.modules
205 -
206 - if use doc ; then
207 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
208 - dodoc Doc/zsh.{dvi,pdf}
209 - docinto html
210 - dodoc Doc/*.html
211 - popd >/dev/null
212 - fi
213 -
214 - docinto StartupFiles
215 - dodoc StartupFiles/z*
216 -}
217 -
218 -pkg_postinst() {
219 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
220 - echo
221 - elog "If you want to enable Portage completions and Gentoo prompt,"
222 - elog "emerge app-shells/gentoo-zsh-completions and add"
223 - elog " autoload -U compinit promptinit"
224 - elog " compinit"
225 - elog " promptinit; prompt gentoo"
226 - elog "to your ~/.zshrc"
227 - echo
228 - elog "Also, if you want to enable cache for the completions, add"
229 - elog " zstyle ':completion::complete:*' use-cache 1"
230 - elog "to your ~/.zshrc"
231 - echo
232 - elog "Note that a system zprofile startup file is installed. This will override"
233 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
234 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
235 - elog "or other user startup files that are sourced after the system zprofile."
236 - echo
237 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
238 - elog "one method is to use a separate path-setting file that is conditionally sourced"
239 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
240 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
241 - echo
242 - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
243 - echo
244 - fi
245 -}
246
247 diff --git a/app-shells/zsh/zsh-5.7.1.ebuild b/app-shells/zsh/zsh-5.7.1.ebuild
248 deleted file mode 100644
249 index c9003dab0f4..00000000000
250 --- a/app-shells/zsh/zsh-5.7.1.ebuild
251 +++ /dev/null
252 @@ -1,216 +0,0 @@
253 -# Copyright 1999-2019 Gentoo Authors
254 -# Distributed under the terms of the GNU General Public License v2
255 -
256 -EAPI=7
257 -
258 -inherit autotools flag-o-matic prefix
259 -
260 -if [[ ${PV} == 9999* ]] ; then
261 - inherit git-r3
262 - EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
263 -else
264 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
265 - SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
266 - https://www.zsh.org/pub/old/${P}.tar.xz
267 - mirror://sourceforge/${PN}/${P}.tar.xz
268 - doc? (
269 - https://www.zsh.org/pub/${P}-doc.tar.xz
270 - mirror://sourceforge/${PN}/${P}-doc.tar.xz
271 - )"
272 -fi
273 -
274 -DESCRIPTION="UNIX Shell similar to the Korn shell"
275 -HOMEPAGE="https://www.zsh.org/"
276 -
277 -LICENSE="ZSH gdbm? ( GPL-2 )"
278 -SLOT="0"
279 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
280 -
281 -RDEPEND="
282 - >=sys-libs/ncurses-5.1:0=
283 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
284 - caps? ( sys-libs/libcap )
285 - pcre? (
286 - >=dev-libs/libpcre-3.9
287 - static? ( >=dev-libs/libpcre-3.9[static-libs] )
288 - )
289 - gdbm? ( sys-libs/gdbm:= )
290 - !<sys-apps/baselayout-2.4.1
291 -"
292 -DEPEND="sys-apps/groff
293 - ${RDEPEND}"
294 -PDEPEND="
295 - examples? ( app-doc/zsh-lovers )
296 -"
297 -if [[ ${PV} == 9999* ]] ; then
298 - DEPEND+=" app-text/yodl
299 - doc? (
300 - sys-apps/texinfo
301 - app-text/texi2html
302 - virtual/latex-base
303 - )"
304 -fi
305 -
306 -src_prepare() {
307 - if [[ ${PV} != 9999* ]]; then
308 - # fix zshall problem with soelim
309 - ln -s Doc man1 || die
310 - mv Doc/zshall.1 Doc/zshall.1.soelim || die
311 - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
312 -
313 - # add openrc specific options for init.d completion
314 - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
315 - fi
316 -
317 - default
318 -
319 - hprefixify configure.ac
320 - if [[ ${PV} == 9999* ]] ; then
321 - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
322 - fi
323 - eautoreconf
324 -}
325 -
326 -src_configure() {
327 - local myconf=(
328 - --bindir="${EPREFIX}"/bin
329 - --libdir="${EPREFIX}"/usr/$(get_libdir)
330 - --enable-etcdir="${EPREFIX}"/etc/zsh
331 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
332 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
333 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
334 - --enable-function-subdirs
335 - --with-tcsetpgrp
336 - $(use_enable maildir maildir-support)
337 - $(use_enable pcre)
338 - $(use_enable caps cap)
339 - $(use_enable unicode multibyte)
340 - $(use_enable gdbm)
341 - )
342 -
343 - if use static ; then
344 - myconf+=( --disable-dynamic )
345 - append-ldflags -static
346 - fi
347 - if use debug ; then
348 - myconf+=(
349 - --enable-zsh-debug
350 - --enable-zsh-mem-debug
351 - --enable-zsh-mem-warning
352 - --enable-zsh-secure-free
353 - --enable-zsh-hash-debug
354 - )
355 - fi
356 -
357 - if [[ ${CHOST} == *-darwin* ]]; then
358 - myconf+=( --enable-libs=-liconv )
359 - append-ldflags -Wl,-x
360 - fi
361 -
362 - econf "${myconf[@]}"
363 -
364 - if use static ; then
365 - # compile all modules statically, see Bug #27392
366 - # removed cap and curses because linking failes
367 - sed -e "s,link=no,link=static,g" \
368 - -e "/^name=zsh\/cap/s,link=static,link=no," \
369 - -e "/^name=zsh\/curses/s,link=static,link=no," \
370 - -i "${S}"/config.modules || die
371 - if ! use gdbm ; then
372 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
373 - "${S}"/config.modules || die
374 - fi
375 - fi
376 -}
377 -
378 -src_compile() {
379 - default
380 -
381 - if [[ ${PV} == 9999* ]] && use doc ; then
382 - emake -C Doc everything
383 - fi
384 -}
385 -
386 -src_test() {
387 - addpredict /dev/ptmx
388 - local i
389 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
390 - rm "${S}"/Test/${i} || die
391 - done
392 - emake check
393 -}
394 -
395 -src_install() {
396 - emake DESTDIR="${D}" install $(usex doc "install.info" "")
397 -
398 - insinto /etc/zsh
399 - export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
400 - newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
401 -
402 - keepdir /usr/share/zsh/site-functions
403 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
404 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
405 -
406 - local i
407 -
408 - # install miscellaneous scripts (bug #54520)
409 - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
410 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
411 - -i {Util,Misc}/* || die
412 - for i in Util Misc ; do
413 - insinto /usr/share/zsh/${PV%_*}/${i}
414 - doins ${i}/*
415 - done
416 -
417 - # install header files (bug #538684)
418 - insinto /usr/include/zsh
419 - doins config.h Src/*.epro
420 - for i in Src/{zsh.mdh,*.h} ; do
421 - sed -e 's@\.\./config\.h@config.h@' \
422 - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
423 - -i "${i}"
424 - doins "${i}"
425 - done
426 -
427 - dodoc ChangeLog* META-FAQ NEWS README config.modules
428 -
429 - if use doc ; then
430 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
431 - dodoc Doc/zsh.{dvi,pdf}
432 - docinto html
433 - dodoc Doc/*.html
434 - popd >/dev/null
435 - fi
436 -
437 - docinto StartupFiles
438 - dodoc StartupFiles/z*
439 -}
440 -
441 -pkg_postinst() {
442 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
443 - echo
444 - elog "If you want to enable Portage completions and Gentoo prompt,"
445 - elog "emerge app-shells/gentoo-zsh-completions and add"
446 - elog " autoload -U compinit promptinit"
447 - elog " compinit"
448 - elog " promptinit; prompt gentoo"
449 - elog "to your ~/.zshrc"
450 - echo
451 - elog "Also, if you want to enable cache for the completions, add"
452 - elog " zstyle ':completion::complete:*' use-cache 1"
453 - elog "to your ~/.zshrc"
454 - echo
455 - elog "Note that a system zprofile startup file is installed. This will override"
456 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
457 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
458 - elog "or other user startup files that are sourced after the system zprofile."
459 - echo
460 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
461 - elog "one method is to use a separate path-setting file that is conditionally sourced"
462 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
463 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
464 - echo
465 - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
466 - echo
467 - fi
468 -}