Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/
Date: Sun, 08 Apr 2018 23:00:52
Message-Id: 1523228436.966419a9d1bb85eba634b631673574cfa9d10677.radhermit@gentoo
1 commit: 966419a9d1bb85eba634b631673574cfa9d10677
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 8 22:59:30 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 23:00:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966419a9
7
8 app-shells/zsh: version bump to 5.5
9
10 app-shells/zsh/Manifest | 2 +
11 app-shells/zsh/zsh-5.5.ebuild | 211 ++++++++++++++++++++++++++++++++++++++++++
12 2 files changed, 213 insertions(+)
13
14 diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
15 index 4d8f8bdd00b..0aebbf13b34 100644
16 --- a/app-shells/zsh/Manifest
17 +++ b/app-shells/zsh/Manifest
18 @@ -2,3 +2,5 @@ DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee047
19 DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
20 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
21 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
22 +DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec978e6ad9c244b25f5249e07c22768ba30e67f02c8ebf4a0a8104997d0aa8959de7e3c39a428dca0b013c56e9b1 SHA512 0bde166bc4a4b8ea7512bd9d3ede53478959cb76ded65488b9a8993734cf2a8ffedcd38254fbf6ff73a5841289cb65715579744b10748afb038c9d93a01f987b
23 +DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
24
25 diff --git a/app-shells/zsh/zsh-5.5.ebuild b/app-shells/zsh/zsh-5.5.ebuild
26 new file mode 100644
27 index 00000000000..4c17da09db4
28 --- /dev/null
29 +++ b/app-shells/zsh/zsh-5.5.ebuild
30 @@ -0,0 +1,211 @@
31 +# Copyright 1999-2018 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI=6
35 +
36 +inherit flag-o-matic prefix
37 +
38 +if [[ ${PV} == 9999* ]] ; then
39 + inherit git-r3 autotools
40 + EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
41 +else
42 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
43 + SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
44 + doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
45 +fi
46 +
47 +DESCRIPTION="UNIX Shell similar to the Korn shell"
48 +HOMEPAGE="https://www.zsh.org/"
49 +
50 +LICENSE="ZSH gdbm? ( GPL-2 )"
51 +SLOT="0"
52 +IUSE="caps debug doc examples gdbm maildir pcre static unicode"
53 +
54 +RDEPEND="
55 + >=sys-libs/ncurses-5.1:0=
56 + static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
57 + caps? ( sys-libs/libcap )
58 + pcre? (
59 + >=dev-libs/libpcre-3.9
60 + static? ( >=dev-libs/libpcre-3.9[static-libs] )
61 + )
62 + gdbm? ( sys-libs/gdbm:= )
63 + !<sys-apps/baselayout-2.4.1
64 +"
65 +DEPEND="sys-apps/groff
66 + ${RDEPEND}"
67 +PDEPEND="
68 + examples? ( app-doc/zsh-lovers )
69 +"
70 +if [[ ${PV} == 9999* ]] ; then
71 + DEPEND+=" app-text/yodl
72 + doc? (
73 + sys-apps/texinfo
74 + app-text/texi2html
75 + virtual/latex-base
76 + )"
77 +fi
78 +
79 +src_prepare() {
80 + if [[ ${PV} != 9999* ]]; then
81 + # fix zshall problem with soelim
82 + ln -s Doc man1 || die
83 + mv Doc/zshall.1 Doc/zshall.1.soelim || die
84 + soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
85 +
86 + # add openrc specific options for init.d completion
87 + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
88 + fi
89 +
90 + eapply_user
91 +
92 + if [[ ${PV} == 9999* ]] ; then
93 + sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
94 + eautoreconf
95 + fi
96 +}
97 +
98 +src_configure() {
99 + local myconf=(
100 + --bindir="${EPREFIX}"/bin
101 + --libdir="${EPREFIX}"/usr/$(get_libdir)
102 + --enable-etcdir="${EPREFIX}"/etc/zsh
103 + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
104 + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
105 + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
106 + --enable-function-subdirs
107 + --with-tcsetpgrp
108 + $(use_enable maildir maildir-support)
109 + $(use_enable pcre)
110 + $(use_enable caps cap)
111 + $(use_enable unicode multibyte)
112 + $(use_enable gdbm )
113 + )
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 "${myconf[@]}"
135 +
136 + if use static ; then
137 + # compile all modules statically, see Bug #27392
138 + # removed cap and curses because linking failes
139 + sed -e "s,link=no,link=static,g" \
140 + -e "/^name=zsh\/cap/s,link=static,link=no," \
141 + -e "/^name=zsh\/curses/s,link=static,link=no," \
142 + -i "${S}"/config.modules || die
143 + if ! use gdbm ; then
144 + sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
145 + "${S}"/config.modules || die
146 + fi
147 + fi
148 +}
149 +
150 +src_compile() {
151 + default
152 +
153 + if [[ ${PV} == 9999* ]] && use doc ; then
154 + emake -C Doc everything
155 + fi
156 +}
157 +
158 +src_test() {
159 + addpredict /dev/ptmx
160 + local i
161 + for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
162 + rm "${S}"/Test/${i} || die
163 + done
164 + emake check
165 +}
166 +
167 +src_install() {
168 + emake DESTDIR="${D}" install $(usex doc "install.info" "")
169 +
170 + insinto /etc/zsh
171 + export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
172 + newins "$(prefixify_ro "${FILESDIR}"/zprofile-3)" zprofile
173 +
174 + keepdir /usr/share/zsh/site-functions
175 + insinto /usr/share/zsh/${PV%_*}/functions/Prompts
176 + newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
177 +
178 + local i
179 +
180 + # install miscellaneous scripts (bug #54520)
181 + sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
182 + -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
183 + -i {Util,Misc}/* || die
184 + for i in Util Misc ; do
185 + insinto /usr/share/zsh/${PV%_*}/${i}
186 + doins ${i}/*
187 + done
188 +
189 + # install header files (bug #538684)
190 + insinto /usr/include/zsh
191 + doins config.h Src/*.epro
192 + for i in Src/{zsh.mdh,*.h} ; do
193 + sed -e 's@\.\./config\.h@config.h@' \
194 + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
195 + -i "${i}"
196 + doins "${i}"
197 + done
198 +
199 + dodoc ChangeLog* META-FAQ NEWS README config.modules
200 +
201 + if use doc ; then
202 + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
203 + docinto html
204 + dodoc Doc/*.html
205 + insinto /usr/share/doc/${PF}
206 + doins Doc/zsh.{dvi,pdf}
207 + popd >/dev/null
208 + fi
209 +
210 + docinto StartupFiles
211 + dodoc StartupFiles/z*
212 +}
213 +
214 +pkg_postinst() {
215 + if [[ -z ${REPLACING_VERSIONS} ]] ; then
216 + echo
217 + elog "If you want to enable Portage completions and Gentoo prompt,"
218 + elog "emerge app-shells/gentoo-zsh-completions and add"
219 + elog " autoload -U compinit promptinit"
220 + elog " compinit"
221 + elog " promptinit; prompt gentoo"
222 + elog "to your ~/.zshrc"
223 + echo
224 + elog "Also, if you want to enable cache for the completions, add"
225 + elog " zstyle ':completion::complete:*' use-cache 1"
226 + elog "to your ~/.zshrc"
227 + echo
228 + elog "Note that a system zprofile startup file is installed. This will override"
229 + elog "PATH and possibly other variables that a user may set in ~/.zshenv."
230 + elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
231 + elog "or other user startup files that are sourced after the system zprofile."
232 + echo
233 + elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
234 + elog "one method is to use a separate path-setting file that is conditionally sourced"
235 + elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
236 + elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
237 + echo
238 + elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
239 + echo
240 + fi
241 +}