Gentoo Archives: gentoo-commits

From: "Torsten Veller (tove)" <tove@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-shells/zsh: ChangeLog zsh-4.3.11.ebuild
Date: Mon, 03 Jan 2011 09:31:46
Message-Id: 20110103093137.F29E220057@flycatcher.gentoo.org
1 tove 11/01/03 09:31:37
2
3 Modified: ChangeLog
4 Added: zsh-4.3.11.ebuild
5 Log:
6 Version bump (#349291)
7
8 (Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.158 app-shells/zsh/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?rev=1.158&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?rev=1.158&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?r1=1.157&r2=1.158
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v
20 retrieving revision 1.157
21 retrieving revision 1.158
22 diff -u -r1.157 -r1.158
23 --- ChangeLog 1 Nov 2010 19:02:52 -0000 1.157
24 +++ ChangeLog 3 Jan 2011 09:31:37 -0000 1.158
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-shells/zsh
27 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.157 2010/11/01 19:02:52 halcy0n Exp $
29 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.158 2011/01/03 09:31:37 tove Exp $
31 +
32 +*zsh-4.3.11 (03 Jan 2011)
33 +
34 + 03 Jan 2011; Torsten Veller <tove@g.o> +zsh-4.3.11.ebuild,
35 + +files/zsh-init.d-gentoo-r1.diff:
36 + Version bump (#349291). Thanks to David Bitseff
37
38 01 Nov 2010; Mark Loeser <halcy0n@g.o> zsh-4.3.10-r2.ebuild:
39 Stable on ppc64; bug #297117
40
41
42
43 1.1 app-shells/zsh/zsh-4.3.11.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-4.3.11.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-4.3.11.ebuild?rev=1.1&content-type=text/plain
47
48 Index: zsh-4.3.11.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.11.ebuild,v 1.1 2011/01/03 09:31:37 tove Exp $
53
54 EAPI=3
55
56 # doc package for -dev version exists?
57 doc_available=true
58
59 inherit eutils flag-o-matic multilib prefix
60
61 MY_PV=${PV/_p/-dev-}
62 S=${WORKDIR}/${PN}-${MY_PV}
63
64 zsh_ftp="ftp://ftp.zsh.org/pub"
65
66 if [[ ${PV} != "${MY_PV}" ]] ; then
67 ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2"
68 if ${doc_available} ; then
69 ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2"
70 else
71 ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
72 fi
73 else
74 ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
75 ${zsh_ftp}/${P}.tar.bz2"
76 ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
77 fi
78
79 LOVERS_PV=0.8.3
80 LOVERS_P=zsh-lovers
81 LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
82
83 DESCRIPTION="UNIX Shell similar to the Korn shell"
84 HOMEPAGE="http://www.zsh.org/"
85 SRC_URI="${ZSH_URI}
86 examples? ( ${LOVERS_URI}/${LOVERS_P}_${LOVERS_PV}.tar.gz )
87 doc? ( ${ZSH_DOC_URI} )"
88
89 LICENSE="ZSH gdbm? ( GPL-2 )"
90 SLOT="0"
91 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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"
92 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
93
94 RDEPEND=">=sys-libs/ncurses-5.1
95 static? ( || ( >=sys-libs/ncurses-5.7-r4[static-libs] <sys-libs/ncurses-5.7-r4 ) )
96 caps? ( sys-libs/libcap )
97 pcre? ( >=dev-libs/libpcre-3.9
98 static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
99 gdbm? ( sys-libs/gdbm )"
100 DEPEND="|| ( sys-apps/groff app-doc/heirloom-doctools )
101 examples? ( app-text/asciidoc )
102 ${RDEPEND}"
103
104 src_prepare() {
105 # fix zshall problem with soelim
106 ln -s Doc man1
107 mv Doc/zshall.1 Doc/zshall.1.soelim
108 soelim Doc/zshall.1.soelim > Doc/zshall.1
109
110 epatch "${FILESDIR}/${PN}"-init.d-gentoo-r1.diff
111
112 cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
113 eprefixify "${T}"/zprofile || die
114 if use prefix ; then
115 sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
116 else
117 sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
118 fi
119 }
120
121 src_configure() {
122 local myconf=
123
124 if use static ; then
125 myconf+=" --disable-dynamic"
126 append-ldflags -static
127 fi
128 if use debug ; then
129 myconf+=" \
130 --enable-zsh-debug \
131 --enable-zsh-mem-debug \
132 --enable-zsh-mem-warning \
133 --enable-zsh-secure-free \
134 --enable-zsh-hash-debug"
135 fi
136
137 if [[ ${CHOST} == *-darwin* ]]; then
138 myconf+=" --enable-libs=-liconv"
139 append-ldflags -Wl,-x
140 fi
141
142 econf \
143 --bindir="${EPREFIX}"/bin \
144 --libdir="${EPREFIX}"/usr/$(get_libdir) \
145 --enable-etcdir="${EPREFIX}"/etc/zsh \
146 --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
147 --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
148 --enable-function-subdirs \
149 --with-term-lib="ncursesw ncurses" \
150 --with-tcsetpgrp \
151 $(use_enable maildir maildir-support) \
152 $(use_enable pcre) \
153 $(use_enable caps cap) \
154 $(use_enable unicode multibyte) \
155 $(use_enable gdbm ) \
156 ${myconf}
157
158 if use static ; then
159 # compile all modules statically, see Bug #27392
160 # removed cap and curses because linking failes
161 sed -i \
162 -e "s,link=no,link=static,g" \
163 -e "/^name=zsh\/cap/s,link=static,link=no," \
164 -e "/^name=zsh\/curses/s,link=static,link=no," \
165 "${S}"/config.modules || die
166 if ! use gdbm ; then
167 sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
168 "${S}"/config.modules || die
169 fi
170 # else
171 # sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
172 fi
173 }
174
175 src_test() {
176 local i
177 addpredict /dev/ptmx
178 for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
179 rm "${S}"/Test/${i} || die
180 done
181 make check || die "make check failed"
182 }
183
184 src_install() {
185 emake DESTDIR="${D}" install install.info || die
186
187 insinto /etc/zsh
188 doins "${T}"/zprofile || die
189
190 keepdir /usr/share/zsh/site-functions
191 insinto /usr/share/zsh/${PV%_*}/functions/Prompts
192 newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup || die
193
194 # install miscellaneous scripts; bug #54520
195 local i
196 sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
197 -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die
198 for i in Util Misc ; do
199 insinto /usr/share/zsh/${PV%_*}/${i}
200 doins ${i}/* || die
201 done
202
203 dodoc ChangeLog* META-FAQ NEWS README config.modules
204
205 if use doc ; then
206 pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
207 dohtml -r Doc/* || die
208 insinto /usr/share/doc/${PF}
209 doins Doc/zsh.{dvi,pdf} || die
210 popd >/dev/null
211 fi
212
213 if use examples ; then
214 pushd "${WORKDIR}/${LOVERS_P/.orig/}" >/dev/null
215 asciidoc zsh-lovers.1.txt
216 mv zsh-lovers.1.html zsh-lovers.html || die
217 a2x -f manpage zsh-lovers.1.txt || die
218 #a2x -f pdf zsh-lovers.1.txt || die
219 #mv zsh-lovers.1.pdf zsh-lovers.pdf || die
220
221 doman zsh-lovers.1 || die "doman zsh-lovers failed"
222 dohtml zsh-lovers.html || die "dohtml zsh-lovers failed"
223 docinto zsh-lovers
224 dodoc zsh.vim README || die
225 insinto /usr/share/doc/${PF}/zsh-lovers
226 doins refcard.pdf || die
227 # doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
228 doins -r zsh_people || die "doins zsh_people failed"
229 popd >/dev/null
230 fi
231
232 docinto StartupFiles
233 dodoc StartupFiles/z*
234 }
235
236 pkg_postinst() {
237 # should link to http://www.gentoo.org/doc/en/zsh.xml
238 elog
239 elog "If you want to enable Portage completions and Gentoo prompt,"
240 elog "emerge app-shells/zsh-completion and add"
241 elog " autoload -U compinit promptinit"
242 elog " compinit"
243 elog " promptinit; prompt gentoo"
244 elog "to your ~/.zshrc"
245 elog
246 elog "Also, if you want to enable cache for the completions, add"
247 elog " zstyle ':completion::complete:*' use-cache 1"
248 elog "to your ~/.zshrc"
249 elog
250 }