12 files changed, 12 insertions, 1219 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 04d5f0c60faf..e21cf276357f 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.158 2011/01/03 09:31:37 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.159 2011/01/03 09:36:11 tove Exp $
+
+  03 Jan 2011; Torsten Veller <tove@gentoo.org> -zsh-4.3.4-r1.ebuild,
+  -files/zsh-4.3.4-configure-changequote.patch,
+  -files/zsh-4.3.4-mkmakemod.patch, -zsh-4.3.5.ebuild, -zsh-4.3.6.ebuild,
+  -zsh-4.3.9.ebuild, -zsh-4.3.10.ebuild, -zsh-4.3.10-r1.ebuild,
+  -files/prompt_gentoo_setup, -files/zprofile:
+  Cleanup
 
 *zsh-4.3.11 (03 Jan 2011)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 1474cdad414e..3c07d5a64099 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,43 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA1 1441a7533c4197e1ddd467dc102a35be4659ff9c SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667
 AUX prompt_gentoo_setup-1 745 RMD160 7235736c59ee02ea2c6cdc3c31f2af788d3ed34d SHA1 f740b6c37c55affabe3a66f1ceb45b2a1484f28f SHA256 c04da5152712fcd2eb2b83a1967f892f31cc087e1245b28e4806ab5099ac16e7
-AUX zprofile 1343 RMD160 44038b7db235cbcc548ab6742c435f1c36868703 SHA1 8696a4afcb3116073da727bef10a826bf9f145e8 SHA256 f4a7067d695605520e18d41f619f6dfab4fcf2c71ad366930241266eb18900a6
 AUX zprofile-1 1767 RMD160 a4fa4c3dea9cdf6d6a875ab494552c7464fb3e83 SHA1 fb409dd1e2000b1eeb386f8dec2b0dbe09035d9f SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8
-AUX zsh-4.3.4-configure-changequote.patch 694 RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f SHA1 986a8b03bc49da157ced270321538a579a9b6ec0 SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6
-AUX zsh-4.3.4-mkmakemod.patch 489 RMD160 156f0e94594198d83861414d4f0618f9fccf99aa SHA1 528994f7bc6dcb6b5b85b46997d97472d7166bd5 SHA256 094540885617e97afd947fede7935b0d9c18e375ddd471b729f752c11a4d32d9
 AUX zsh-init.d-gentoo-r1.diff 987 RMD160 1b8c5227426d6332d30639749b000c213dbb0ed7 SHA1 839dbf7890d1ccdb16c1cdd692ea69866d178b3a SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6
 AUX zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a SHA1 eb91fb330c0df1e227ee541159c7ac2d2fe15e53 SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f
 DIST zsh-4.3.10-doc.tar.bz2 2690183 RMD160 b56fd30ac63e2d3f2479c7d390ced260cad604f7 SHA1 e67e10478aa69a9e9cc92986515d337efc30a2bf SHA256 f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9
 DIST zsh-4.3.10.tar.bz2 2735665 RMD160 fad1412b76d1388d825cb870681c21696fdfa273 SHA1 132f9ce411bf318abccbae9cdc2f8cc14f8be85b SHA256 63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
 DIST zsh-4.3.11-doc.tar.bz2 2687527 RMD160 b6ef6fef121b49f7060163b5b1493987af6dfe3f SHA1 5f3a6a35f23596738e911b9f8847808da5c765ba SHA256 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c
 DIST zsh-4.3.11.tar.bz2 2868429 RMD160 e5e0d79231cdb95e6b6edac0e1b81db6c0018c37 SHA1 25cf0daadc4543d147f6241573d6730b60f16016 SHA256 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05
