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: Thu, 04 Jan 2018 10:58:01
Message-Id: 1515063466.da9b24599e7de385d2da4376b5e0d5286d1f5b58.polynomial-c@gentoo
1 commit: da9b24599e7de385d2da4376b5e0d5286d1f5b58
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 10:49:44 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 10:57:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9b2459
7
8 app-shells/zsh: Removed old.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-shells/zsh/Manifest | 4 -
13 app-shells/zsh/zsh-5.0.5.ebuild | 169 ------------------------------
14 app-shells/zsh/zsh-5.2-r1.ebuild | 217 --------------------------------------
15 app-shells/zsh/zsh-5.4.1.ebuild | 218 ---------------------------------------
16 app-shells/zsh/zsh-5.4.2.ebuild | 218 ---------------------------------------
17 5 files changed, 826 deletions(-)
18
19 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
20 index 6ba0fcffd4a..3451a647c63 100644
21 --- a/app-shells/zsh/Manifest
22 +++ b/app-shells/zsh/Manifest
23 @@ -1,10 +1,6 @@
24 -DIST zsh-5.0.5-doc.tar.bz2 2940018 BLAKE2B 8f23c0207607e20b833bd5ab66f031a261db33aa063f7df539e5f1d70c19e0f3235f41035ee83f6f59b5fe0863a1c7a69b83d01a26918840c7d7fc682c359153 SHA512 341e4a62c7c2367d17c54c5133b7c0a74e6c0becfaddd3c1f5dbe782300bbd74b0fc2066e892776cb52ce11cd0600739bfd5a7dd067eaae8a1d11b1b2aa0c3b0
25 -DIST zsh-5.0.5.tar.bz2 3104375 BLAKE2B cfc50e770ec3000b9aee1ab24fc86f4abefffd58716cd985d741368f8cbcb46b80f5020dc91f95e80f82f81f294b278acdea6b58f792461bfee415f0ca29e168 SHA512 34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5
26 DIST zsh-5.2-doc.tar.xz 3108600 BLAKE2B ee8bf9d27f51093adc89fe2a14a93ba2d88b34a81d6214fca2d072ced954bf4b3d334fb17e132a9a5eac8ec18ca0251caa37f0370a7f6a3d4ef463b37e36f69e SHA512 a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0
27 DIST zsh-5.2.tar.xz 2820108 BLAKE2B 53a1c7c1954abc0c533d650805d024e63fefae47163d64442cdc59b7867f994ea2e020d91bb1bf594ffa75af8f8437937f396a9d8f9e1b7de9cac1437b97f3b4 SHA512 9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72
28 DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee04741ad8f8a0f8d40bd1f8658261569722b156a075d7b723f2d38d41fc725e227c995eefebde433ea172399b90210 SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c
29 DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
30 -DIST zsh-5.4.1-doc.tar.xz 3197560 BLAKE2B 93a62dcdaeda37f8bfe4224d17780de4c0afc5a6a0ecf550bb70bf4e5d9663b4d40eb87a2523e3303c97ab7adaad3ea2316540ac5624ae30a3fe154e35967410 SHA512 2cc2c87dd408fba68a483fb33323abb2d3ecd66c2f4042fd4e1cff13d83df819075f54ef72c9ab6dfc98638948653e4210f2b8c0ea5c40e3b993e93bd77ee8a0
31 -DIST zsh-5.4.1.tar.xz 2972824 BLAKE2B 14bb72dcd0768d1559b8ceb1fb4713c9416211395026725b0eaa8cf92ff20f60a70443cec24241f0add18b3e05569af1db68571452c934351ad2a7543f2fbf31 SHA512 c666c54b05e2707e3a3cf9a87a17863792f0c89ec14f5fdc85a3064f26249cfba42a2953bc76bb90205fb87a08c203a165a5240c9fd6c489c13d8cc82ee6e979
32 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
33 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
34
35 diff --git a/app-shells/zsh/zsh-5.0.5.ebuild b/app-shells/zsh/zsh-5.0.5.ebuild
36 deleted file mode 100644
37 index 2237b052ed6..00000000000
38 --- a/app-shells/zsh/zsh-5.0.5.ebuild
39 +++ /dev/null
40 @@ -1,169 +0,0 @@
41 -# Copyright 1999-2017 Gentoo Foundation
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI=5
45 -
46 -inherit eutils flag-o-matic multilib prefix
47 -
48 -DESCRIPTION="UNIX Shell similar to the Korn shell"
49 -HOMEPAGE="http://www.zsh.org/"
50 -SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
51 - doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
52 -
53 -LICENSE="ZSH gdbm? ( GPL-2 )"
54 -SLOT="0"
55 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
56 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
57 -
58 -RDEPEND="
59 - >=sys-libs/ncurses-5.1:0=
60 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
61 - caps? ( sys-libs/libcap )
62 - pcre? ( >=dev-libs/libpcre-3.9
63 - static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
64 - gdbm? ( sys-libs/gdbm )
65 -"
66 -DEPEND="sys-apps/groff
67 - ${RDEPEND}"
68 -PDEPEND="
69 - examples? ( app-doc/zsh-lovers )
70 -"
71 -
72 -src_prepare() {
73 - # fix zshall problem with soelim
74 - ln -s Doc man1
75 - mv Doc/zshall.1 Doc/zshall.1.soelim
76 - soelim Doc/zshall.1.soelim > Doc/zshall.1
77 -
78 - epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
79 -
80 - cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
81 - eprefixify "${T}"/zprofile || die
82 - if use prefix ; then
83 - sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
84 - else
85 - sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
86 - fi
87 -}
88 -
89 -src_configure() {
90 - local myconf=
91 -
92 - if use static ; then
93 - myconf+=" --disable-dynamic"
94 - append-ldflags -static
95 - fi
96 - if use debug ; then
97 - myconf+=" \
98 - --enable-zsh-debug \
99 - --enable-zsh-mem-debug \
100 - --enable-zsh-mem-warning \
101 - --enable-zsh-secure-free \
102 - --enable-zsh-hash-debug"
103 - fi
104 -
105 - if [[ ${CHOST} == *-darwin* ]]; then
106 - myconf+=" --enable-libs=-liconv"
107 - append-ldflags -Wl,-x
108 - fi
109 -
110 - econf \
111 - --bindir="${EPREFIX}"/bin \
112 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
113 - --enable-etcdir="${EPREFIX}"/etc/zsh \
114 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
115 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
116 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
117 - --enable-function-subdirs \
118 - --with-tcsetpgrp \
119 - $(use_enable maildir maildir-support) \
120 - $(use_enable pcre) \
121 - $(use_enable caps cap) \
122 - $(use_enable unicode multibyte) \
123 - $(use_enable gdbm ) \
124 - ${myconf}
125 -
126 - if use static ; then
127 - # compile all modules statically, see Bug #27392
128 - # removed cap and curses because linking failes
129 - sed -i \
130 - -e "s,link=no,link=static,g" \
131 - -e "/^name=zsh\/cap/s,link=static,link=no," \
132 - -e "/^name=zsh\/curses/s,link=static,link=no," \
133 - "${S}"/config.modules || die
134 - if ! use gdbm ; then
135 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
136 - "${S}"/config.modules || die
137 - fi
138 - fi
139 -}
140 -
141 -src_test() {
142 - addpredict /dev/ptmx
143 - local i
144 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
145 - rm "${S}"/Test/${i} || die
146 - done
147 - emake check
148 -}
149 -
150 -src_install() {
151 - emake DESTDIR="${D}" install install.info
152 -
153 - insinto /etc/zsh
154 - doins "${T}"/zprofile
155 -
156 - keepdir /usr/share/zsh/site-functions
157 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
158 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
159 -
160 - # install miscellaneous scripts; bug #54520
161 - local i
162 - sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
163 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die
164 - for i in Util Misc ; do
165 - insinto /usr/share/zsh/${PV%_*}/${i}
166 - doins ${i}/*
167 - done
168 -
169 - dodoc ChangeLog* META-FAQ NEWS README config.modules
170 -
171 - if use doc ; then
172 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
173 - dohtml -r Doc/*
174 - insinto /usr/share/doc/${PF}
175 - doins Doc/zsh.{dvi,pdf}
176 - popd >/dev/null
177 - fi
178 -
179 - docinto StartupFiles
180 - dodoc StartupFiles/z*
181 -}
182 -
183 -pkg_postinst() {
184 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
185 - # should link to https://wiki.gentoo.org/wiki/Zsh/Guide
186 - echo
187 - elog "If you want to enable Portage completions and Gentoo prompt,"
188 - elog "emerge app-shells/gentoo-zsh-completions and add"
189 - elog " autoload -U compinit promptinit"
190 - elog " compinit"
191 - elog " promptinit; prompt gentoo"
192 - elog "to your ~/.zshrc"
193 - echo
194 - elog "Also, if you want to enable cache for the completions, add"
195 - elog " zstyle ':completion::complete:*' use-cache 1"
196 - elog "to your ~/.zshrc"
197 - echo
198 - elog "Note that a system zprofile startup file is installed. This will override"
199 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
200 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
201 - elog "or other user startup files that are sourced after the system zprofile."
202 - echo
203 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
204 - elog "one method is to use a separate path-setting file that is conditionally sourced"
205 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
206 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
207 - echo
208 - fi
209 -}
210
211 diff --git a/app-shells/zsh/zsh-5.2-r1.ebuild b/app-shells/zsh/zsh-5.2-r1.ebuild
212 deleted file mode 100644
213 index 636acc06e90..00000000000
214 --- a/app-shells/zsh/zsh-5.2-r1.ebuild
215 +++ /dev/null
216 @@ -1,217 +0,0 @@
217 -# Copyright 1999-2017 Gentoo Foundation
218 -# Distributed under the terms of the GNU General Public License v2
219 -
220 -EAPI=6
221 -
222 -inherit flag-o-matic prefix
223 -
224 -if [[ ${PV} == 9999* ]] ; then
225 - inherit git-r3 autotools
226 - EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
227 -else
228 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
229 - SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
230 - doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
231 -fi
232 -
233 -DESCRIPTION="UNIX Shell similar to the Korn shell"
234 -HOMEPAGE="http://www.zsh.org/"
235 -
236 -LICENSE="ZSH gdbm? ( GPL-2 )"
237 -SLOT="0"
238 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
239 -
240 -RDEPEND="
241 - >=sys-libs/ncurses-5.1:0=
242 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
243 - caps? ( sys-libs/libcap )
244 - pcre? (
245 - >=dev-libs/libpcre-3.9
246 - static? ( >=dev-libs/libpcre-3.9[static-libs] )
247 - )
248 - gdbm? ( sys-libs/gdbm )
249 -"
250 -DEPEND="sys-apps/groff
251 - ${RDEPEND}"
252 -PDEPEND="
253 - examples? ( app-doc/zsh-lovers )
254 -"
255 -if [[ ${PV} == 9999* ]] ; then
256 - DEPEND+=" app-text/yodl
257 - doc? (
258 - sys-apps/texinfo
259 - app-text/texi2html
260 - virtual/latex-base
261 - )"
262 -fi
263 -
264 -src_prepare() {
265 - if [[ ${PV} != 9999* ]]; then
266 - # fix zshall problem with soelim
267 - ln -s Doc man1 || die
268 - mv Doc/zshall.1 Doc/zshall.1.soelim || die
269 - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
270 -
271 - # add openrc specific options for init.d completion
272 - eapply "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
273 - fi
274 -
275 - cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
276 - eprefixify "${T}"/zprofile || die
277 - if use prefix ; then
278 - sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
279 - else
280 - sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
281 - fi
282 -
283 - eapply_user
284 -
285 - if [[ ${PV} == 9999* ]] ; then
286 - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
287 - eautoreconf
288 - fi
289 -}
290 -
291 -src_configure() {
292 - local myconf=()
293 -
294 - if use static ; then
295 - myconf+=( --disable-dynamic )
296 - append-ldflags -static
297 - fi
298 - if use debug ; then
299 - myconf+=(
300 - --enable-zsh-debug
301 - --enable-zsh-mem-debug
302 - --enable-zsh-mem-warning
303 - --enable-zsh-secure-free
304 - --enable-zsh-hash-debug
305 - )
306 - fi
307 -
308 - if [[ ${CHOST} == *-darwin* ]]; then
309 - myconf+=( --enable-libs=-liconv )
310 - append-ldflags -Wl,-x
311 - fi
312 -
313 - econf \
314 - --bindir="${EPREFIX}"/bin \
315 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
316 - --enable-etcdir="${EPREFIX}"/etc/zsh \
317 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
318 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
319 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
320 - --enable-function-subdirs \
321 - --with-tcsetpgrp \
322 - $(use_enable maildir maildir-support) \
323 - $(use_enable pcre) \
324 - $(use_enable caps cap) \
325 - $(use_enable unicode multibyte) \
326 - $(use_enable gdbm ) \
327 - "${myconf[@]}"
328 -
329 - if use static ; then
330 - # compile all modules statically, see Bug #27392
331 - # removed cap and curses because linking failes
332 - sed -e "s,link=no,link=static,g" \
333 - -e "/^name=zsh\/cap/s,link=static,link=no," \
334 - -e "/^name=zsh\/curses/s,link=static,link=no," \
335 - -i "${S}"/config.modules || die
336 - if ! use gdbm ; then
337 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
338 - "${S}"/config.modules || die
339 - fi
340 - fi
341 -}
342 -
343 -src_compile() {
344 - default
345 -
346 - if [[ ${PV} == 9999* ]] && use doc ; then
347 - emake -C Doc everything
348 - fi
349 -}
350 -
351 -src_test() {
352 - addpredict /dev/ptmx
353 - local i
354 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
355 - rm "${S}"/Test/${i} || die
356 - done
357 - emake check
358 -}
359 -
360 -src_install() {
361 - emake DESTDIR="${D}" install $(usex doc "install.info" "")
362 -
363 - insinto /etc/zsh
364 - doins "${T}"/zprofile
365 -
366 - keepdir /usr/share/zsh/site-functions
367 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
368 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
369 -
370 - local i
371 -
372 - # install miscellaneous scripts (bug #54520)
373 - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
374 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
375 - -i {Util,Misc}/* || die
376 - for i in Util Misc ; do
377 - insinto /usr/share/zsh/${PV%_*}/${i}
378 - doins ${i}/*
379 - done
380 -
381 - # install header files (bug #538684)
382 - insinto /usr/include/zsh
383 - doins config.h Src/*.epro
384 - for i in Src/{zsh.mdh,*.h} ; do
385 - sed -e 's@\.\./config\.h@config.h@' \
386 - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
387 - -i "${i}"
388 - doins "${i}"
389 - done
390 -
391 - dodoc ChangeLog* META-FAQ NEWS README config.modules
392 -
393 - if use doc ; then
394 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
395 - docinto html
396 - dodoc Doc/*.html
397 - insinto /usr/share/doc/${PF}
398 - doins Doc/zsh.{dvi,pdf}
399 - popd >/dev/null
400 - fi
401 -
402 - docinto StartupFiles
403 - dodoc StartupFiles/z*
404 -}
405 -
406 -pkg_postinst() {
407 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
408 - echo
409 - elog "If you want to enable Portage completions and Gentoo prompt,"
410 - elog "emerge app-shells/gentoo-zsh-completions and add"
411 - elog " autoload -U compinit promptinit"
412 - elog " compinit"
413 - elog " promptinit; prompt gentoo"
414 - elog "to your ~/.zshrc"
415 - echo
416 - elog "Also, if you want to enable cache for the completions, add"
417 - elog " zstyle ':completion::complete:*' use-cache 1"
418 - elog "to your ~/.zshrc"
419 - echo
420 - elog "Note that a system zprofile startup file is installed. This will override"
421 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
422 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
423 - elog "or other user startup files that are sourced after the system zprofile."
424 - echo
425 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
426 - elog "one method is to use a separate path-setting file that is conditionally sourced"
427 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
428 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
429 - echo
430 - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
431 - echo
432 - fi
433 -}
434
435 diff --git a/app-shells/zsh/zsh-5.4.1.ebuild b/app-shells/zsh/zsh-5.4.1.ebuild
436 deleted file mode 100644
437 index 8919a5c5da5..00000000000
438 --- a/app-shells/zsh/zsh-5.4.1.ebuild
439 +++ /dev/null
440 @@ -1,218 +0,0 @@
441 -# Copyright 1999-2017 Gentoo Foundation
442 -# Distributed under the terms of the GNU General Public License v2
443 -
444 -EAPI=6
445 -
446 -inherit flag-o-matic prefix
447 -
448 -if [[ ${PV} == 9999* ]] ; then
449 - inherit git-r3 autotools
450 - EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
451 -else
452 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
453 - SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
454 - doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
455 -fi
456 -
457 -DESCRIPTION="UNIX Shell similar to the Korn shell"
458 -HOMEPAGE="http://www.zsh.org/"
459 -
460 -LICENSE="ZSH gdbm? ( GPL-2 )"
461 -SLOT="0"
462 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
463 -
464 -RDEPEND="
465 - >=sys-libs/ncurses-5.1:0=
466 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
467 - caps? ( sys-libs/libcap )
468 - pcre? (
469 - >=dev-libs/libpcre-3.9
470 - static? ( >=dev-libs/libpcre-3.9[static-libs] )
471 - )
472 - gdbm? ( sys-libs/gdbm )
473 - !<sys-apps/baselayout-2.4.1
474 -"
475 -DEPEND="sys-apps/groff
476 - ${RDEPEND}"
477 -PDEPEND="
478 - examples? ( app-doc/zsh-lovers )
479 -"
480 -if [[ ${PV} == 9999* ]] ; then
481 - DEPEND+=" app-text/yodl
482 - doc? (
483 - sys-apps/texinfo
484 - app-text/texi2html
485 - virtual/latex-base
486 - )"
487 -fi
488 -
489 -src_prepare() {
490 - if [[ ${PV} != 9999* ]]; then
491 - # fix zshall problem with soelim
492 - ln -s Doc man1 || die
493 - mv Doc/zshall.1 Doc/zshall.1.soelim || die
494 - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
495 -
496 - # add openrc specific options for init.d completion
497 - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
498 - fi
499 -
500 - cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
501 - eprefixify "${T}"/zprofile || die
502 - if use prefix ; then
503 - sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
504 - else
505 - sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
506 - fi
507 -
508 - eapply_user
509 -
510 - if [[ ${PV} == 9999* ]] ; then
511 - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
512 - eautoreconf
513 - fi
514 -}
515 -
516 -src_configure() {
517 - local myconf=()
518 -
519 - if use static ; then
520 - myconf+=( --disable-dynamic )
521 - append-ldflags -static
522 - fi
523 - if use debug ; then
524 - myconf+=(
525 - --enable-zsh-debug
526 - --enable-zsh-mem-debug
527 - --enable-zsh-mem-warning
528 - --enable-zsh-secure-free
529 - --enable-zsh-hash-debug
530 - )
531 - fi
532 -
533 - if [[ ${CHOST} == *-darwin* ]]; then
534 - myconf+=( --enable-libs=-liconv )
535 - append-ldflags -Wl,-x
536 - fi
537 -
538 - econf \
539 - --bindir="${EPREFIX}"/bin \
540 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
541 - --enable-etcdir="${EPREFIX}"/etc/zsh \
542 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
543 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
544 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
545 - --enable-function-subdirs \
546 - --with-tcsetpgrp \
547 - $(use_enable maildir maildir-support) \
548 - $(use_enable pcre) \
549 - $(use_enable caps cap) \
550 - $(use_enable unicode multibyte) \
551 - $(use_enable gdbm ) \
552 - "${myconf[@]}"
553 -
554 - if use static ; then
555 - # compile all modules statically, see Bug #27392
556 - # removed cap and curses because linking failes
557 - sed -e "s,link=no,link=static,g" \
558 - -e "/^name=zsh\/cap/s,link=static,link=no," \
559 - -e "/^name=zsh\/curses/s,link=static,link=no," \
560 - -i "${S}"/config.modules || die
561 - if ! use gdbm ; then
562 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
563 - "${S}"/config.modules || die
564 - fi
565 - fi
566 -}
567 -
568 -src_compile() {
569 - default
570 -
571 - if [[ ${PV} == 9999* ]] && use doc ; then
572 - emake -C Doc everything
573 - fi
574 -}
575 -
576 -src_test() {
577 - addpredict /dev/ptmx
578 - local i
579 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
580 - rm "${S}"/Test/${i} || die
581 - done
582 - emake check
583 -}
584 -
585 -src_install() {
586 - emake DESTDIR="${D}" install $(usex doc "install.info" "")
587 -
588 - insinto /etc/zsh
589 - doins "${T}"/zprofile
590 -
591 - keepdir /usr/share/zsh/site-functions
592 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
593 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
594 -
595 - local i
596 -
597 - # install miscellaneous scripts (bug #54520)
598 - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
599 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
600 - -i {Util,Misc}/* || die
601 - for i in Util Misc ; do
602 - insinto /usr/share/zsh/${PV%_*}/${i}
603 - doins ${i}/*
604 - done
605 -
606 - # install header files (bug #538684)
607 - insinto /usr/include/zsh
608 - doins config.h Src/*.epro
609 - for i in Src/{zsh.mdh,*.h} ; do
610 - sed -e 's@\.\./config\.h@config.h@' \
611 - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
612 - -i "${i}"
613 - doins "${i}"
614 - done
615 -
616 - dodoc ChangeLog* META-FAQ NEWS README config.modules
617 -
618 - if use doc ; then
619 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
620 - docinto html
621 - dodoc Doc/*.html
622 - insinto /usr/share/doc/${PF}
623 - doins Doc/zsh.{dvi,pdf}
624 - popd >/dev/null
625 - fi
626 -
627 - docinto StartupFiles
628 - dodoc StartupFiles/z*
629 -}
630 -
631 -pkg_postinst() {
632 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
633 - echo
634 - elog "If you want to enable Portage completions and Gentoo prompt,"
635 - elog "emerge app-shells/gentoo-zsh-completions and add"
636 - elog " autoload -U compinit promptinit"
637 - elog " compinit"
638 - elog " promptinit; prompt gentoo"
639 - elog "to your ~/.zshrc"
640 - echo
641 - elog "Also, if you want to enable cache for the completions, add"
642 - elog " zstyle ':completion::complete:*' use-cache 1"
643 - elog "to your ~/.zshrc"
644 - echo
645 - elog "Note that a system zprofile startup file is installed. This will override"
646 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
647 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
648 - elog "or other user startup files that are sourced after the system zprofile."
649 - echo
650 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
651 - elog "one method is to use a separate path-setting file that is conditionally sourced"
652 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
653 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
654 - echo
655 - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
656 - echo
657 - fi
658 -}
659
660 diff --git a/app-shells/zsh/zsh-5.4.2.ebuild b/app-shells/zsh/zsh-5.4.2.ebuild
661 deleted file mode 100644
662 index 2b9c7dcd500..00000000000
663 --- a/app-shells/zsh/zsh-5.4.2.ebuild
664 +++ /dev/null
665 @@ -1,218 +0,0 @@
666 -# Copyright 1999-2017 Gentoo Foundation
667 -# Distributed under the terms of the GNU General Public License v2
668 -
669 -EAPI=6
670 -
671 -inherit flag-o-matic prefix
672 -
673 -if [[ ${PV} == 9999* ]] ; then
674 - inherit git-r3 autotools
675 - EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
676 -else
677 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
678 - SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
679 - doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
680 -fi
681 -
682 -DESCRIPTION="UNIX Shell similar to the Korn shell"
683 -HOMEPAGE="https://www.zsh.org/"
684 -
685 -LICENSE="ZSH gdbm? ( GPL-2 )"
686 -SLOT="0"
687 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
688 -
689 -RDEPEND="
690 - >=sys-libs/ncurses-5.1:0=
691 - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
692 - caps? ( sys-libs/libcap )
693 - pcre? (
694 - >=dev-libs/libpcre-3.9
695 - static? ( >=dev-libs/libpcre-3.9[static-libs] )
696 - )
697 - gdbm? ( sys-libs/gdbm )
698 - !<sys-apps/baselayout-2.4.1
699 -"
700 -DEPEND="sys-apps/groff
701 - ${RDEPEND}"
702 -PDEPEND="
703 - examples? ( app-doc/zsh-lovers )
704 -"
705 -if [[ ${PV} == 9999* ]] ; then
706 - DEPEND+=" app-text/yodl
707 - doc? (
708 - sys-apps/texinfo
709 - app-text/texi2html
710 - virtual/latex-base
711 - )"
712 -fi
713 -
714 -src_prepare() {
715 - if [[ ${PV} != 9999* ]]; then
716 - # fix zshall problem with soelim
717 - ln -s Doc man1 || die
718 - mv Doc/zshall.1 Doc/zshall.1.soelim || die
719 - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
720 -
721 - # add openrc specific options for init.d completion
722 - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
723 - fi
724 -
725 - cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
726 - eprefixify "${T}"/zprofile || die
727 - if use prefix ; then
728 - sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
729 - else
730 - sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
731 - fi
732 -
733 - eapply_user
734 -
735 - if [[ ${PV} == 9999* ]] ; then
736 - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
737 - eautoreconf
738 - fi
739 -}
740 -
741 -src_configure() {
742 - local myconf=(
743 - --bindir="${EPREFIX}"/bin
744 - --libdir="${EPREFIX}"/usr/$(get_libdir)
745 - --enable-etcdir="${EPREFIX}"/etc/zsh
746 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
747 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
748 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
749 - --enable-function-subdirs
750 - --with-tcsetpgrp
751 - $(use_enable maildir maildir-support)
752 - $(use_enable pcre)
753 - $(use_enable caps cap)
754 - $(use_enable unicode multibyte)
755 - $(use_enable gdbm )
756 - )
757 -
758 - if use static ; then
759 - myconf+=( --disable-dynamic )
760 - append-ldflags -static
761 - fi
762 - if use debug ; then
763 - myconf+=(
764 - --enable-zsh-debug
765 - --enable-zsh-mem-debug
766 - --enable-zsh-mem-warning
767 - --enable-zsh-secure-free
768 - --enable-zsh-hash-debug
769 - )
770 - fi
771 -
772 - if [[ ${CHOST} == *-darwin* ]]; then
773 - myconf+=( --enable-libs=-liconv )
774 - append-ldflags -Wl,-x
775 - fi
776 -
777 - econf "${myconf[@]}"
778 -
779 - if use static ; then
780 - # compile all modules statically, see Bug #27392
781 - # removed cap and curses because linking failes
782 - sed -e "s,link=no,link=static,g" \
783 - -e "/^name=zsh\/cap/s,link=static,link=no," \
784 - -e "/^name=zsh\/curses/s,link=static,link=no," \
785 - -i "${S}"/config.modules || die
786 - if ! use gdbm ; then
787 - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
788 - "${S}"/config.modules || die
789 - fi
790 - fi
791 -}
792 -
793 -src_compile() {
794 - default
795 -
796 - if [[ ${PV} == 9999* ]] && use doc ; then
797 - emake -C Doc everything
798 - fi
799 -}
800 -
801 -src_test() {
802 - addpredict /dev/ptmx
803 - local i
804 - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
805 - rm "${S}"/Test/${i} || die
806 - done
807 - emake check
808 -}
809 -
810 -src_install() {
811 - emake DESTDIR="${D}" install $(usex doc "install.info" "")
812 -
813 - insinto /etc/zsh
814 - doins "${T}"/zprofile
815 -
816 - keepdir /usr/share/zsh/site-functions
817 - insinto /usr/share/zsh/${PV%_*}/functions/Prompts
818 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
819 -
820 - local i
821 -
822 - # install miscellaneous scripts (bug #54520)
823 - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
824 - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
825 - -i {Util,Misc}/* || die
826 - for i in Util Misc ; do
827 - insinto /usr/share/zsh/${PV%_*}/${i}
828 - doins ${i}/*
829 - done
830 -
831 - # install header files (bug #538684)
832 - insinto /usr/include/zsh
833 - doins config.h Src/*.epro
834 - for i in Src/{zsh.mdh,*.h} ; do
835 - sed -e 's@\.\./config\.h@config.h@' \
836 - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
837 - -i "${i}"
838 - doins "${i}"
839 - done
840 -
841 - dodoc ChangeLog* META-FAQ NEWS README config.modules
842 -
843 - if use doc ; then
844 - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
845 - docinto html
846 - dodoc Doc/*.html
847 - insinto /usr/share/doc/${PF}
848 - doins Doc/zsh.{dvi,pdf}
849 - popd >/dev/null
850 - fi
851 -
852 - docinto StartupFiles
853 - dodoc StartupFiles/z*
854 -}
855 -
856 -pkg_postinst() {
857 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
858 - echo
859 - elog "If you want to enable Portage completions and Gentoo prompt,"
860 - elog "emerge app-shells/gentoo-zsh-completions and add"
861 - elog " autoload -U compinit promptinit"
862 - elog " compinit"
863 - elog " promptinit; prompt gentoo"
864 - elog "to your ~/.zshrc"
865 - echo
866 - elog "Also, if you want to enable cache for the completions, add"
867 - elog " zstyle ':completion::complete:*' use-cache 1"
868 - elog "to your ~/.zshrc"
869 - echo
870 - elog "Note that a system zprofile startup file is installed. This will override"
871 - elog "PATH and possibly other variables that a user may set in ~/.zshenv."
872 - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
873 - elog "or other user startup files that are sourced after the system zprofile."
874 - echo
875 - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
876 - elog "one method is to use a separate path-setting file that is conditionally sourced"
877 - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
878 - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
879 - echo
880 - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
881 - echo
882 - fi
883 -}