Remove old.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

7 files changed, 7 insertions, 941 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 534a0867d483..30a495cefba4 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.245 2014/10/17 05:29:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.246 2014/10/17 05:39:06 radhermit Exp $
+
+  17 Oct 2014; Tim Harder <radhermit@gentoo.org> -zsh-5.0.2-r3.ebuild,
+  -zsh-5.0.4.ebuild, -zsh-5.0.6.ebuild, -zsh-5.0.7.ebuild,
+  -files/zsh-5.0.2-texinfo-5.1.patch,
+  -files/zsh-fix-parameter-modifier-crash.patch:
+  Remove old.
 
 *zsh-9999 (17 Oct 2014)
 
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 da76df7784aa..000000000000
--- 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 1e1847a60ede..000000000000
--- 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/zsh-5.0.2-r3.ebuild b/app-shells/zsh/zsh-5.0.2-r3.ebuild
deleted file mode 100644
index 25ec4b659179..000000000000
--- a/app-shells/zsh/zsh-5.0.2-r3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2-r3.ebuild,v 1.11 2013/09/07 20:13:48 ago Exp $
-
-EAPI=5
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit eutils flag-o-matic multilib prefix
-
-MY_PV=${PV/_p/-dev-}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-zsh_ftp="ftp://ftp.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="mirror://sourceforge/${PN}/${P}.tar.bz2
-		${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/"
-SRC_URI="${ZSH_URI}
-	doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-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"
-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 )
-"
-
-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
-	epatch "${FILESDIR}"/${PN}-fix-parameter-modifier-crash.patch
-	epatch "${FILESDIR}"/${PN}-5.0.2-texinfo-5.1.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=
-
-	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-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--with-term-lib="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=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_test() {
-	local i
-	addpredict /dev/ptmx
-	for i in C02cond.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
-
-	# 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}/*
-	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
-		# should link to http://www.gentoo.org/doc/en/zsh.xml
-		echo
-		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"
-		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
-	fi
-}
diff --git a/app-shells/zsh/zsh-5.0.4.ebuild b/app-shells/zsh/zsh-5.0.4.ebuild
deleted file mode 100644
index 5dc0b95b811c..000000000000
--- a/app-shells/zsh/zsh-5.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.4.ebuild,v 1.1 2013/12/23 06:09:32 radhermit Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib prefix
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
-	doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-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"
-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 )
-"
-
-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
-}
-
-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-term-lib="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=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_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
-
-	# 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}/*
-	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
-		# should link to http://www.gentoo.org/doc/en/zsh.xml
-		echo
-		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"
-		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
-	fi
-}
diff --git a/app-shells/zsh/zsh-5.0.6.ebuild b/app-shells/zsh/zsh-5.0.6.ebuild
deleted file mode 100644
index 377362c58f20..000000000000
--- a/app-shells/zsh/zsh-5.0.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.6.ebuild,v 1.1 2014/08/28 20:02:14 radhermit Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib prefix
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
-	doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-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"
-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 )
-"
-
-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
-}
-
-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 -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_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
-
-	# 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}/*
-	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
-		# should link to http://www.gentoo.org/doc/en/zsh.xml
-		echo
-		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"
-		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
-	fi
-}
diff --git a/app-shells/zsh/zsh-5.0.7.ebuild b/app-shells/zsh/zsh-5.0.7.ebuild
deleted file mode 100644
index 836b60cde54e..000000000000
--- a/app-shells/zsh/zsh-5.0.7.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.7.ebuild,v 1.1 2014/10/07 23:38:12 radhermit Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib prefix
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
-	doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-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"
-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 )
-"
-
-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
-}
-
-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 -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_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
-
-	# 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}/*
-	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
-		# should link to http://www.gentoo.org/doc/en/zsh.xml
-		echo
-		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"
-		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
-	fi
-}