Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/
Date: Fri, 11 Dec 2015 21:40:40
Message-Id: 1449870020.16f16831ce3fd63d5c4498049606d0a804fe2b7d.mrueg@gentoo
1 commit: 16f16831ce3fd63d5c4498049606d0a804fe2b7d
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 11 21:40:20 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 11 21:40:20 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f16831
7
8 app-shells/zsh: Version bump to 5.2
9
10 Gentoo-Bug: 567470
11
12 Package-Manager: portage-2.2.26
13
14 app-shells/zsh/Manifest | 2 +
15 app-shells/zsh/zsh-5.2.ebuild | 213 ++++++++++++++++++++++++++++++++++++++++++
16 2 files changed, 215 insertions(+)
17
18 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
19 index 782f83d..c4c636c 100644
20 --- a/app-shells/zsh/Manifest
21 +++ b/app-shells/zsh/Manifest
22 @@ -6,3 +6,5 @@ DIST zsh-5.0.8-doc.tar.bz2 3204865 SHA256 0ee5088c47fa5ceac6e087c7e00f2ede3f5920
23 DIST zsh-5.0.8.tar.bz2 3250542 SHA256 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23 SHA512 79e438e32802c030749fd1bfff07fb3e5e7f7864e5106233c6f51ea477aa5a8471449e22f262f03bf69f42e66bf39e3b8a93295a247436ce97c66409b582ceae WHIRLPOOL 3ed95b2763bd3e486104a9f935efc89fd9ff1b3d745c1c3a93181a511c2986246e4f14c6d15fd88dd735c006127523ce423150813147250343871c9e2f40f413
24 DIST zsh-5.1.1-doc.tar.xz 3061616 SHA256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f SHA512 868444662ca9b1cc91f2ecff56ce0944e5e75fc5f5a349eb538ca23a8eb8fb4ebaa8efc2ba1d8581424f25b0009305ed7a6f08ca06db1ecde467eeb5d6b71621 WHIRLPOOL c72760d754e19e7fe1f501bd395becc13877d4b0ba20fbf1f08855be5affb78aac07e2c14e779c1b554e21e29d8bfd5203dd41da5d3f21020dac7033510a4662
25 DIST zsh-5.1.1.tar.xz 2788676 SHA256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec SHA512 732f183a03125e83da11a38c638ca54a667326a23ca19418b0df27b1d5b3b1f360383d84f66bde064911effaa2ce9cbb9b6ab86deddb92f80e8f601af8a82b3e WHIRLPOOL 55199e45557c2667e8f9b7564af44b32b610fe09db451493bd64642c2987e12a638b2b96d6530a16427ba17a6ca8c20e73f88013cf47996eea24e5e1595691e7
26 +DIST zsh-5.2-doc.tar.xz 3108600 SHA256 328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a SHA512 a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0 WHIRLPOOL a6b023af9e3d94d31b56aba688c2bf3c16ff6ed1dc9db34dd970c4bf0461e24b7aab0b9113cc5f16bd87ab2ca9d973a990a3721c08500cbcd45fa2fe2d43a260
27 +DIST zsh-5.2.tar.xz 2820108 SHA256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d SHA512 9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72 WHIRLPOOL 5348ce11026a4e50d0ecf118cb379e9765cb98fcf32563489fd860ad0234c3f3aefb7f3fe28d18a97f2ddba54dc2b2cf9909b81cdc0e213f26f599ba68fd8833
28
29 diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild
30 new file mode 100644
31 index 0000000..295b2ca
32 --- /dev/null
33 +++ b/app-shells/zsh/zsh-5.2.ebuild
34 @@ -0,0 +1,213 @@
35 +# Copyright 1999-2015 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +# $Id$
38 +
39 +EAPI=5
40 +
41 +inherit eutils flag-o-matic multilib prefix
42 +
43 +if [[ ${PV} == 9999* ]] ; then
44 + inherit git-r3 autotools
45 + EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
46 +else
47 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 + SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
49 + doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
50 +fi
51 +
52 +DESCRIPTION="UNIX Shell similar to the Korn shell"
53 +HOMEPAGE="http://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 +"
69 +DEPEND="sys-apps/groff
70 + ${RDEPEND}"
71 +PDEPEND="
72 + examples? ( app-doc/zsh-lovers )
73 +"
74 +if [[ ${PV} == 9999* ]] ; then
75 + DEPEND+=" app-text/yodl
76 + doc? (
77 + sys-apps/texinfo
78 + app-text/texi2html
79 + virtual/latex-base
80 + )"
81 +fi
82 +
83 +src_prepare() {
84 + # fix zshall problem with soelim
85 + ln -s Doc man1
86 + mv Doc/zshall.1 Doc/zshall.1.soelim
87 + soelim Doc/zshall.1.soelim > Doc/zshall.1
88 +
89 + epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
90 + epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
91 +
92 + cp "${FILESDIR}"/zprofile-1 "${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 + if [[ ${PV} == 9999* ]] ; then
101 + sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
102 + eautoreconf
103 + fi
104 +}
105 +
106 +src_configure() {
107 + local myconf=()
108 +
109 + if use static ; then
110 + myconf+=( --disable-dynamic )
111 + append-ldflags -static
112 + fi
113 + if use debug ; then
114 + myconf+=(
115 + --enable-zsh-debug
116 + --enable-zsh-mem-debug
117 + --enable-zsh-mem-warning
118 + --enable-zsh-secure-free
119 + --enable-zsh-hash-debug
120 + )
121 + fi
122 +
123 + if [[ ${CHOST} == *-darwin* ]]; then
124 + myconf+=( --enable-libs=-liconv )
125 + append-ldflags -Wl,-x
126 + fi
127 +
128 + econf \
129 + --bindir="${EPREFIX}"/bin \
130 + --libdir="${EPREFIX}"/usr/$(get_libdir) \
131 + --enable-etcdir="${EPREFIX}"/etc/zsh \
132 + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
133 + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
134 + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
135 + --enable-function-subdirs \
136 + --with-tcsetpgrp \
137 + $(use_enable maildir maildir-support) \
138 + $(use_enable pcre) \
139 + $(use_enable caps cap) \
140 + $(use_enable unicode multibyte) \
141 + $(use_enable gdbm ) \
142 + "${myconf[@]}"
143 +
144 + if use static ; then
145 + # compile all modules statically, see Bug #27392
146 + # removed cap and curses because linking failes
147 + sed -e "s,link=no,link=static,g" \
148 + -e "/^name=zsh\/cap/s,link=static,link=no," \
149 + -e "/^name=zsh\/curses/s,link=static,link=no," \
150 + -i "${S}"/config.modules || die
151 + if ! use gdbm ; then
152 + sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
153 + "${S}"/config.modules || die
154 + fi
155 + fi
156 +}
157 +
158 +src_compile() {
159 + default
160 +
161 + if [[ ${PV} == 9999* ]] && use doc ; then
162 + emake -C Doc everything
163 + fi
164 +}
165 +
166 +src_test() {
167 + addpredict /dev/ptmx
168 + local i
169 + for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
170 + rm "${S}"/Test/${i} || die
171 + done
172 + emake check
173 +}
174 +
175 +src_install() {
176 + emake DESTDIR="${D}" install install.info
177 +
178 + insinto /etc/zsh
179 + doins "${T}"/zprofile
180 +
181 + keepdir /usr/share/zsh/site-functions
182 + insinto /usr/share/zsh/${PV%_*}/functions/Prompts
183 + newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
184 +
185 + local i
186 +
187 + # install miscellaneous scripts (bug #54520)
188 + sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
189 + -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
190 + -i {Util,Misc}/* || die
191 + for i in Util Misc ; do
192 + insinto /usr/share/zsh/${PV%_*}/${i}
193 + doins ${i}/*
194 + done
195 +
196 + # install header files (bug #538684)
197 + insinto /usr/include/zsh
198 + doins config.h Src/*.epro
199 + for i in Src/{zsh.mdh,*.h} ; do
200 + sed -e 's@\.\./config\.h@config.h@' \
201 + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
202 + -i "${i}"
203 + doins "${i}"
204 + done
205 +
206 + dodoc ChangeLog* META-FAQ NEWS README config.modules
207 +
208 + if use doc ; then
209 + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
210 + dohtml -r Doc/*
211 + insinto /usr/share/doc/${PF}
212 + doins Doc/zsh.{dvi,pdf}
213 + popd >/dev/null
214 + fi
215 +
216 + docinto StartupFiles
217 + dodoc StartupFiles/z*
218 +}
219 +
220 +pkg_postinst() {
221 + if [[ -z ${REPLACING_VERSIONS} ]] ; then
222 + echo
223 + elog "If you want to enable Portage completions and Gentoo prompt,"
224 + elog "emerge app-shells/gentoo-zsh-completions and add"
225 + elog " autoload -U compinit promptinit"
226 + elog " compinit"
227 + elog " promptinit; prompt gentoo"
228 + elog "to your ~/.zshrc"
229 + echo
230 + elog "Also, if you want to enable cache for the completions, add"
231 + elog " zstyle ':completion::complete:*' use-cache 1"
232 + elog "to your ~/.zshrc"
233 + echo
234 + elog "Note that a system zprofile startup file is installed. This will override"
235 + elog "PATH and possibly other variables that a user may set in ~/.zshenv."
236 + elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
237 + elog "or other user startup files that are sourced after the system zprofile."
238 + echo
239 + elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
240 + elog "one method is to use a separate path-setting file that is conditionally sourced"
241 + elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
242 + elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
243 + echo
244 + elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
245 + echo
246 + fi
247 +}