3 files changed, 14 insertions, 197 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index e376dd130e14..21656b05a4f5 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.227 2013/09/07 20:13:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.228 2013/09/11 07:54:56 radhermit Exp $
+
+  11 Sep 2013; Tim Harder <radhermit@gentoo.org> -zsh-5.0.2.ebuild:
+  Remove old.
 
   07 Sep 2013; Agostino Sarubbo <ago@gentoo.org> zsh-5.0.2-r3.ebuild:
   Stable for sparc, wrt bug #482626
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 6777e77317c1..c0ab98a6ac1b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX prompt_gentoo_setup-1 820 SHA256 818aede5695c1406bd2e720ab114bef13d373e48ee5a1f2cda7d36a9c26e30e1 SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0 WHIRLPOOL 228d48c52ad48e97bb6e83e2a8c9970c49d7c10f61d9fe597ed7882a07aff5ab68d6997e81ae23b1588589c0ab3e19f452b791dda0ab9f3213ac0b751a8e82c2
 AUX zprofile-1 1767 SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8 SHA512 b91712ecb491ae01c58d30b1791257cf2714523dc956d2f59a6875c390157f0492644d0bc00323b84a130e6c0fd73a6f4bd06c38707f31abbe156a2c950a7cd7 WHIRLPOOL 22820e886b459596c8c3149f77d72dfe56ca8a08d134e4c0a96f0b74ea04190d10a38f46bd009f7cf09a606a7b1cbddee9ea4800d382ccaadb96ff11e14f8e39
@@ -9,23 +9,16 @@ AUX zsh-init.d-gentoo-r1.diff 987 SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d
 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
 EBUILD zsh-5.0.2-r3.ebuild 5709 SHA256 842db561fd08a8e1600cf715bc8af7bfcf7c6153de6f0ebae416d6f4b60882c4 SHA512 9ed6b1b57f701dfdcb0863b31403cff0bc9072c3492b5109dd3cf102432718d9dcb67fd08b31dfdf123a57b76906528bb427c030e6e9057f9f368898de180a8d WHIRLPOOL 8434427f419830fcbe65705676069bfb198ac9d98527127e4a3187fa77a2f67518f91e5ee0e57d7c2acc6281d001e87677aa89a8c4428f5477f9ef6ad32dd176
-EBUILD zsh-5.0.2.ebuild 4853 SHA256 4a92eeee65d278911d344d65e072d48730ff9cbe4798952fe53a89f55e6f26ff SHA512 2962ec7b748d87fe8fdbc2d08e4360fff54b3610d64328130eb188f7df9bbe9a4ac9da47c15a11296055597d52b71cd0436ab9219ee7e17b9306ce600c2ce539 WHIRLPOOL 904b8945805e19e40975f687b7d98b187134994245d9ff2b672824ea828e8a18c4c69bf3a3925fdf8e1f329d28b2dda6567a4becb81e2b7689094001fa7e7f3e
-MISC ChangeLog 31924 SHA256 8b89c2751760b1841d20158259e0e335bfef9df980411beb14c151f5da0a3565 SHA512 993379464c46da8e75f8ae13238ba002bd72a67d8dbd3cb83b82f760a9bff42027f3cb3a7fc72a419bfa704698b3b98c8b06ff4b9933827774ce86ba6fa4b469 WHIRLPOOL 5a38fca6eefb8cf66a07b885c1b024751622d3c38d47f2be452555366506ca2060b2ff96065520faba788137881cff44a702271af0d4e6a75285a30c3f7348e6
+MISC ChangeLog 32013 SHA256 ca509586c39759eac75beaf7572576d84cee98ab9179892c0b72c5839b9d2f92 SHA512 03aeb7ac125c9155e21bf140e2f0470bef2a2e05d32e0365a178ba4e6bc7dd5f077d1b1d5183088a066117bdd860957997b032d31be61cff59f22e0eb6924595 WHIRLPOOL 09fe2cf9d2778b00e3136d637269d8e4eb157c2d5a1767efe383dc0d50b75144e51790709d8c44b5ece8478ff4383aa63c8b3c96bc10cef1bebdc1192952edd6
 MISC metadata.xml 623 SHA256 4a0ef2c5b1e84fa69ae3f083100783c94a2aeaaf7b2873c742c17d3d3eb774f9 SHA512 ffca6940323e6a69207712e3e7d1af49bbb8e090aeb2c44f05c5cd71065262cc8ebd05687fc65b6342e1f54ed7e135f6546d7271a82ca290ceb6a6b50248f3c7 WHIRLPOOL 048c6ae42b18d16197a8593f83ab519a9a25571828abc50d1ca0b6a9d019b9bcaf28c2343069771c392547c66b55fd6c517bf6e5608269f433f36d32bb5b2b9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSK4gxAAoJELp701BxlEWfzKwP/jr2O7lgE17CYOZJrLHqV3nz