-DIST zsh-4.3.4-doc.tar.bz2 2358063 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 SHA1 83d1a38112f305892393cb036058248ebbf6168e SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
-DIST zsh-4.3.4-zshcalsys.tar.bz2 9346 RMD160 d26b370853419494725a73524ba81c754d63a201 SHA1 d93379f8dc81dcd63737519374e7d7d1ffb3cd87 SHA256 4225eb85ead732423405b567c879280780073a39fff3a05c6b6b13f29f0a382e
-DIST zsh-4.3.4.tar.bz2 2374851 RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c SHA1 6bd905c4bf61bf3df5e5bb78f64be68366ad7517 SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6
-DIST zsh-4.3.5-doc.tar.bz2 2463496 RMD160 8b99214f1af6c0ab072b5f54c9e2148185a595d8 SHA1 8f762fd345e3447ea8a60f4869d7583facdc2820 SHA256 7dd2cd44d093a357a3b9fb5c1dba84345f3eaf4638cd968f9a8ea3bb622fc349
-DIST zsh-4.3.5.tar.bz2 2513384 RMD160 99d12deb6131e4ddc73811b146ebb5b05a4ec77b SHA1 9ab505ff4c029b4905d2c4b741f0f0d42e4375c9 SHA256 ebe74df173d5b713e4e839e691da279dc9b4d4d0d98b9886cc725217e9902105
-DIST zsh-4.3.6-doc.tar.bz2 2473544 RMD160 048e0a30fa860d20020932f5f030edb8661697e1 SHA1 0475edfbbe2d745f3247f3b70a23ed9f169ca7b7 SHA256 a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
-DIST zsh-4.3.6.tar.bz2 2527972 RMD160 fedd72f427439e75b8488479a3d20e9d8d5be794 SHA1 7600f56d4304d1b84428b57a9b1d394de185c207 SHA256 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
-DIST zsh-4.3.9-doc.tar.bz2 2570995 RMD160 c7080f41901bd4b6d0b8e9f9385fd57a9d73a383 SHA1 456a696de365066b32161d194de9c7643dbeb7a0 SHA256 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
-DIST zsh-4.3.9.tar.bz2 2659602 RMD160 2c88347fa357e3624f000721963749c6ccb4e129 SHA1 7c80e1ad6b311ee5877172a1a7e0161a9a60da70 SHA256 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
-DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
 DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
-EBUILD zsh-4.3.10-r1.ebuild 5086 RMD160 a1f4472197f8f6d13f4363cec4f14cab031b7208 SHA1 d427338985d35efca9ca2bb170da390ea3eebbc1 SHA256 8feaa1b118d76c37e98916e2ad059bf664ee508fe06d3c1f1d2680303cb6c662
 EBUILD zsh-4.3.10-r2.ebuild 5905 RMD160 df5410f570dc6d54b17acf5300b6119e14f5d7ea SHA1 933f1c70bdb88a98aa062231f5eb092e35824ad3 SHA256 94f70b6f56ad16b508bc3f3a7807ed5b033b3da5a628fc6ebef6d7bafecdbd72
-EBUILD zsh-4.3.10.ebuild 5124 RMD160 a4143f9142d1f16a48f88c15931e99d7965fc4c3 SHA1 5d95030e05ed8a8fe61bc6d13aba290a748dee39 SHA256 45e3ec13bd86e2be2d1eca2919ebfdfe65ccae42d4713c0fd1f54f5f8ab57660
 EBUILD zsh-4.3.11.ebuild 5858 RMD160 798f63c69ae09932601297c60c1a57c014297b8c SHA1 668daaa8ee2014a1204e9c56dcfb521079356b2f SHA256 8d8107a5f4d7864f4e1652b8d6700856c00baf719a5bc86289807836bae96133
