Bump zsh, simplifying ebuild, improving live ebuild

8 files changed, 49 insertions, 340 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 9e4630b2..a523d44b 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zsh-5.0.3 (15 Dec 2013)
+
+  15 Dec 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Remove now unnecessary support for
+  generating helpfiles. Keep USE-flags in the live version to keep deps
+  optional. Support IUSE=doc properly also for live version
+
 *zsh-99999999 (29 May 2013)
 
   16 Nov 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 84481332..c5d8cb6f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,2 +1,2 @@
-DIST zsh-5.0.2-doc.tar.bz2 2902019 SHA256 99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1 SHA512 95a197b5220fccefce43b8cb3f868186a84db697de768d897a3a50f8eb74802e7974e9b9df15d39b897af54852f66d0af668cc8ab0e557412ea1a712ec1c601f WHIRLPOOL f13e09e71d51e769eec68910a155fcb036f0910adc87f357071dc78edf2c3a830d75e9d75a256aa2d6415c5aa0200721ddcbc7e590c84cf7d7febe92b0c513c3
-DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 SHA512 096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d WHIRLPOOL ff5214ced2cebe50c3fd090a1d12727ee5672875f38fdda5f068ccdd260cc85336bb22fa445d028d6e8df8bdbe53605034e55c3f435cf5a11e981b8ae6821bf0
+DIST zsh-5.0.3-doc.tar.bz2 2939284 SHA256 5c41f6ba83207c086849c319e2711d62ba9a11d545113b8b79323f88d15cafab SHA512 abd01feca792b18d1b38caf0b0e5668ce29b0e077329ead1903da8aca8bb411575de84f001dc4d691cc9f4485a99fcd35f85075d733feb28b7d0a2d4e285181b WHIRLPOOL 1bf401ba17c4e64760300321fd52fcea2a96d939709c6740ca07035cb5a6838209e8d872dc719d5e903b03349fcc5057ba346d92ebd6fc1ecc9d88d66df30f0d
+DIST zsh-5.0.3.tar.bz2 3092907 SHA256 14c7685d5e5acbfe9436f2fe9578c17e0dbb00dfbd7d88c72b49930af91136cf SHA512 90ea91aba021d62bd3f6c7d8f79ddba3ce86af273e6691c77fb7c2c783706455ad82953dfc059f898d8fcecd4eed2c0efa36c6066438e4d0e1888b08ad9bf00d WHIRLPOOL a95e75b0bf89237c1290f35003e56f54021c2897d212f3876628bdc19586b2d815916703780e68a5b8c0d7becce35b1e4232c9a361449bbb8ca245e7d2afee6a
diff --git a/app-shells/zsh/files/_run-help b/app-shells/zsh/files/_run-help
deleted file mode 100644
index b579d971..00000000
--- a/app-shells/zsh/files/_run-help
+++ /dev/null
@@ -1,7 +0,0 @@
-#compdef run-help
-local d expl
-local HELPDIR=${HELPDIR:-/usr/share/zsh/$ZSH_VERSION/help}
-[[ -d $HELPDIR ]] && {
-	d=($HELPDIR/*(:t))
-	(($#d)) && _wanted commands expl 'command' compadd -a d
-} || _man
diff --git a/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch b/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch
deleted file mode 100644
index da76df77..00000000
--- a/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- zsh-5.0.2/Doc/zsh.texi
-+++ zsh-5.0.2/Doc/zsh.texi
-@@ -1,4 +1,3 @@
--
- \input texinfo.tex
- @c %**start of header
- @iftex
-@@ -389,6 +388,7 @@
- 
- @end table
- 
-+@noindent
- The up-to-date source code is available via anonymous CVS and Git from
- Sourceforge.  See @t{http://sourceforge.net/projects/zsh/} for details.
- A summary of instructions for the CVS and Git archives can be found at
-@@ -430,8 +430,8 @@
- @item @t{<zsh-announce-unsubscribe@@zsh.org>}
- @item @t{<zsh-users-unsubscribe@@zsh.org>}
- @item @t{<zsh-workers-unsubscribe@@zsh.org>}
--@item
- @end table
-+@sp 1
- 
- @noindent
- YOU ONLY NEED TO JOIN ONE OF THE MAILING LISTS AS THEY ARE NESTED.
-@@ -1080,8 +1080,8 @@
- @item @t{/etc/zshrc}
- @item @t{/etc/zlogin}
- @item @t{/etc/zlogout}    (installation-specific - @t{/etc} is the default)
--@item
- @end table
-+@sp 1
- @c (avoiding a yodl bug)
- 
- @noindent
-@@ -1651,8 +1651,8 @@
- @item Errors in variable substitution syntax
- @item Failure to convert characters in @t{$'}...@t{'} expressions
- similar options
--@item
- @end table
-+@sp 1
- 
- @noindent
- If the @t{POSIX_BUILTINS} option is set, more errors associated with
-@@ -14685,8 +14685,8 @@
- used for contexts in the parameter @t{zle_highlight},
- @ref{Character Highlighting};
- for example, @t{standout} or @t{fg=red,bold}.
--@item
- @end table
-+@sp 1
- 
- @noindent
- For example, 
-@@ -22643,8 +22643,7 @@
- described above.
- 
- @findex _pick_variant
--@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c}
--@var{command} ] [ @t{-r} @var{name} ]
-+@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c} @var{command} ] [ @t{-r} @var{name} ]
- @itemx    @var{label}@t{=}@var{pattern} ... @var{label} [ @var{args} ... ]
- This function is used to resolve situations where a single command name
- requires more than one type of handling, either because it
-@@ -23260,8 +23259,8 @@
- @item @t{compctl} @t{-M} @var{match-specs} ...
- @item @t{compctl} @t{-L} [ @t{-CDTM} ] [ @var{command} ... ]
- @item @t{compctl} @t{+} @var{command} ...
--@item
- @end table
-+@sp 1
- 
- @noindent
- Control the editor's completion behavior according to the supplied set
-@@ -23405,8 +23404,8 @@
- @item [ @t{-y} @var{func-or-var} ] [ @t{-l} @var{cmd} ] [ @t{-h} @var{cmd} ] [ @t{-U} ]
- @item [ @t{-t} @var{continue} ] [ @t{-J} @var{name} ] [ @t{-V} @var{name} ]
- @item [ @t{-M} @var{match-spec} ]
--@item
- @end table
-+@sp 1
- 
- @noindent
- The remaining @var{options} specify the type of command arguments
-@@ -23838,8 +23837,8 @@
- @noindent
- @table @asis
- @item @t{compctl} [ @t{-CDT} ] @var{options} @t{+} @var{options} [ @t{+} ... ] [ @t{+} ] @var{command} ...
--@item
- @end table
-+@sp 1
- 
- @noindent
- The form with `@t{+}' specifies alternative options. Completion is
-@@ -23866,8 +23865,8 @@
- @item          [ @var{command} ... ]
- @item @t{compctl} [ @t{-CDT} ] @var{options} [ @t{-x} @var{pattern} @var{options} @t{-} ... @t{-}@t{-} ]
- @item          [ @t{+} @var{options} [ @t{-x} ... @t{-}@t{-} ] ... [@t{+}] ] [ @var{command} ... ]
--@item
- @end table
-+@sp 1
- 
- @noindent
- The form with `@t{-x}' specifies extended completion for the
-@@ -24980,7 +24979,7 @@
- The subcommand @t{position} writes various positions associated with
- @var{targetwin} into the array named @var{array}.
- These are, in order:
--@table @asis
-+@itemize @bullet
- @item 
- The y and x coordinates of the cursor relative to the top left
- of @var{targetwin}
-@@ -24989,7 +24988,7 @@
- screen
- @item 
- The size of @var{targetwin} in y and x dimensions.
--@end table
-+@end itemize
- 
- @noindent
- Outputting characters and strings are achieved by @t{char} and @t{string}
-@@ -28870,30 +28869,37 @@
- it returns status 0 and sets elements of the associative
- array @t{reply} as follows:
- @table @asis
--@item timeNL()The time as a string of digits in the same units as
-+@item time
-+The time as a string of digits in the same units as
- @t{$EPOCHSECONDS}
--@item schedtimeNL()The regularly scheduled time.  This may differ from
-+@item schedtime
-+The regularly scheduled time.  This may differ from
- the actual event time @t{time} if this is a recurring event and the next
- occurrence has been rescheduled.  Then @t{time} gives the actual time
- and @t{schedtime} the time of the regular recurrence before modification.
- @item text1
- The text from the line not including the date and time of the
- event, but including any @t{WARN} or @t{RPT} keywords and values.
--@item warntimeNL()Any warning time given by the @t{WARN} keyword as a string
-+@item warntime
-+Any warning time given by the @t{WARN} keyword as a string
- of digits containing the time at which to warn in the same units as
- @t{$EPOCHSECONDS}.  (Note this is an absolute time, not the relative time
- passed down.)  Not set no @t{WARN} keyword and value were
- matched.
--@item warnstrNL()The raw string matched after the @t{WARN} keyword, else unset.
--@item rpttimeNL()Any recurrence time given by the @t{RPT} keyword as a string
-+@item warnstr
-+The raw string matched after the @t{WARN} keyword, else unset.
-+@item rpttime
-+Any recurrence time given by the @t{RPT} keyword as a string
- of digits containing the time of the recurrence in the same units
- as @t{$EPOCHSECONDS}.  (Note this is an absolute time.)  Not set if
- no @t{RPT} keyword and value were matched.
--@item schedrpttimeNL()The next regularly scheduled occurrence of a recurring
-+@item schedrpttime
-+The next regularly scheduled occurrence of a recurring
- event before modification.  This may differ from @t{rpttime}, which is the
- actual time of the event that may have been rescheduled from the regular
- time.
--@item rptstrNL()The raw string matched after the @t{RPT} keyword, else unset.
-+@item rptstr
-+The raw string matched after the @t{RPT} keyword, else unset.
- @item text2
- The text from the line after removal of the date and any
- keywords and values.
-@@ -35504,8 +35510,8 @@
- @noindent
- @example
- zstyle+ ':foo:bar' style1 value1 \ 
--      + ':baz'     style2 value2 \ 
--      + ':frob'    style3 value3
-+       +':baz'     style2 value2 \ 
-+       +':frob'    style3 value3
- @end example
- 
- @noindent
diff --git a/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch b/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch
deleted file mode 100644
index 1e1847a6..00000000
--- a/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 44757a653cb547ae7b556e8c92629d296d3c1f12 Mon Sep 17 00:00:00 2001
-From: Peter Stephenson <pws@users.sourceforge.net>
-Date: Tue, 22 Jan 2013 16:28:58 +0000
-Subject: [PATCH] 30993: fix parameter modifier crash with :wq on empty string
-
----
- ChangeLog              |  8 +++++++-
- Src/subst.c            | 10 +++++++++-
- Test/D04parameter.ztst |  7 +++++++
- 3 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/Src/subst.c b/Src/subst.c
-index 974a845..a4df256 100644
---- a/Src/subst.c
-+++ b/Src/subst.c
-@@ -3707,6 +3707,11 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags)
- 	char *y;
- 
- 	x = val;
-+	if (!x) {
-+	    /* Shouldn't have got here with a NULL string. */
-+	    DPUTS(1, "value is NULL in paramsubst");
-+	    return NULL;
-+	}
- 	if (prenum || postnum)
- 	    x = dopadding(x, prenum, postnum, preone, postone,
- 			  premul, postmul
-@@ -4021,7 +4026,10 @@ modify(char **str, char **ptr)
- 		    all = tmp;
- 		    t = e;
- 		}
--		*str = all;
-+		if (!all)
-+		    *str = dupstring("");
-+		else
-+		    *str = all;
- 
- 	    } else {
- 		switch (c) {
-diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
-index 01f8412..bea9459 100644
---- a/Test/D04parameter.ztst
-+++ b/Test/D04parameter.ztst
-@@ -1544,3 +1544,10 @@
- 0:Regression test for shwordsplit with null or unset IFS and quoted array
- >abc
- >a b c
-+
-+   foo=
-+   print ${foo:wq}
-+   print ${:wq}
-+0:Empty parameter shouldn't cause modifiers to crash the shell
-+>
-+>
--- 
-1.8.1.5
-
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index 07c08323..c639e53e 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -36,6 +36,6 @@
   <flag name='completion_Solaris'>Install zsh completions for Solaris</flag>
   <flag name='completion_Unix'>Install zsh completions for Unix</flag>
   <flag name='completion_X'>Install zsh completions for X</flag>
-  <flag name='run-help'>Create and install data for run-help command</flag>
+  <flag name='run-help'>Create run-help data for live version of zsh; requires dev-lang/perl sys-apps/man sys-apps/util-linux</flag>
 </use>
 </pkgmetadata>
diff --git a/app-shells/zsh/zsh-5.0.2-r4.ebuild b/app-shells/zsh/zsh-5.0.3.ebuild
index 993de82c..993de82c 120000
--- a/app-shells/zsh/zsh-5.0.2-r4.ebuild
+++ b/app-shells/zsh/zsh-5.0.3.ebuild
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
index 85a566f3..74a76abb 100644
--- a/app-shells/zsh/zsh-99999999.ebuild
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -7,12 +7,15 @@ 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="ftp://ftp.zsh.org/pub"
+zsh_ftp="http://www.zsh.org/pub"
 
 if [[ ${PV} != "${MY_PV}" ]] ; then
 	ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2"
@@ -22,37 +25,39 @@ if [[ ${PV} != "${MY_PV}" ]] ; then
 		ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
 	fi
 else
-	ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	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/"
-
-# 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.
-HELPDEPS="dev-lang/perl sys-apps/man sys-apps/util-linux"
-
 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=""
-	DEPEND="app-text/yodl ${HELPDEPS}"
+# 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
+		run-help? (
+			dev-lang/perl
+			sys-apps/man
+			sys-apps/util-linux
+		)"
 	PROPERTIES="live"
-	HAVE_HELP=:
 	LIVE=:;;
 *)
 	SRC_URI="${ZSH_URI}
 		doc? ( ${ZSH_DOC_URI} )"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-	PROPERTIES=""
-	HAVE_HELP=false
 	LIVE=false;;
 esac
 
@@ -68,10 +73,8 @@ do	case ${curr} in
 	esac
 	IUSE+=" completion_${curr}"
 done
-IUSE+=" debug"
-${LIVE} || IUSE+=" doc"
-IUSE+=" examples gdbm maildir pcre"
-${HAVE_HELP} || IUSE+=" +run-help"
+IUSE+=" debug doc examples gdbm maildir pcre"
+${LIVE} && IUSE+=" +run-help"
 IUSE+=" static unicode"
 
 RDEPEND="
@@ -85,10 +88,6 @@ RDEPEND="
 DEPEND+="
 	sys-apps/groff
 	${RDEPEND}"
-${HAVE_HELP} || DEPEND+="
-	run-help? ( ${HELPDEPS} )
-"
-
 PDEPEND="
 	examples? ( app-doc/zsh-lovers )
 "
@@ -105,18 +104,21 @@ to your ~/.zshrc
 Also, if you want to enable cache for the completions, add
 	zstyle ':completion::complete:*' use-cache 1
 to your ~/.zshrc
-"
 
-pkg_setup() {
-	if ${HAVE_HELP} || use run-help
-	then	DOC_CONTENTS="
 If you want to use run-help add to your ~/.zshrc
 	unalias run-help
 	autoload -Uz run-help
-	[[ -z $EPREFIX ]] || HELPDIR=$EPREFIX/usr/share/zsh/$ZSH_VERSION/help
-${DOC_CONTENTS}"
-	fi
-}
+
+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
@@ -124,16 +126,7 @@ src_prepare() {
 	mv Doc/zshall.1 Doc/zshall.1.soelim
 	soelim Doc/zshall.1.soelim > Doc/zshall.1
 
-	epatch "${FILESDIR}/${PN}"-init.d-gentoo-r1.diff
-	if ! ${LIVE} ; then
-		epatch "${FILESDIR}/${PN}"-fix-parameter-modifier-crash.patch
-		epatch "${FILESDIR}/${PN}"-5.0.2-texinfo-5.1.patch
-	fi
-
-	if ! ${HAVE_HELP} && use run-help ; then
-		cp -- "${FILESDIR}/_run-help" "${S}/Completion/Zsh/Command/_run-help" || \
-			die "cannot copy _run-help completion"
-	fi
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
 
 	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
 	eprefixify "${T}"/zprofile || die
@@ -176,8 +169,10 @@ src_configure() {
 			--enable-zsh-secure-free \
 			--enable-zsh-hash-debug"
 	fi
-	if ${HAVE_HELP} ; then
+	if ! ${LIVE} || use run-help ; then
 		myconf+=" --enable-runhelpdir=\"${EPREFIX}/usr/share/zsh/${PVPATH}/help\""
+	else
+		myconf+=" --disable-runhelpdir"
 	fi
 
 	if [[ ${CHOST} == *-darwin* ]]; then
@@ -216,61 +211,16 @@ src_configure() {
 	fi
 }
 
-generate_run_help() (
-	# We use a subshell (...) for locale overrides and local cd
-	# Hence, we also need not declare any variables as local
-	mkdir run-help && cd run-help || die "cannot create run-help directory"
-	# We need GROFF_NO_SGR to produce "classical" formatting:
-	export GROFF_NO_SGR=
-	export MANWIDTH=80
-	export LANG=C
-	unset ${!MAN*} ${!LESS} ${!LC_*}
-	ebegin "Generating files for run-help"
-	# It is necessary to be paranoid about the success of the following pipe,
-	# since any change in locale or environment (like unset GROFF_NO_SGR,
-	# "bad" LC_CTYPE or tools behaving slightly different) can break it
-	# completely. It needs to be tested carefully in each architecture.
-	man "${S}/Doc/zshbuiltins.1" | colcrt - | perl "${S}/Util/helpfiles" || {
-		eend 1
-		eerror "perl Util/helpfiles failed"
-		return false
-	}
-	mystatus=("${PIPESTATUS[@]}")
-	[ "${mystatus[0]}" -eq 0 ] || {
-		eend 1
-		eerror "man Doc/zshbuiltins.1 failed"
-		return false
-	}
-	[ "${mystatus[1]}" -eq 0 ] || {
-		eend 1
-		eerror "colcrt failed"
-		return false
-	}
-	test -e zmodload || {
-		eend 1
-		eerror "Could not produce all required files for run-help."
-		eerror "This can be caused by a broken locale setting:"
-		eerror "Try to set LC_CTYPE to a utf8 aware locale like en_US.UTF-8,"
-		eerror "making sure that this locale is supported by your glibc."
-		eerror "For compatibility reasons, this ebuild ignores LC_ALL."
-		return false
-	}
-	eend 0
-)
-
 src_compile() {
 	default
-	${HAVE_HELP} || ! use run-help || generate_run_help || {
-		error "cannot generate files for run-help."
-		die "If this problem cannot be fixed, disable USE=run-help for zsh"
-	}
+	! ${LIVE} || ! use doc || emake dvi pdf html
 }
 
 src_test() {
 	local i
 	addpredict /dev/ptmx
 	for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
-		rm -- "${S}"/Test/${i} || die
+		rm "${S}"/Test/${i} || die
 	done
 	emake check
 }
@@ -312,16 +262,11 @@ touch_zwc() {
 src_install() {
 	emake DESTDIR="${ED}" install install.info
 
-	if ! ${HAVE_HELP} && use run-help
-	then	insinto /usr/share/zsh/${PVPATH}/help
-		doins run-help/*
-	fi
-
 	insinto /etc/zsh
 	doins "${T}"/zprofile
 
 	keepdir /usr/share/zsh/site-functions
-	insinto "/usr/share/zsh/${PVPATH}/functions/Prompts"
+	insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts
 	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
 
 	# install miscellaneous scripts; bug #54520
@@ -329,14 +274,14 @@ src_install() {
 	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}"
+		insinto /usr/share/zsh/"${PVPATH}"/${i}
 		doins ${i}/*
 	done
 
 	dodoc ChangeLog* META-FAQ NEWS README config.modules
 	readme.gentoo_src_install
 
-	if ! ${LIVE} && use doc ; then
+	if use doc ; then
 		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
 		dohtml -r Doc/*
 		insinto /usr/share/doc/${PF}