-HrzfZ3Sz8SOU8Aq/HFGf/qbiyk/DayN37DUeqq7xkehCfWv7P4X+mP7dYphlXiUo
-Jjrbv/gXc4FAgL8UUaTYgDgUlFqFnkelgM415oopCMe1u8vCU3hUJa79aKcZr5ZV
-B7tShEuGdXPEPRvfXe6fXGOXfiC/WqngbVoXWu9MjkG9fthlb2bXvcEr3HeI07Au
-9l5L+mDscqV9wvoxaB0ZNnZpv6AWTk3p9haSxgNPoGfqjdfxY3hn0dp49+dJX0f7
-REXhyVoGxZ5Glrwl4pTjtCcupZvxlXRrq6GQMwnjuiJJaJmcx0zT94Jz/RguqlKf
-OYQo+5cFkRVVgp1eEYQCByw61t/nx1uKDkjjRjAtqoGJhJZXq4FYdv1DOA5JnTYu
-dN4offqvDT7kcs9Vn5xz5Ei1F3s2+lqrFKVoFLGYw9QBooagkxWMyElteulTwjsc
-9y7ejWT+PxoLzi45WRcB4Srdr7PZXby9ZvC76w4YkLb3zM1/o2slsGMz6+rHUmmI
-POGHJr12mKwW6iAF0rXBPFhJAh02iV+WECTtuMCOD9B6xMyk0Y0IqfagVB0gqhYo
-FDXhoyORqoA9r8P3hxN3YuvACWJEjeOL32lJ9X1dw+bNEUu0TPSI5cgpLeIkCZHP
-otrt3e1avDV2aChEJkiD
-=6Ww1
+iQEcBAEBCAAGBQJSMCHZAAoJEEqz6FtPBkyjX/EH/itmxTunf0v9DCsPQsMZ7YDQ
+EG9g5fFmQiFTiwpWXkkgROx3L/VOxGxw6SCGdp3FKNW7Cibhrg4JRMV85IZkoLWd
+uYH2ENGGZ1092duM6XglHUOjIUfpJW5SORfNpmn6lRAX1tYuDqwYTo2eg1lSMo9G
+c9drFJu7Tt0GlrgYX3xlCNe0kp26d6KmauzBlpjz+38iUpekDd4X1wyISHzWnnef
+9KqxQh+MDtXQEYuiUtlrG1bbYy9IavWSPYH1l4voZv5XJJw5aqkmjxcJRr1FstAb
+sKBmdPesR7eegih8inW+7c80L9pHbhHQm1EFa6Ne5IUn+7oOZJedGoMJTQzeXa8=
+=y4c5
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-5.0.2.ebuild b/app-shells/zsh/zsh-5.0.2.ebuild
deleted file mode 100644
index 6702afd63085..000000000000
--- a/app-shells/zsh/zsh-5.0.2.ebuild
+++ /dev/null
@@ -1,179 +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.ebuild,v 1.12 2013/03/15 13:29:32 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
-
-	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() {
-	# 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
-}