-EBUILD zsh-4.3.4-r1.ebuild 4937 RMD160 eae72421392ddec85165875da2ae86ce9f47dc4d SHA1 93e289f637ace754e11b63a1c7d584a6014a7338 SHA256 86489b1dd6aefe9e84379f1e4f9b378cd2e4e8114c60a0cfbad66e93ab4d56e8
-EBUILD zsh-4.3.5.ebuild 3967 RMD160 80ff8f3d833bf79f92b574f984f46e1b0b911a05 SHA1 144f8ebd1a4f844aa3a5e807501f9f589181e10f SHA256 ba0cb5a089909a0178dbae67cf5975a822e1c0f039b2dc532f6787f2324b26a9
-EBUILD zsh-4.3.6.ebuild 4597 RMD160 60ec0dfa7339d56ab52da03c950acd6f4046a72d SHA1 b3662be5429293fb0af800de54e561ad0e83f334 SHA256 27c233d2f6e10fbfb45429b012e90ab3b3da2ea7811269c1e46a5117f335b2b8
-EBUILD zsh-4.3.9.ebuild 5080 RMD160 f13d87b246091cd154bd742fbb39e71b6862d698 SHA1 a0d105c1631eda3b2a6aa6cd77a4e244b4ca70d8 SHA256 ade1ddb234629a9b72e0719c354dc7f44ab4c5e18219f9aa75a8efa99cf18424
-MISC ChangeLog 23503 RMD160 349e25ca1bba92f621ead539994de55fd75169a3 SHA1 d3bcd271f1e3973d9cbe553f1957368693bc1c38 SHA256 ed70a88a8f544128c4883e8229fbacb2acdefaf0fefb702dcdea04c547f4f6e7
+MISC ChangeLog 23817 RMD160 ba3bc6a27f57e36296686f68fc6286cd378948e7 SHA1 a98ef33fe4faebf80ccde59428daa6eb9598f1a0 SHA256 190547fce59e803da56bbd4a577442ce4ca83d11a875d496c9849d5b0b1d9b15
 MISC metadata.xml 687 RMD160 e94628d9ba29a25d88ddee955c07f9b3b2f5493c SHA1 70a129986b433b75b3058da59b80f2d6a6e24c1d SHA256 88e44fba71b8f1eef862b2fdda513ee28c1c3fbbce6e3ddc7e13408bbfcab3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAk0hl38ACgkQV3J2n04EauwkXwCXQAeqJgtyWgOmdQ5eehdbJyvo
