diff options
17 files changed, 75 insertions, 418 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog index 85869f3a..cba46c31 100644 --- a/app-shells/zsh/ChangeLog +++ b/app-shells/zsh/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zsh-5.0.8 (26 Jun 2015) + + 26 Jun 2015; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild. Update some changes from gentoo repository + *zsh-5.0.7-r3 (30 Apr 2015) 30 Apr 2015; Martin Väth <martin@mvath.de>: @@ -10,12 +15,12 @@ *zsh-5.0.7-r2 (02 Jan 2015) 02 Jan 2015; Martin Väth <martin@mvath.de>: - Add zsh-5.0.7-pid-ns.patch from gentoo main tree + Add zsh-5.0.7-pid-ns.patch from gentoo repository *zsh-5.0.7-r1 (09 Oct 2014) 09 Oct 2014; Martin Väth <martin@mvath.de>: - Add fix-cvs-completion.patch from gentoo main tree + Add fix-cvs-completion.patch from gentoo repository *zsh-5.0.7 (08 Oct 2014) @@ -26,7 +31,7 @@ 29 Aug 2014; Martin Väth <martin@mvath.de>: Version bump, remove old ebuild. - Update KEYWORDS and some trivial changes from main tree + Update KEYWORDS and some trivial changes from gentoo repository *zsh-5.0.5 (09 Jan 2014) diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index 8c11bcf7..118cb0c8 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -1,2 +1,2 @@ -DIST zsh-5.0.7-doc.tar.bz2 3005587 SHA256 43e8665ba9d9eca8370c64e2d4846e84f9111c628e5792f2aa639a7fb209fcf1 SHA512 5a8bdf00bb646bb844a2d953aed85de802fe2e8fa05a76382d3baeba8a0108fa2d0b137b7d9bf88eeeb77ea06843fe1c56ec1fece1389b502e39a16dd31f208c WHIRLPOOL 0364f134997e4df63e7d6e9b6c81030dcf96ce30bb329b353fccf682ab5e20964d028e6667d836ff1a4c70e27331632cc96c7871ba69afc611c7bbdd09c8508b -DIST zsh-5.0.7.tar.bz2 3181030 SHA256 544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3 SHA512 e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5 WHIRLPOOL f7cfbc41a2c990f702fee4ee158db79ebaad794479a62ff0ccd1d466077556e93b5e563575f9fd25dde1cb5e3c3610a14c997155ea76d86293d0a08168a3a418 +DIST zsh-5.0.8-doc.tar.bz2 3204865 SHA256 0ee5088c47fa5ceac6e087c7e00f2ede3f5920a03d32220772342ce980339e40 SHA512 86f75cfa16a2d0acbd75dc11d16a9bd4813ea2f0c6e323ed6fd73e66250420333fe0be2dbd62171a36aa479b5b5b423777f7ca369afb29d0f456fb7ed68926f6 WHIRLPOOL 1b25a455e7617cf624f8656eef2064e35a3c7798aec3d2822522bb89cad11441e1658966c467ecd758fa9e02ffcc235ee036830fd00757a04c3ff8e1b21fc434 +DIST zsh-5.0.8.tar.bz2 3250542 SHA256 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23 SHA512 79e438e32802c030749fd1bfff07fb3e5e7f7864e5106233c6f51ea477aa5a8471449e22f262f03bf69f42e66bf39e3b8a93295a247436ce97c66409b582ceae WHIRLPOOL 3ed95b2763bd3e486104a9f935efc89fd9ff1b3d745c1c3a93181a511c2986246e4f14c6d15fd88dd735c006127523ce423150813147250343871c9e2f40f413 diff --git a/app-shells/zsh/files/prompt_gentoo_setup-1 b/app-shells/zsh/files/prompt_gentoo_setup-1 index 0d071e98..046e2d87 100644 --- a/app-shells/zsh/files/prompt_gentoo_setup-1 +++ b/app-shells/zsh/files/prompt_gentoo_setup-1 @@ -10,24 +10,24 @@ EOF } prompt_gentoo_setup () { - prompt_gentoo_prompt=${1:-'blue'} - prompt_gentoo_user=${2:-'green'} - prompt_gentoo_root=${3:-'red'} + local prompt_gentoo_prompt=${1:-'blue'} + local prompt_gentoo_user=${2:-'green'} + local prompt_gentoo_root=${3:-'red'} if [ "$USER" = 'root' ] then - base_prompt="%B%F{$prompt_gentoo_root}%m%k " + local base_prompt="%B%F{$prompt_gentoo_root}%m%k " else - base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k " + local base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k " fi - post_prompt="%b%f%k" + local post_prompt="%b%f%k" #setopt noxtrace localoptions - path_prompt="%B%F{$prompt_gentoo_prompt}%1~" - PS1="$base_prompt$path_prompt %# $post_prompt" - PS2="$base_prompt$path_prompt %_> $post_prompt" - PS3="$base_prompt$path_prompt ?# $post_prompt" + local path_prompt="%B%F{$prompt_gentoo_prompt}%1~" + typeset -g PS1="$base_prompt$path_prompt %# $post_prompt" + typeset -g PS2="$base_prompt$path_prompt %_> $post_prompt" + typeset -g PS3="$base_prompt$path_prompt ?# $post_prompt" } prompt_gentoo_setup "$@" diff --git a/app-shells/zsh/files/zsh-5.0.7-fix-cvs-completion.patch b/app-shells/zsh/files/zsh-5.0.7-fix-cvs-completion.patch deleted file mode 100644 index 5beb7eca..00000000 --- a/app-shells/zsh/files/zsh-5.0.7-fix-cvs-completion.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://www.zsh.org/mla/workers/2014/msg01191.html - -diff --git a/Completion/Base/Utility/_call_program b/Completion/Base/Utility/_call_program -index b657648..010e094 100644 ---- a/Completion/Base/Utility/_call_program -+++ b/Completion/Base/Utility/_call_program -@@ -2,8 +2,8 @@ - - local tmp err_fd=-1 - --if (( ${debug_fd:--1} > 2 )) --then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is log file -+if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]] -+then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is trace or redirect - else exec {err_fd}>/dev/null - fi - - --- diff --git a/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch b/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch deleted file mode 100644 index fbf98edf..00000000 --- a/app-shells/zsh/files/zsh-5.0.7-gcc-5.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Src/Modules/system.mdd -+++ b/Src/Modules/system.mdd -@@ -15,7 +15,7 @@ - touch errtmp.out; \ - else \ - $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \ -- $(CPP) errtmp.c >errtmp.out; \ -+ $(CPP) -P errtmp.c >errtmp.out; \ - fi - $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@ - rm -f errtmp.c errtmp.out ---- a/Src/zsh.mdd -+++ b/Src/zsh.mdd -@@ -24,7 +24,7 @@ hdrdeps="zshcurses.h zshterm.h" - - signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@ - $(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c -- $(CPP) sigtmp.c >sigtmp.out -+ $(CPP) -P sigtmp.c >sigtmp.out - $(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@ - rm -f sigtmp.c sigtmp.out - diff --git a/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch b/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch deleted file mode 100644 index 928ce48b..00000000 --- a/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch +++ /dev/null @@ -1,39 +0,0 @@ -zsh and pid namespaces don't play very well together. Specifically, when zsh is -launched inside a new pid namespace, it doesn't take ownership of the process -group, causing things like SIGINT to be sent to the parent process. Upstream -bug report here: http://www.zsh.org/mla/workers/2014/msg01769.html. - -The first chunk of this diff fixes this problem and has already been applied -upstream: -http://sourceforge.net/p/zsh/code/ci/0c4cb0cc1b527f4341f1a39a10f4120aa7c7d594/. - -The second chunk is a suggested fix for the warning that zsh prints when -exiting: http://www.zsh.org/mla/workers/2014/msg01779.html. - -diff --git a/Src/jobs.c b/Src/jobs.c -index a668b07..c6e1bce 100644 ---- a/Src/jobs.c -+++ b/Src/jobs.c -@@ -2734,7 +2734,7 @@ acquire_pgrp(void) - long ttpgrp; - sigset_t blockset, oldset; - -- if ((mypgrp = GETPGRP()) > 0) { -+ if ((mypgrp = GETPGRP()) >= 0) { - long lastpgrp = mypgrp; - sigemptyset(&blockset); - sigaddset(&blockset, SIGTTIN); -@@ -2779,8 +2779,11 @@ void - release_pgrp(void) - { - if (origpgrp != mypgrp) { -- attachtty(origpgrp); -- setpgrp(0, origpgrp); -+ /* in linux pid namespaces, origpgrp may never have been set */ -+ if (origpgrp) { -+ attachtty(origpgrp); -+ setpgrp(0, origpgrp); -+ } - mypgrp = origpgrp; - } - } diff --git a/app-shells/zsh/zsh-5.0.7-r3.ebuild b/app-shells/zsh/zsh-5.0.8.ebuild index 84367953..83779da9 100644 --- a/app-shells/zsh/zsh-5.0.7-r3.ebuild +++ b/app-shells/zsh/zsh-5.0.8.ebuild @@ -115,7 +115,10 @@ system zprofile. If PATH must be set in ~/.zshenv to affect things like non-login ssh shells, one method is to use a separate path-setting file that is conditionally sourced in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the -zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." +zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/. + +See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation. +" src_prepare() { # fix zshall problem with soelim @@ -124,9 +127,6 @@ src_prepare() { soelim Doc/zshall.1.soelim > Doc/zshall.1 || die epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff - epatch "${FILESDIR}"/${P}-fix-cvs-completion.patch - epatch "${FILESDIR}"/${P}-pid-ns.patch - epatch "${FILESDIR}"/${P}-gcc-5.patch cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die eprefixify "${T}"/zprofile || die @@ -155,23 +155,25 @@ src_prepare() { } src_configure() { - local myconf= + local myconf + 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 @@ -189,16 +191,15 @@ src_configure() { $(use_enable caps cap) \ $(use_enable unicode multibyte) \ $(use_enable gdbm ) \ - ${myconf} + "${myconf[@]}" if use static ; then # compile all modules statically, see Bug #27392 # removed cap and curses because linking failes - sed -i \ - -e "s,link=no,link=static,g" \ + 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," \ - "${S}"/config.modules || die + -i "${S}"/config.modules || die if ! use gdbm ; then sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ "${S}"/config.modules || die @@ -208,7 +209,7 @@ src_configure() { src_compile() { default - ! ${LIVE} || ! use doc || emake dvi pdf html + ! ${LIVE} || ! use doc || emake -C Doc everything } src_test() { @@ -264,15 +265,27 @@ src_install() { insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup - # 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 + + # 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 for i in Util Misc ; do insinto /usr/share/zsh/"${PVPATH}"/${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\.h@config.h@' \ + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \ + -i "${i}" + doins "${i}" + done + dodoc ChangeLog* META-FAQ NEWS README config.modules readme.gentoo_create_doc diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild index 9753ffb5..4e9fbb70 100644..120000 --- a/app-shells/zsh/zsh-99999999.ebuild +++ b/app-shells/zsh/zsh-99999999.ebuild @@ -1,294 +1 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# doc package for -dev version exists? -doc_available=true - -# sourceforge mirror for non-git version exists? -sourceforge_mirror=false - -inherit eutils flag-o-matic multilib prefix readme.gentoo - -MY_PV=${PV/_p/-dev-} -S=${WORKDIR}/${PN}-${MY_PV} - -zsh_ftp="http://www.zsh.org/pub" - -if [[ ${PV} != "${MY_PV}" ]] ; then - ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2" - if ${doc_available} ; then - ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2" - else - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" - fi -else - ZSH_URI="" - ${sourceforge_mirror} && ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - ZSH_URI+=" - ${zsh_ftp}/${P}.tar.bz2" - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" -fi - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="http://www.zsh.org/" -case ${PV} in -9999*) - SRC_URI="" - EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" - inherit git-r3 - WANT_LIBTOOL="none" - inherit autotools - KEYWORDS="" -# Creating help files needs util-linux for colcrt. -# Please let me know if you have an arch where "colcrt" (or at least "col") -# is provided by a different package. - DEPEND="app-text/yodl - dev-lang/perl - sys-apps/man - sys-apps/util-linux" - PROPERTIES="live" - LIVE=:;; -*) - SRC_URI="${ZSH_URI} - doc? ( ${ZSH_DOC_URI} )" - 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" - #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" - DEPEND="" - LIVE=false;; -esac - -LICENSE="ZSH gdbm? ( GPL-2 )" -SLOT="0" -IUSE="caps compile" -COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X" -for curr in ${COMPLETIONS} -do case ${curr} in - [+-]*) - IUSE+=" ${curr%%[!+-]*}completion_${curr#?}" - continue;; - esac - IUSE+=" completion_${curr}" -done -IUSE+=" 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 ) -" - -DISABLE_AUTOFORMATTING="true" -DOC_CONTENTS=" -If you want to enable Portage completions and Gentoo prompt, -emerge app-shells/zsh-completion and add - autoload -U compinit promptinit - compinit - promptinit; prompt gentoo -to your ~/.zshrc - -Also, if you want to enable cache for the completions, add - zstyle ':completion::complete:*' use-cache 1 -to your ~/.zshrc - -If you want to use run-help add to your ~/.zshrc - unalias run-help - autoload -Uz run-help - -Note that a system zprofile startup file is installed. This will override -PATH and possibly other variables that a user may set in ~/.zshenv. -Custom PATH settings and similar overridden variables can be moved -to ~/.zprofile or other user startup files that are sourced after the -system zprofile. - -If PATH must be set in ~/.zshenv to affect things like non-login ssh shells, -one method is to use a separate path-setting file that is conditionally sourced -in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the -zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." - -src_prepare() { - # fix zshall problem with soelim - ln -s Doc man1 || die - mv Doc/zshall.1 Doc/zshall.1.soelim || die - soelim Doc/zshall.1.soelim > Doc/zshall.1 || die - - 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 - set -- - file='Src/Zle/complete.mdd' - for i in ${COMPLETIONS} - do case ${i} in - [+-]*) - i=${i#?};; - esac - grep -q "Completion\/${i}" -- "${S}/${file}" \ - || die "${file} does not contain Completion/${i}" - use completion_${i} || set -- "${@}" -e "s/Completion\/${i}[^ ']*//" - done - [ ${#} -eq 0 ] || sed -i "${@}" -- "${S}/${file}" \ - || die "patching ${file} failed" - epatch_user - ! ${LIVE} || eautoreconf - PVPATH=$(. "${S}"/Config/version.mk && printf '%s' "${VERSION}") && \ - [ -n "${PVPATH}" ] || PVPATH=${PV} -} - -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/${PVPATH}/help \ - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PVPATH}/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 -i \ - -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," \ - "${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 - ! ${LIVE} || ! use doc || emake dvi pdf html -} - -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 -} - -zcompile_dirs() { - use compile || return 0 - einfo "compiling modules" - local i - i="${S}/Src/zshpaths.h" - test -f "${i}" || die "cannot find ${i}" - # We need this directory also in pkg_postinst - FPATH_DIR="$(sed -n -e \ - 's/^#define FPATH_DIR .*\"\(.*\)\".*$/\1/p' -- "${i}" 2>/dev/null)" \ - || FPATH_DIR= - [ -n "${FPATH_DIR}" ] || die "cannot parse ${i}" - pushd -- "${ED}" >/dev/null || die - test -d ".${FPATH_DIR}" || die "parsing ${i} gave strange result ${FPATH_DIR}" - find ".${FPATH_DIR}" -type d -exec "${ED}bin/zsh" -fc 'setopt nullglob -for i -do a=(${i}/*(.)) - [[ ${#a} -eq 0 ]] && continue - echo "Compiling ${i#.}.zwc" - zcompile -U -M ${i}.zwc ${a} || exit -done' zsh '{}' '+' || die 'compiling failed. If you are cross-compiling set USE=-compile' - popd >/dev/null -} - -touch_zwc() { - use compile || return 0 - einfo "touching *.zwc files" - # Make a sanity check that variables are preserved after zcompile_dirs: - # If the package mangler is not faulty, this *must* succeeed. - [ -n "${FPATH_DIR}" ] && test -d "${FPATH_DIR}" || die "strange FPATH_DIR" - # Now the actual action - find "${EPREFIX}${FPATH_DIR}" -type f -name '*.zwc' \ - -exec "$(command -v touch)" -- '{}' '+' -} - -src_install() { - emake DESTDIR="${ED}" install install.info - - insinto /etc/zsh - doins "${T}"/zprofile - - keepdir /usr/share/zsh/site-functions - insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup - - # 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/"${PVPATH}"/${i} - doins ${i}/* - done - - dodoc ChangeLog* META-FAQ NEWS README config.modules - readme.gentoo_create_doc - - if use doc ; then - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null - dohtml -r Doc/* - dodoc Doc/zsh.{dvi,pdf} - popd >/dev/null - fi - - docinto StartupFiles - dodoc StartupFiles/z* - - zcompile_dirs - - rm -vf -- "${ED}"/bin/zsh?* -} - -pkg_postinst() { - readme.gentoo_pkg_postinst - touch_zwc -} +zsh-5.0.8.ebuild
\ No newline at end of file diff --git a/sci-mathematics/genius/ChangeLog b/sci-mathematics/genius/ChangeLog index eb78bbfd..50b68da7 100644 --- a/sci-mathematics/genius/ChangeLog +++ b/sci-mathematics/genius/ChangeLog @@ -2,8 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jun 2015; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild + 14 Sep 2013; Martin Väth <martin@mvath.de>: - Version bump, remove old ebuild. + Version bump, remove old ebuild 31 May 2013; Martin Väth <martin@mvath.de>: - Copy from tree to make gnome-doc-utils optional. Clean old ChangeLog. + Copy from tree to make gnome-doc-utils optional. Clean old ChangeLog diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest index e1b78a20..b4116bf5 100644 --- a/sci-mathematics/genius/Manifest +++ b/sci-mathematics/genius/Manifest @@ -1,2 +1,2 @@ -DIST genius-1.0.17.tar.xz 2314316 SHA256 2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f SHA512 8047efb1b5d278186b093bca3624f96059670ce3cdf757759abf6e01a27bb4bba82a4158e6baa3b42f349a55fdf6e984388fb7f96f14b0e4faba0ada069e9b6c WHIRLPOOL bb6ba7bb5c635f331e523887e5f5995e83392f58046893ae2bebc56fcaa26f817c8ddd481663fa5818377d721911c430dbd50dd8ab24a07e9dd5c4ad6fcf77bd +DIST genius-1.0.19.tar.xz 2447724 SHA256 e5a979d13ae39fb1ae176078dbb301222e6c7a1c2cda8d999bac3ff6a4a7e6c2 SHA512 84ec48c0e13af088f61674e170c23cbc06e081bea43babe3460b88fd2e256c9fc44b891afa3270d5117ccd91ec6d2c25b022dde3d468635df9d1c6e573c4ef05 WHIRLPOOL 772637bd2c2333a08115397781773b1aa74cb195b9731b1b07ddf689fef47790aad79d2f2a6c7e45fe5c6738eb8bda56e0cebe3802c01cd5c1a99bfb3b00b0d5 DIST genius-reference.pdf 1024944 SHA256 79011ae33ff781507185898ba76b156699061eda78ed16e15aa02195c896ee4b SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285 WHIRLPOOL 301302145d43843ddd749ab33612438d360462c9d3daa12d7050d9ca6da82bdea3ef53b917989d0c518327780b147a9f74e407f555a62dcdbe0f0c2ef864fa88 diff --git a/sci-mathematics/genius/genius-1.0.17.ebuild b/sci-mathematics/genius/genius-1.0.19.ebuild index 6a33a1e0..42082214 100644 --- a/sci-mathematics/genius/genius-1.0.17.ebuild +++ b/sci-mathematics/genius/genius-1.0.19.ebuild @@ -8,7 +8,7 @@ inherit autotools eutils gnome2 DESCRIPTION="Genius Mathematics Tool and the GEL Language" HOMEPAGE="http://www.jirka.org/genius.html" SRC_URI=" - http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.xz + mirror://gnome/sources/${PN}/1.0/${P}.tar.xz doc? ( http://www.jirka.org/${PN}-reference.pdf )" LICENSE="GPL-3" @@ -34,8 +34,7 @@ RDEPEND=" x11-libs/vte:0 )" DEPEND="${RDEPEND} dev-util/intltool - || ( sys-devel/bison - dev-util/yacc ) + || ( sys-devel/bison dev-util/yacc ) sys-devel/flex nls? ( sys-devel/gettext )" diff --git a/www-plugins/classic-theme-restorer/ChangeLog b/www-plugins/classic-theme-restorer/ChangeLog index 04c7af1e..e033d978 100644 --- a/www-plugins/classic-theme-restorer/ChangeLog +++ b/www-plugins/classic-theme-restorer/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*classic-theme-restorer-1.3.4 (26 Jun 2015) + + 26 Jun 2015; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild + *classic-theme-restorer-1.3.3 (11 Jun 2015) 11 Jun 2015; Martin Väth <martin@mvath.de>: diff --git a/www-plugins/classic-theme-restorer/Manifest b/www-plugins/classic-theme-restorer/Manifest index a5f09c78..673cd061 100644 --- a/www-plugins/classic-theme-restorer/Manifest +++ b/www-plugins/classic-theme-restorer/Manifest @@ -1 +1 @@ -DIST classic_theme_restorer_customize_ui-1.3.3-fx.xpi 525882 SHA256 c36cb52178eaa4def7e6f87051fc7ba71735949448b533d65b0a9f67f17e7e61 SHA512 f7fcf788ba892eb8207a987ca8821e0d437ab90f2f8fcf039df68431d6f5952b27d3fea6db0e4537660c32149fff6f4aa0b963ee19b92d5debd0cc748b264e38 WHIRLPOOL e1fbaf567188fa116a2dd3b39bf50920e4730951ccb5116c71251b1f484fb59b5d88c8e42a12e1e420227cce32d017ee8de1b5bc4ea9a74d99ad80fcea7033a7 +DIST classic_theme_restorer_customize_ui-1.3.4-fx.xpi 535731 SHA256 39a200da02626fc4075ccb50eead1e30d97a5cf21ddfad85f62698cd1ce2d46c SHA512 8c86ebbfe44bde4a84b4d3a159edd1cec316637770cea27512eb518365f0052a2f38a7aaf2dcc176a39f020a1d6875df52c2f9245cc1b55c2e7fe2ee06bd4e89 WHIRLPOOL a8b2c63ab417e448a650d5812dc14a724359b2fbf577c98ce410d49ad846f1594e82f07bbde9a2114a24486508a69b4069e0a81464e0fa8246b8732cee5f1d34 diff --git a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.3.ebuild b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.4.ebuild index 6bb4d8de..6bb4d8de 100644 --- a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.3.ebuild +++ b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.3.4.ebuild diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog index e1ea161d..502855ba 100644 --- a/www-plugins/noscript/ChangeLog +++ b/www-plugins/noscript/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*noscript-2.6.9.27 (26 Jun 2015) + + 26 Jun 2015; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild + *noscript-2.6.9.26 (07 Jun 2015) 07 Jun 2015; Martin Väth <martin@mvath.de>: diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest index f22f6b47..075c8c02 100644 --- a/www-plugins/noscript/Manifest +++ b/www-plugins/noscript/Manifest @@ -1 +1 @@ -DIST noscript-2.6.9.26.xpi 548855 SHA256 b549aa3f71935249098b99c9bdb379e049d9daf876bbd887bd096f54d36c8c3d SHA512 3db1ecb4c04a291539e65823ce2031d7115b71c52ba0051a97771b0ac8378eccfe1b6179b2543301c27a36b4e53d82bb3ff8b9b433d427b8a81e5a455bbcff69 WHIRLPOOL 76fe46aadb9765703c1fbefa9cd5c50b6cc4151dfa58d2930e6e4d3a023585db66febe6bf532cd5d21fa07495ccfaeba34106c7c5b868d2a7de9cf6608f31ed7 +DIST noscript-2.6.9.27.xpi 548914 SHA256 526466093e2660a0fec3920a3006b8585e60ae77ce06e1197bad47297c46a900 SHA512 e8f579c30910deffa89f68b83d94806126505bc7276e45bd627aa3289258aa185b4760fdd31721ec54f755f17ccc2ac6a4cd9afd71e7499299556549a03b4950 WHIRLPOOL 3087a292300c241f874640ff36c7c20bab1eeec67934a9408043ad3cfe2e88350bf0c0ca38b997236bb2204246a032d80d5286ccffaa432082e78d4fdc4865b5 diff --git a/www-plugins/noscript/noscript-2.6.9.26.ebuild b/www-plugins/noscript/noscript-2.6.9.27.ebuild index 82dc8b3b..82dc8b3b 100644 --- a/www-plugins/noscript/noscript-2.6.9.26.ebuild +++ b/www-plugins/noscript/noscript-2.6.9.27.ebuild |