1 |
commit: 362bd5a6bd1fee31e38ee439fadb4e5ca7011b32 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 29 22:22:50 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 29 22:26:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362bd5a6 |
7 |
|
8 |
app-shells/zsh: Bump to version 5.4.2 |
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.4.2.ebuild | 218 ++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 220 insertions(+) |
15 |
|
16 |
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest |
17 |
index 72c3a8796c3..3a741d9ad0c 100644 |
18 |
--- a/app-shells/zsh/Manifest |
19 |
+++ b/app-shells/zsh/Manifest |
20 |
@@ -8,3 +8,5 @@ DIST zsh-5.3.1.tar.xz 2928832 SHA256 fc886cb2ade032d006da8322c09a7e92b2309177811 |
21 |
DIST zsh-5.3.tar.xz 2928684 SHA256 76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a SHA512 b34da1a062954ccb166b0a22fa48b0d08bdb8f50fd96cb391f04887c0bf416e771ceaa8af8fa7da2dc2e6f7c3ecce5c92c4e3bee21fd93e467849c8febc021b0 WHIRLPOOL 9d52e36528c2272e2de33144bd76ddb50e505ecc2dec13e332c9e9185be1e919b5f4276de052b0d558d5f809c0437d1a85491924a6febd143dcfced53c323c81 |
22 |
DIST zsh-5.4.1-doc.tar.xz 3197560 SHA256 b8b1a40aeec852806ad2b74b0a0c534320bf517e2fe2a087c0c9d39e75dc29f1 SHA512 2cc2c87dd408fba68a483fb33323abb2d3ecd66c2f4042fd4e1cff13d83df819075f54ef72c9ab6dfc98638948653e4210f2b8c0ea5c40e3b993e93bd77ee8a0 WHIRLPOOL d279964f59386d9a4cecf53998bb90b5c99b9331a06641bbe352445f27f8d6868214ea257e238e3179bdda0a22e46d4716853209ae4f01ad232ffe7615dec785 |
23 |
DIST zsh-5.4.1.tar.xz 2972824 SHA256 94cbd57508287e8faa081424509738d496f5f41e32ed890e3a5498ce05d3633b SHA512 c666c54b05e2707e3a3cf9a87a17863792f0c89ec14f5fdc85a3064f26249cfba42a2953bc76bb90205fb87a08c203a165a5240c9fd6c489c13d8cc82ee6e979 WHIRLPOOL efc33f3bfc79013dd51c4cde14c99fafe51ee18b69d2aaaa6d244d1cc3fe2845633edb9183bf2db0e6df02cc4329ca3d59e1dacba9328ed68c72f0e7b8dac35e |
24 |
+DIST zsh-5.4.2-doc.tar.xz 3198880 SHA256 5229cc93ebe637a07deb5b386b705c37a50f4adfef788b3c0f6647741df4f6bd SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7 WHIRLPOOL 52bd2e26704c4a547ab2f0d0c256618995f32f3698dd3b6074e0fa340984dcbd0cf5fba31a9f4058a80d3daaad266f94eaea18a0e8a8abfbe237da45e654f254 |
25 |
+DIST zsh-5.4.2.tar.gz 4482413 SHA256 957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2 WHIRLPOOL a8edf0bda87c56694f4774e071375f251106c6650d6956fc12007d4f1d9b2b1728a35432b611677a9db2c89ce1d6e30c0d5e068bacfcb03b008bb08379d4a031 |
26 |
|
27 |
diff --git a/app-shells/zsh/zsh-5.4.2.ebuild b/app-shells/zsh/zsh-5.4.2.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..dfbabed7e84 |
30 |
--- /dev/null |
31 |
+++ b/app-shells/zsh/zsh-5.4.2.ebuild |
32 |
@@ -0,0 +1,218 @@ |
33 |
+# Copyright 1999-2017 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=6 |
37 |
+ |
38 |
+inherit flag-o-matic prefix |
39 |
+ |
40 |
+if [[ ${PV} == 9999* ]] ; then |
41 |
+ inherit git-r3 autotools |
42 |
+ EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" |
43 |
+else |
44 |
+ 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" |
45 |
+ SRC_URI="http://www.zsh.org/pub/${P}.tar.gz |
46 |
+ doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )" |
47 |
+fi |
48 |
+ |
49 |
+DESCRIPTION="UNIX Shell similar to the Korn shell" |
50 |
+HOMEPAGE="http://www.zsh.org/" |
51 |
+ |
52 |
+LICENSE="ZSH gdbm? ( GPL-2 )" |
53 |
+SLOT="0" |
54 |
+IUSE="caps debug doc examples gdbm maildir pcre static unicode" |
55 |
+ |
56 |
+RDEPEND=" |
57 |
+ >=sys-libs/ncurses-5.1:0= |
58 |
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) |
59 |
+ caps? ( sys-libs/libcap ) |
60 |
+ pcre? ( |
61 |
+ >=dev-libs/libpcre-3.9 |
62 |
+ static? ( >=dev-libs/libpcre-3.9[static-libs] ) |
63 |
+ ) |
64 |
+ gdbm? ( sys-libs/gdbm ) |
65 |
+ !<sys-apps/baselayout-2.4.1 |
66 |
+" |
67 |
+DEPEND="sys-apps/groff |
68 |
+ ${RDEPEND}" |
69 |
+PDEPEND=" |
70 |
+ examples? ( app-doc/zsh-lovers ) |
71 |
+" |
72 |
+if [[ ${PV} == 9999* ]] ; then |
73 |
+ DEPEND+=" app-text/yodl |
74 |
+ doc? ( |
75 |
+ sys-apps/texinfo |
76 |
+ app-text/texi2html |
77 |
+ virtual/latex-base |
78 |
+ )" |
79 |
+fi |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ if [[ ${PV} != 9999* ]]; then |
83 |
+ # fix zshall problem with soelim |
84 |
+ ln -s Doc man1 || die |
85 |
+ mv Doc/zshall.1 Doc/zshall.1.soelim || die |
86 |
+ soelim Doc/zshall.1.soelim > Doc/zshall.1 || die |
87 |
+ |
88 |
+ # add openrc specific options for init.d completion |
89 |
+ eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff |
90 |
+ fi |
91 |
+ |
92 |
+ cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die |
93 |
+ eprefixify "${T}"/zprofile || die |
94 |
+ if use prefix ; then |
95 |
+ sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die |
96 |
+ else |
97 |
+ sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die |
98 |
+ fi |
99 |
+ |
100 |
+ eapply_user |
101 |
+ |
102 |
+ if [[ ${PV} == 9999* ]] ; then |
103 |
+ sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die |
104 |
+ eautoreconf |
105 |
+ fi |
106 |
+} |
107 |
+ |
108 |
+src_configure() { |
109 |
+ local myconf=( |
110 |
+ --bindir="${EPREFIX}"/bin |
111 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) |
112 |
+ --enable-etcdir="${EPREFIX}"/etc/zsh |
113 |
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help |
114 |
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions |
115 |
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions |
116 |
+ --enable-function-subdirs |
117 |
+ --with-tcsetpgrp |
118 |
+ $(use_enable maildir maildir-support) |
119 |
+ $(use_enable pcre) |
120 |
+ $(use_enable caps cap) |
121 |
+ $(use_enable unicode multibyte) |
122 |
+ $(use_enable gdbm ) |
123 |
+ ) |
124 |
+ |
125 |
+ if use static ; then |
126 |
+ myconf+=( --disable-dynamic ) |
127 |
+ append-ldflags -static |
128 |
+ fi |
129 |
+ if use debug ; then |
130 |
+ myconf+=( |
131 |
+ --enable-zsh-debug |
132 |
+ --enable-zsh-mem-debug |
133 |
+ --enable-zsh-mem-warning |
134 |
+ --enable-zsh-secure-free |
135 |
+ --enable-zsh-hash-debug |
136 |
+ ) |
137 |
+ fi |
138 |
+ |
139 |
+ if [[ ${CHOST} == *-darwin* ]]; then |
140 |
+ myconf+=( --enable-libs=-liconv ) |
141 |
+ append-ldflags -Wl,-x |
142 |
+ fi |
143 |
+ |
144 |
+ econf "${myconf[@]}" |
145 |
+ |
146 |
+ if use static ; then |
147 |
+ # compile all modules statically, see Bug #27392 |
148 |
+ # removed cap and curses because linking failes |
149 |
+ sed -e "s,link=no,link=static,g" \ |
150 |
+ -e "/^name=zsh\/cap/s,link=static,link=no," \ |
151 |
+ -e "/^name=zsh\/curses/s,link=static,link=no," \ |
152 |
+ -i "${S}"/config.modules || die |
153 |
+ if ! use gdbm ; then |
154 |
+ sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ |
155 |
+ "${S}"/config.modules || die |
156 |
+ fi |
157 |
+ fi |
158 |
+} |
159 |
+ |
160 |
+src_compile() { |
161 |
+ default |
162 |
+ |
163 |
+ if [[ ${PV} == 9999* ]] && use doc ; then |
164 |
+ emake -C Doc everything |
165 |
+ fi |
166 |
+} |
167 |
+ |
168 |
+src_test() { |
169 |
+ addpredict /dev/ptmx |
170 |
+ local i |
171 |
+ for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do |
172 |
+ rm "${S}"/Test/${i} || die |
173 |
+ done |
174 |
+ emake check |
175 |
+} |
176 |
+ |
177 |
+src_install() { |
178 |
+ emake DESTDIR="${D}" install $(usex doc "install.info" "") |
179 |
+ |
180 |
+ insinto /etc/zsh |
181 |
+ doins "${T}"/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 |
+} |