-awCgxsu/HxOQSkfOMMqOZlDr4YYTpZU=
-=xftf
+iEYEARECAAYFAk0hmJAACgkQV3J2n04Eauy7mACg0uBmnPempzxgdKj5ER16Ikoj
+AioAn1V3wCbPgRlp7KyY8jQHR0k+FWKx
+=ziqE
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/prompt_gentoo_setup b/app-shells/zsh/files/prompt_gentoo_setup
deleted file mode 100644
index abc3ceb154c5..000000000000
--- a/app-shells/zsh/files/prompt_gentoo_setup
+++ /dev/null
@@ -1,45 +0,0 @@
-# gentoo prompt theme
-
-prompt_gentoo_help () {
-  cat <<'EOF'
-This prompt is color-scheme-able.  You can invoke it thus:
-
-  prompt gentoo [<promptcolor> [<usercolor> [<rootcolor>]]]
-
-EOF
-}
-
-prompt_gentoo_setup () {
-  prompt_gentoo_prompt=${1:-'blue'}
-  prompt_gentoo_user=${2:-'green'}
-  prompt_gentoo_root=${3:-'red'}
-
-  if [ "$USER" = 'root' ]
-  then
-    base_prompt="%{$fg_bold[$prompt_gentoo_root]%}%m%{$reset_color%} "
-  else
-    base_prompt="%{$fg_bold[$prompt_gentoo_user]%}%n@%m%{$reset_color%} "
-  fi
-  post_prompt="%{$reset_color%}"
-
-  local color="%{*}"
-  base_prompt_no_color="${(S)base_prompt//${~color}/}"
-  post_prompt_no_color="${(S)post_prompt//${~color}/}"
-
-  setopt noxtrace localoptions
-  local base_prompt_expanded_no_color base_prompt_etc
-  local prompt_length space_left
-
-  base_prompt_expanded_no_color=$(print -P "$base_prompt_no_color")
-  base_prompt_etc=$(print -P "$base_prompt%(4~|...|)%3~")
-  prompt_length=${#base_prompt_etc}
-  path_prompt="%{$fg_bold[$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"
-
-  precmd  () { }
-  preexec () { }
-}
-
-prompt_gentoo_setup "$@"
diff --git a/app-shells/zsh/files/zprofile b/app-shells/zsh/files/zprofile
deleted file mode 100644
index 73a7cf83d0f4..000000000000
--- a/app-shells/zsh/files/zprofile
+++ /dev/null
@@ -1,41 +0,0 @@
-# /etc/zsh/zprofile
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.5 2008/05/23 12:02:51 tove Exp $
-
-# Load environment settings from profile.env, which is created by
-# env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
-	. /etc/profile.env
-fi
-
-# You should override these in your ~/.zprofile (or equivalent) for per-user
-# settings.  For system defaults, you can add a new file in /etc/profile.d/.
-export EDITOR=${EDITOR:-/bin/nano}
-export PAGER=${PAGER:-/usr/bin/less}
-
-# 077 would be more secure, but 022 is generally quite realistic
-umask 022
-
-# Set up PATH depending on whether we're root or a normal user.
-# There's no real reason to exclude sbin paths from the normal user,
-# but it can make tab-completion easier when they aren't in the
-# user's PATH to pollute the executable namespace.
-#
-# It is intentional in the following line to use || instead of -o.
-# This way the evaluation can be short-circuited and calling whoami is
-# avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
-else
-	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-fi
-export PATH
-unset ROOTPATH
-
-shopts=$-
-setopt nullglob
-for sh in /etc/profile.d/*.sh ; do
-	[ -r "$sh" ] && . "$sh"
-done
-unsetopt nullglob
-set -$shopts
-unset sh shopts
diff --git a/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch b/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch
deleted file mode 100644
index 2abad2462ee2..000000000000
--- a/app-shells/zsh/files/zsh-4.3.4-configure-changequote.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2007-01-05 13:58:04 +0000
-+++ b/configure.ac	2007-08-16 09:17:29 +0100
-@@ -2249,6 +2249,10 @@
-   zsh_cv_sys_elf=yes,
-   zsh_cv_sys_elf=no,
-   zsh_cv_sys_elf=yes)])
-+  
-+  # We use [0-9]* in case statements, so need to change quoting
-+  changequote(, )
-+
-   DL_EXT="${DL_EXT=so}"
-   if test x$zsh_cv_sys_elf = xyes; then
-     case "$host" in
-@@ -2352,6 +2356,10 @@
-       esac
-     ;;
-   esac
-+
-+  # Done with our shell code, so restore autotools quoting
-+  changequote([, ])
-+  
-   AC_CACHE_CHECK(if your dlsym() needs a leading underscore,
-    zsh_cv_func_dlsym_needs_underscore,
-    [echo failed >conftestval && cat >conftest.c <<EOM
diff --git a/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch b/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch
deleted file mode 100644
index f8dea0397a9b..000000000000
--- a/app-shells/zsh/files/zsh-4.3.4-mkmakemod.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-bug #254348
---- a/Src/mkmakemod.sh
-+++ b/Src/mkmakemod.sh
-@@ -111,10 +111,7 @@
-     sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
-     module_list="${bin_mods}${dyn_mods}"
- 
--    # check 2.13, 2.50, and 2.60 syntaxes
--    if grep '%@D@%D%' config.status >/dev/null ||
--       grep ',@D@,D,' config.status >/dev/null ||
--       grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
-+    if grep '^#define DYNAMIC ' config.h >/dev/null; then
- 	is_dynamic=true
-     else
- 	is_dynamic=false
diff --git a/app-shells/zsh/zsh-4.3.10-r1.ebuild b/app-shells/zsh/zsh-4.3.10-r1.ebuild
deleted file mode 100644
index f45ba4182243..000000000000
--- a/app-shells/zsh/zsh-4.3.10-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.10-r1.ebuild,v 1.1 2010/05/02 18:41:39 tove Exp $
-
-EAPI=2
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit flag-o-matic eutils multilib
-
-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
-
-LOVERS_PV=0.5.orig
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="${ZSH_URI}
-	examples? ( ${LOVERS_URI}/zsh-lovers_${LOVERS_PV}.tar.gz )
-	doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	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 app-doc/heirloom-doctools )
-	${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.diff
-}
-
-src_configure() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf="${myconf} \
-			--enable-zsh-debug \
-			--enable-zsh-mem-debug \
-			--enable-zsh-mem-warning \
-			--enable-zsh-secure-free \
-			--enable-zsh-hash-debug"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/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
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	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="${D}" install install.info || die
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/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:/usr: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
-#		a2x -f manpage zsh-lovers.1.txt
-#		a2x -f pdf zsh-lovers.1.txt
-#		mv zsh-lovers.1.pdf zsh-lovers.pdf
-
-		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 zsh-lovers.pdf 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
-}
diff --git a/app-shells/zsh/zsh-4.3.10.ebuild b/app-shells/zsh/zsh-4.3.10.ebuild
deleted file mode 100644
index d0832faae245..000000000000
--- a/app-shells/zsh/zsh-4.3.10.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.10.ebuild,v 1.3 2010/01/25 01:44:58 tgall Exp $
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit flag-o-matic eutils multilib
-
-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
-
-LOVERS_PV=0.5.orig
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="${ZSH_URI}
-	examples? ( ${LOVERS_URI}/zsh-lovers_${LOVERS_PV}.tar.gz )
-	doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	gdbm? ( sys-libs/gdbm )"
-DEPEND="|| ( sys-apps/groff app-doc/heirloom-doctools )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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.diff
-}
-
-src_compile() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf="${myconf} \
-			--enable-zsh-debug \
-			--enable-zsh-mem-debug \
-			--enable-zsh-mem-warning \
-			--enable-zsh-secure-free \
-			--enable-zsh-hash-debug"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--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} || die "configure failed"
-
-	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 's/cap.mdd link=static/cap.mdd link=no/' \
-			-e 's/curses.mdd link=static/curses.mdd link=no/' \
-			config.modules || die
-		if ! use gdbm ; then
-			sed -i 's/gdbm.mdd link=static/gdbm.mdd link=no/' \
-				config.modules || die
-		fi
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	fi
-
-	emake || die "make failed"
-}
-
-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="${D}" install install.info || die
-
-	# Bug 207019
-	rm "${D}"/bin/${PN}-${MY_PV} || die
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/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:/usr: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
-		cd "${WORKDIR}/${PN}-${PV%_*}"
-		dohtml -r Doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf} || die
-		cd -
-	fi
-
-	if use examples ; then
-		cd "${WORKDIR}/${LOVERS_P/.orig/}"
-#		asciidoc zsh-lovers.1.txt
-#		mv zsh-lovers.1.html zsh-lovers.html
-#		a2x -f manpage zsh-lovers.1.txt
-#		a2x -f pdf zsh-lovers.1.txt
-#		mv zsh-lovers.1.pdf zsh-lovers.pdf
-
-		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 zsh-lovers.pdf refcard.pdf || die
-		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
-		doins -r zsh_people || die "doins zsh_people failed"
-		cd -
-	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
-}
diff --git a/app-shells/zsh/zsh-4.3.4-r1.ebuild b/app-shells/zsh/zsh-4.3.4-r1.ebuild
deleted file mode 100644
index 3da981cfc94d..000000000000
--- a/app-shells/zsh/zsh-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4-r1.ebuild,v 1.11 2009/01/21 11:20:25 tove Exp $
-
-inherit eutils multilib autotools
-
-LOVERS_PV=0.5
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	mirror://gentoo/${P}-zshcalsys.tar.bz2
-	examples? (
-	http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz )
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="maildir static doc examples pcre caps unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9 )"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-
-	# fixes #201022 and
-	# http://www.zsh.org/mla/workers/2007/msg01065.html
-	rm Util/difflog.pl
-
-	epatch "${FILESDIR}/${PN}"-init.d-gentoo.diff
-	epatch "${FILESDIR}/${P}"-configure-changequote.patch
-	epatch "${FILESDIR}/${P}"-mkmakemod.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		LDFLAGS="${LDFLAGS} -static"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-curses-terminfo \
-		--with-tcsetpgrp \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable caps) \
-		$(use_enable unicode multibyte) \
-		${myconf} || die "configure failed"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		sed -i -e "s/link=no/link=static/g" \
-			-e "s/load=no/load=yes/g" \
-			config.modules || die
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	fi
-
-	emake || die "make failed"
-}
-
-src_test() {
-	local f=
-	for f in /dev/pt* ; do
-		addpredict "$f"
-	done
-	make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir="${D}"/bin \
-		libdir="${D}"/usr/$(get_libdir) \
-		fndir="${D}"/usr/share/zsh/${PV%_*}/functions \
-		sitefndir="${D}"/usr/share/zsh/site-functions \
-		scriptdir="${D}"/usr/share/zsh/${PV%_*}/scripts \
-		install.bin install.man install.modules \
-		install.info install.fns || die "make install failed"
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins "${FILESDIR}"/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || die "sed failed"
-	insinto /usr/share/zsh/${PV%_*}/Util
-	doins Util/* || die "doins Util scripts failed"
-	insinto /usr/share/zsh/${PV%_*}/Misc
-	doins Misc/* || die "doins Misc scripts failed"
-
-	dodoc ChangeLog* META-FAQ README config.modules
-
-	if use doc ; then
-		dohtml Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf}
-	fi
-
-	if use examples; then
-		cd "${WORKDIR}/${LOVERS_P}"
-		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
-		insinto /usr/share/doc/"${PF}"/zsh-lovers
-		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf}
-		doins -r zsh_people || die "doins zsh_people failed"
-		cd -
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_preinst() {
-	# Our zprofile file does the job of the old zshenv file
-	# Move the old version into a zprofile script so the normal
-	# etc-update process will handle any changes.
-	if [ -f "${ROOT}/etc/zsh/zshenv" -a ! -f "${ROOT}/etc/zsh/zprofile" ]; then
-		ewarn "Renaming /etc/zsh/zshenv to /etc/zsh/zprofile."
-		ewarn "The zprofile file does the job of the old zshenv file."
-		mv "${ROOT}"/etc/zsh/{zshenv,zprofile}
-	fi
-}
-
-pkg_postinst() {
-	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
-	# see Bug 26776
-	ewarn
-	ewarn "If you are upgrading from zsh-4.0.x you may need to"
-	ewarn "remove all your old ~/.zcompdump files in order to use"
-	ewarn "completion.  For more info see zcompsys manpage."
-	ewarn
-}
diff --git a/app-shells/zsh/zsh-4.3.5.ebuild b/app-shells/zsh/zsh-4.3.5.ebuild
deleted file mode 100644
index e92f2da547d2..000000000000
--- a/app-shells/zsh/zsh-4.3.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.5.ebuild,v 1.1 2008/02/02 22:22:54 tove Exp $
-
-inherit eutils multilib
-
-LOVERS_PV=0.5
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	examples? ( http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz )
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="maildir static doc examples pcre caps unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9 )"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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.diff
-}
-
-src_compile() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		LDFLAGS="${LDFLAGS} -static"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-curses-terminfo \
-		--with-tcsetpgrp \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable caps cap) \
-		$(use_enable unicode multibyte) \
-		${myconf} || die "configure failed"
-
-	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 's/cap.mdd link=static/cap.mdd link=no/' \
-			-e 's/curses.mdd link=static/curses.mdd link=no/' \
-			config.modules || die
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	fi
-
-	emake || die "make failed"
-}
-
-src_test() {
-	local f=
-	for f in /dev/pt* ; do
-		addpredict "$f"
-	done
-	make check || ewarn "make check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.info || die
-
-	# Bug 207019
-	rm "${D}"/bin/${P} || die
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/zprofile || die
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins "${FILESDIR}"/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	local i
-	sed -i -e "s:/usr/local:/usr: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
-		dohtml -r "${S}"/Doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf} || die
-	fi
-
-	if use examples ; then
-		cd "${WORKDIR}/${LOVERS_P}"
-		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
-		insinto /usr/share/doc/${PF}/zsh-lovers
-		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
-		doins -r zsh_people || die "doins zsh_people failed"
-		cd -
-	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
-}
diff --git a/app-shells/zsh/zsh-4.3.6.ebuild b/app-shells/zsh/zsh-4.3.6.ebuild
deleted file mode 100644
index 22e5cec9d4c8..000000000000
--- a/app-shells/zsh/zsh-4.3.6.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.6.ebuild,v 1.1 2008/04/04 08:31:19 tove Exp $
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit flag-o-matic eutils multilib
-
-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
-
-LOVERS_PV=0.5.orig
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="${ZSH_URI}
-	examples? ( ${LOVERS_URI}/zsh-lovers_${LOVERS_PV}.tar.gz )
-	doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="maildir static doc examples pcre caps unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9 )"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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.diff
-}
-
-src_compile() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		append-ldflags -static
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-term-lib="ncursesw ncurses" \
-		--with-tcsetpgrp \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable caps cap) \
-		$(use_enable unicode multibyte) \
-		${myconf} || die "configure failed"
-
-	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 's/cap.mdd link=static/cap.mdd link=no/' \
-			-e 's/curses.mdd link=static/curses.mdd link=no/' \
-			config.modules || die
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	fi
-
-	emake || die "make failed"
-}
-
-src_test() {
-	local f=
-	for f in /dev/pt* ; do
-		addpredict "$f"
-	done
-	make check || ewarn "make check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.info || die
-
-	# Bug 207019
-	rm "${D}"/bin/${PN}-${MY_PV} || die
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/zprofile || die
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins "${FILESDIR}"/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	local i
-	sed -i -e "s:/usr/local:/usr: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
-		cd "${WORKDIR}/${PN}-${PV%_*}"
-		dohtml -r Doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf} || die
-		cd -
-	fi
-
-	if use examples ; then
-		cd "${WORKDIR}/${LOVERS_P/.orig/}"
-#		asciidoc zsh-lovers.1.txt
-#		mv zsh-lovers.1.html zsh-lovers.html
-#		a2x -f manpage zsh-lovers.1.txt
-#		a2x -f pdf zsh-lovers.1.txt
-#		mv zsh-lovers.1.pdf zsh-lovers.pdf
-
-		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
-		insinto /usr/share/doc/${PF}/zsh-lovers
-#		doins zsh-lovers.pdf refcard.pdf || die
-		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
-		doins -r zsh_people || die "doins zsh_people failed"
-		cd -
-	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
-}
diff --git a/app-shells/zsh/zsh-4.3.9.ebuild b/app-shells/zsh/zsh-4.3.9.ebuild
deleted file mode 100644
index b03893ea2d05..000000000000
--- a/app-shells/zsh/zsh-4.3.9.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.9.ebuild,v 1.9 2009/05/07 13:26:39 tove Exp $
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit flag-o-matic eutils multilib
-
-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
-
-LOVERS_PV=0.5.orig
-LOVERS_P=zsh-lovers-${LOVERS_PV}
-LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="${ZSH_URI}
-	examples? ( ${LOVERS_URI}/zsh-lovers_${LOVERS_PV}.tar.gz )
-	doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	gdbm? ( sys-libs/gdbm )"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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.diff
-}
-
-src_compile() {
-	local myconf=
-
-	if use static ; then
-		myconf="${myconf} --disable-dynamic"
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf="${myconf} \
-			--enable-zsh-debug \
-			--enable-zsh-mem-debug \
-			--enable-zsh-mem-warning \
-			--enable-zsh-secure-free \
-			--enable-zsh-hash-debug"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--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} || die "configure failed"
-
-	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 's/cap.mdd link=static/cap.mdd link=no/' \
-			-e 's/curses.mdd link=static/curses.mdd link=no/' \
-			config.modules || die
-		if ! use gdbm ; then
-			sed -i 's/gdbm.mdd link=static/gdbm.mdd link=no/' \
-				config.modules || die
-		fi
-#	else
-#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
-	fi
-
-	emake || die "make failed"
-}
-
-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="${D}" install install.info || die
-
-	# Bug 207019
-	rm "${D}"/bin/${PN}-${MY_PV} || die
-
-	insinto /etc/zsh
-	doins "${FILESDIR}"/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:/usr: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
-		cd "${WORKDIR}/${PN}-${PV%_*}"
-		dohtml -r Doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf} || die
-		cd -
-	fi
-
-	if use examples ; then
-		cd "${WORKDIR}/${LOVERS_P/.orig/}"
-#		asciidoc zsh-lovers.1.txt
-#		mv zsh-lovers.1.html zsh-lovers.html
-#		a2x -f manpage zsh-lovers.1.txt
-#		a2x -f pdf zsh-lovers.1.txt
-#		mv zsh-lovers.1.pdf zsh-lovers.pdf
-
-		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 zsh-lovers.pdf refcard.pdf || die
-		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
-		doins -r zsh_people || die "doins zsh_people failed"
-		cd -
-	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
-}