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