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