From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PfGQR-0006pw-QV for garchives@archives.gentoo.org; Tue, 18 Jan 2011 18:37:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA25AE09CA; Tue, 18 Jan 2011 18:36:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B04BE09CA for ; Tue, 18 Jan 2011 18:36:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1B4E1B41E9 for ; Tue, 18 Jan 2011 18:36:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 902) id 5F76820057; Tue, 18 Jan 2011 18:36:54 +0000 (UTC) From: "Torsten Veller (tove)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tove@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-shells/zsh: ChangeLog zsh-4.3.11-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog zsh-4.3.11-r1.ebuild X-VCS-Directories: app-shells/zsh X-VCS-Committer: tove X-VCS-Committer-Name: Torsten Veller Content-Type: text/plain; charset=utf8 Message-Id: <20110118183654.5F76820057@flycatcher.gentoo.org> Date: Tue, 18 Jan 2011 18:36:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 46bf92e4cdd5438f43ae961698c5205e tove 11/01/18 18:36:54 Modified: ChangeLog Added: zsh-4.3.11-r1.ebuild Log: Fix crash with ${:0:} (#352056). Thanks to Christian Ruppert =20 (Portage version: 2.2.0_alpha15/cvs/Linux x86_64) Revision Changes Path 1.160 app-shells/zsh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/Cha= ngeLog?rev=3D1.160&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/Cha= ngeLog?rev=3D1.160&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/Cha= ngeLog?r1=3D1.159&r2=3D1.160 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- ChangeLog 3 Jan 2011 09:36:11 -0000 1.159 +++ ChangeLog 18 Jan 2011 18:36:54 -0000 1.160 @@ -1,6 +1,12 @@ # ChangeLog for app-shells/zsh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.159 2011= /01/03 09:36:11 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.160 2011= /01/18 18:36:54 tove Exp $ + +*zsh-4.3.11-r1 (18 Jan 2011) + + 18 Jan 2011; Torsten Veller +files/4.3.11-subst.patc= h, + +zsh-4.3.11-r1.ebuild: + Fix crash with ${:0:} (#352056). Thanks to Christian Ruppert =20 03 Jan 2011; Torsten Veller -zsh-4.3.4-r1.ebuild, -files/zsh-4.3.4-configure-changequote.patch, 1.1 app-shells/zsh/zsh-4.3.11-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh= -4.3.11-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh= -4.3.11-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: zsh-4.3.11-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.11-r1.ebuild,v = 1.1 2011/01/18 18:36:54 tove Exp $ EAPI=3D3 # doc package for -dev version exists? doc_available=3Dtrue inherit eutils flag-o-matic multilib prefix MY_PV=3D${PV/_p/-dev-} S=3D${WORKDIR}/${PN}-${MY_PV} zsh_ftp=3D"ftp://ftp.zsh.org/pub" if [[ ${PV} !=3D "${MY_PV}" ]] ; then ZSH_URI=3D"${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2" if ${doc_available} ; then ZSH_DOC_URI=3D"${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2" else ZSH_DOC_URI=3D"${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" fi else ZSH_URI=3D"mirror://sourceforge/${PN}/${P}.tar.bz2 ${zsh_ftp}/${P}.tar.bz2" ZSH_DOC_URI=3D"${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" fi LOVERS_PV=3D0.8.3 LOVERS_P=3Dzsh-lovers LOVERS_URI=3D"http://deb.grml.org/pool/main/z/zsh-lovers" DESCRIPTION=3D"UNIX Shell similar to the Korn shell" HOMEPAGE=3D"http://www.zsh.org/" SRC_URI=3D"${ZSH_URI} examples? ( ${LOVERS_URI}/${LOVERS_P}_${LOVERS_PV}.tar.gz ) doc? ( ${ZSH_DOC_URI} )" LICENSE=3D"ZSH gdbm? ( GPL-2 )" SLOT=3D"0" KEYWORDS=3D"~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-so= laris ~x86-solaris" IUSE=3D"caps debug doc examples gdbm maildir pcre static unicode" RDEPEND=3D">=3Dsys-libs/ncurses-5.1 static? ( || ( >=3Dsys-libs/ncurses-5.7-r4[static-libs] =3Ddev-libs/libpcre-3.9 static? ( >=3Ddev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )" DEPEND=3D"|| ( sys-apps/groff app-doc/heirloom-doctools ) examples? ( app-text/asciidoc ) ${RDEPEND}" src_prepare() { # fix zshall problem with soelim ln -s Doc man1 mv Doc/zshall.1 Doc/zshall.1.soelim soelim Doc/zshall.1.soelim > Doc/zshall.1 epatch "${FILESDIR}/${PN}"-init.d-gentoo-r1.diff \ "${FILESDIR}"/4.3.11-subst.patch cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die eprefixify "${T}"/zprofile || die if use prefix ; then sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || = die else sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/= zprofile || die fi } src_configure() { local myconf=3D if use static ; then myconf+=3D" --disable-dynamic" append-ldflags -static fi if use debug ; then myconf+=3D" \ --enable-zsh-debug \ --enable-zsh-mem-debug \ --enable-zsh-mem-warning \ --enable-zsh-secure-free \ --enable-zsh-hash-debug" fi if [[ ${CHOST} =3D=3D *-darwin* ]]; then myconf+=3D" --enable-libs=3D-liconv" append-ldflags -Wl,-x fi econf \ --bindir=3D"${EPREFIX}"/bin \ --libdir=3D"${EPREFIX}"/usr/$(get_libdir) \ --enable-etcdir=3D"${EPREFIX}"/etc/zsh \ --enable-fndir=3D"${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \ --enable-site-fndir=3D"${EPREFIX}"/usr/share/zsh/site-functions \ --enable-function-subdirs \ --with-term-lib=3D"ncursesw ncurses" \ --with-tcsetpgrp \ $(use_enable maildir maildir-support) \ $(use_enable pcre) \ $(use_enable caps cap) \ $(use_enable unicode multibyte) \ $(use_enable gdbm ) \ ${myconf} if use static ; then # compile all modules statically, see Bug #27392 # removed cap and curses because linking failes sed -i \ -e "s,link=3Dno,link=3Dstatic,g" \ -e "/^name=3Dzsh\/cap/s,link=3Dstatic,link=3Dno," \ -e "/^name=3Dzsh\/curses/s,link=3Dstatic,link=3Dno," \ "${S}"/config.modules || die if ! use gdbm ; then sed -i '/^name=3Dzsh\/db\/gdbm/s,link=3Dstatic,link=3Dno,' \ "${S}"/config.modules || die fi # else # sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Mak= efile fi } src_test() { local i addpredict /dev/ptmx for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.= ztst ; do rm "${S}"/Test/${i} || die done make check || die "make check failed" } src_install() { emake DESTDIR=3D"${D}" install install.info || die insinto /etc/zsh doins "${T}"/zprofile || die keepdir /usr/share/zsh/site-functions insinto /usr/share/zsh/${PV%_*}/functions/Prompts newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup || die # install miscellaneous scripts; bug #54520 local i sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || = die for i in Util Misc ; do insinto /usr/share/zsh/${PV%_*}/${i} doins ${i}/* || die done dodoc ChangeLog* META-FAQ NEWS README config.modules if use doc ; then pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null dohtml -r Doc/* || die insinto /usr/share/doc/${PF} doins Doc/zsh.{dvi,pdf} || die popd >/dev/null fi if use examples ; then pushd "${WORKDIR}/${LOVERS_P/.orig/}" >/dev/null asciidoc zsh-lovers.1.txt mv zsh-lovers.1.html zsh-lovers.html || die a2x -f manpage zsh-lovers.1.txt || die #a2x -f pdf zsh-lovers.1.txt || die #mv zsh-lovers.1.pdf zsh-lovers.pdf || die doman zsh-lovers.1 || die "doman zsh-lovers failed" dohtml zsh-lovers.html || die "dohtml zsh-lovers failed" docinto zsh-lovers dodoc zsh.vim README || die insinto /usr/share/doc/${PF}/zsh-lovers doins refcard.pdf || die # doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die doins -r zsh_people || die "doins zsh_people failed" popd >/dev/null fi docinto StartupFiles dodoc StartupFiles/z* } pkg_postinst() { # should link to http://www.gentoo.org/doc/en/zsh.xml elog elog "If you want to enable Portage completions and Gentoo prompt," elog "emerge app-shells/zsh-completion and add" elog " autoload -U compinit promptinit" elog " compinit" elog " promptinit; prompt gentoo" elog "to your ~/.zshrc" elog elog "Also, if you want to enable cache for the completions, add" elog " zstyle ':completion::complete:*' use-cache 1" elog "to your ~/.zshrc" elog }