radhermit 15/06/21 05:07:22 Modified: ChangeLog zsh-9999.ebuild Added: zsh-5.0.8.ebuild Log: Version bump, install header files (bug #538684). (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path 1.251 app-shells/zsh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?rev=1.251&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?rev=1.251&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/ChangeLog?r1=1.250&r2=1.251 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- ChangeLog 4 Jan 2015 01:34:42 -0000 1.250 +++ ChangeLog 21 Jun 2015 05:07:22 -0000 1.251 @@ -1,6 +1,12 @@ # ChangeLog for app-shells/zsh # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.250 2015/01/04 01:34:42 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.251 2015/06/21 05:07:22 radhermit Exp $ + +*zsh-5.0.8 (21 Jun 2015) + + 21 Jun 2015; Tim Harder <[email protected]> +zsh-5.0.8.ebuild, + zsh-9999.ebuild: + Version bump, install header files (bug #538684). 04 Jan 2015; Tim Harder <[email protected]> zsh-9999.ebuild: Update documentation URL (bug #534472). 1.5 app-shells/zsh/zsh-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-9999.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-9999.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-9999.ebuild?r1=1.4&r2=1.5 Index: zsh-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-9999.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- zsh-9999.ebuild 4 Jan 2015 01:34:42 -0000 1.4 +++ zsh-9999.ebuild 21 Jun 2015 05:07:22 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-9999.ebuild,v 1.4 2015/01/04 01:34:42 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-9999.ebuild,v 1.5 2015/06/21 05:07:22 radhermit Exp $ EAPI=5 @@ -67,23 +67,24 @@ } src_configure() { - local myconf + local myconf=() if use static ; then - myconf+=" --disable-dynamic" + myconf+=( --disable-dynamic ) append-ldflags -static fi if use debug ; then - myconf+=" \ - --enable-zsh-debug \ - --enable-zsh-mem-debug \ - --enable-zsh-mem-warning \ - --enable-zsh-secure-free \ - --enable-zsh-hash-debug" + myconf+=( + --enable-zsh-debug + --enable-zsh-mem-debug + --enable-zsh-mem-warning + --enable-zsh-secure-free + --enable-zsh-hash-debug + ) fi if [[ ${CHOST} == *-darwin* ]]; then - myconf+=" --enable-libs=-liconv" + myconf+=( --enable-libs=-liconv ) append-ldflags -Wl,-x fi @@ -101,7 +102,7 @@ $(use_enable caps cap) \ $(use_enable unicode multibyte) \ $(use_enable gdbm ) \ - ${myconf} + "${myconf[@]}" if use static ; then # compile all modules statically, see Bug #27392 @@ -144,16 +145,27 @@ insinto /usr/share/zsh/${PV%_*}/functions/Prompts newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup - # install miscellaneous scripts; bug #54520 local i + + # install miscellaneous scripts (bug #54520) sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ - -i "${S}"/{Util,Misc}/* || die + -i {Util,Misc}/* || die for i in Util Misc ; do insinto /usr/share/zsh/${PV%_*}/${i} doins ${i}/* done + # install header files (bug #538684) + insinto /usr/include/zsh + doins config.h Src/*.epro + for i in Src/{zsh.mdh,*.h} ; do + sed -e 's@\.\./config\[email protected]@' \ + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \ + -i "${i}" + doins "${i}" + done + dodoc ChangeLog* META-FAQ NEWS README config.modules if use doc ; then 1.1 app-shells/zsh/zsh-5.0.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-5.0.8.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/zsh/zsh-5.0.8.ebuild?rev=1.1&content-type=text/plain Index: zsh-5.0.8.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.8.ebuild,v 1.1 2015/06/21 05:07:22 radhermit Exp $ EAPI=5 inherit eutils flag-o-matic multilib prefix if [[ ${PV} == 9999* ]] ; then inherit git-r3 autotools EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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" SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2 doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )" fi DESCRIPTION="UNIX Shell similar to the Korn shell" HOMEPAGE="http://www.zsh.org/"; LICENSE="ZSH gdbm? ( GPL-2 )" SLOT="0" IUSE="caps debug doc examples gdbm maildir pcre static unicode" RDEPEND=" >=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm ) " DEPEND="sys-apps/groff ${RDEPEND}" PDEPEND=" examples? ( app-doc/zsh-lovers ) " if [[ ${PV} == 9999* ]] ; then DEPEND+=" app-text/yodl doc? ( sys-apps/texinfo app-text/texi2html virtual/latex-base )" fi 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 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 if [[ ${PV} == 9999* ]] ; then sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die eautoreconf fi } src_configure() { local myconf=() if use static ; then myconf+=( --disable-dynamic ) append-ldflags -static fi if use debug ; then myconf+=( --enable-zsh-debug --enable-zsh-mem-debug --enable-zsh-mem-warning --enable-zsh-secure-free --enable-zsh-hash-debug ) fi if [[ ${CHOST} == *-darwin* ]]; then myconf+=( --enable-libs=-liconv ) append-ldflags -Wl,-x fi econf \ --bindir="${EPREFIX}"/bin \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --enable-etcdir="${EPREFIX}"/etc/zsh \ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \ --enable-function-subdirs \ --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 -e "s,link=no,link=static,g" \ -e "/^name=zsh\/cap/s,link=static,link=no," \ -e "/^name=zsh\/curses/s,link=static,link=no," \ -i "${S}"/config.modules || die if ! use gdbm ; then sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ "${S}"/config.modules || die fi fi } src_compile() { default if [[ ${PV} == 9999* ]] && use doc ; then emake -C Doc everything fi } src_test() { addpredict /dev/ptmx local i for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do rm "${S}"/Test/${i} || die done emake check } src_install() { emake DESTDIR="${D}" install install.info insinto /etc/zsh doins "${T}"/zprofile keepdir /usr/share/zsh/site-functions insinto /usr/share/zsh/${PV%_*}/functions/Prompts newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup local i # install miscellaneous scripts (bug #54520) sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ -i {Util,Misc}/* || die for i in Util Misc ; do insinto /usr/share/zsh/${PV%_*}/${i} doins ${i}/* done # install header files (bug #538684) insinto /usr/include/zsh doins config.h Src/*.epro for i in Src/{zsh.mdh,*.h} ; do sed -e 's@\.\./config\[email protected]@' \ -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \ -i "${i}" doins "${i}" done dodoc ChangeLog* META-FAQ NEWS README config.modules if use doc ; then pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null dohtml -r Doc/* insinto /usr/share/doc/${PF} doins Doc/zsh.{dvi,pdf} popd >/dev/null fi docinto StartupFiles dodoc StartupFiles/z* } pkg_postinst() { if [[ -z ${REPLACING_VERSIONS} ]] ; then echo elog "If you want to enable Portage completions and Gentoo prompt," elog "emerge app-shells/gentoo-zsh-completions and add" elog " autoload -U compinit promptinit" elog " compinit" elog " promptinit; prompt gentoo" elog "to your ~/.zshrc" echo elog "Also, if you want to enable cache for the completions, add" elog " zstyle ':completion::complete:*' use-cache 1" elog "to your ~/.zshrc" echo elog "Note that a system zprofile startup file is installed. This will override" elog "PATH and possibly other variables that a user may set in ~/.zshenv." elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile" elog "or other user startup files that are sourced after the system zprofile." echo elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells," elog "one method is to use a separate path-setting file that is conditionally sourced" elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the" elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." echo elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation." echo fi }
