Version bump (bug #497392). Drop explicit term-lib settings (fixes bug #457570).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 189 insertions, 6 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 499f513b447f..2affa55e822c 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.231 2013/12/23 15:43:53 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.232 2014/01/08 02:10:24 radhermit Exp $
+
+*zsh-5.0.5 (08 Jan 2014)
+
+  08 Jan 2014; Tim Harder <radhermit@gentoo.org> +zsh-5.0.5.ebuild:
+  Version bump (bug #497392). Drop explicit term-lib settings (fixes bug
+  #457570).
 
   23 Dec 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #65652
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index e46b9a261d1e..a3f01326a9d8 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -10,14 +10,21 @@ DIST zsh-5.0.2-doc.tar.bz2 2902019 SHA256 99ee08cfc91935af8714bd98db652f016d6c7a
 DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 SHA512 096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d WHIRLPOOL ff5214ced2cebe50c3fd090a1d12727ee5672875f38fdda5f068ccdd260cc85336bb22fa445d028d6e8df8bdbe53605034e55c3f435cf5a11e981b8ae6821bf0
 DIST zsh-5.0.4-doc.tar.bz2 2939263 SHA256 8995d71dd41f8e7dbccfcbe3658b9c2a13f50d3eb88f9cf4f8e962adb31946a1 SHA512 7effc7a7ed638f63f48c73df794a1a51622fc0462c87a8f0434ca3e6ca6aebc2b5998cfe178c6111b92e426b5fa5c66e1a97d475ba13b2ab35da9fc427f11def WHIRLPOOL 70fbe8f9d6296b14a15a2bd6d0e06595020757bc9509c253173b0ae09c75e93fb0f943f346f72166fda481668929bd52ce200728ee46290627c29b7485e457fd
 DIST zsh-5.0.4.tar.bz2 3093541 SHA256 e96fe7c9440adb4169fd4b2f0d9a5c8bdf1498423bc2efd2c3205ef7c1de4ee8 SHA512 935cb53cf461d43b960b7a227620009f4de07e977106e16171bebf76a0e4b08b3d9bba0ec2cac9e4ed92d2a57f8776edb8895b63fa3978b19e07ab1dacfee1e0 WHIRLPOOL 9fb7a19bf46f6c5f3fc1871f4151ccf9fb5d781ec17cf867589c523b48cb910a2fcd586e4ecf6abb313c10b1d1c2ef734bb40a883d77c26f4276c2d5d702b9de
+DIST zsh-5.0.5-doc.tar.bz2 2940018 SHA256 e4f22bafaa8410bbc2d83f2d748ca4764365752c46f7e1099be54f2a62c492f2 SHA512 341e4a62c7c2367d17c54c5133b7c0a74e6c0becfaddd3c1f5dbe782300bbd74b0fc2066e892776cb52ce11cd0600739bfd5a7dd067eaae8a1d11b1b2aa0c3b0 WHIRLPOOL 48e021bc2caf840d048888faf5cafea5ce698968479e1c8791f33dc36f9b0f60db16ff481e88ce8c903480d905b728eb9ff9dfc8fbcb066d3698cc0cc3a02d8a
+DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf SHA512 34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5 WHIRLPOOL bf02ca194261e15e88a9e26212644aa7be1afcc8e73cd6bb18ffb8e1c1d46a8742fee109d92a3b455c418258df9ae74dece21a05ff0e54e8c370af094512af16
 EBUILD zsh-5.0.2-r3.ebuild 5709 SHA256 842db561fd08a8e1600cf715bc8af7bfcf7c6153de6f0ebae416d6f4b60882c4 SHA512 9ed6b1b57f701dfdcb0863b31403cff0bc9072c3492b5109dd3cf102432718d9dcb67fd08b31dfdf123a57b76906528bb427c030e6e9057f9f368898de180a8d WHIRLPOOL 8434427f419830fcbe65705676069bfb198ac9d98527127e4a3187fa77a2f67518f91e5ee0e57d7c2acc6281d001e87677aa89a8c4428f5477f9ef6ad32dd176
 EBUILD zsh-5.0.4.ebuild 5217 SHA256 3c9642d074e5aedcb95e653c2308a650a8e2c63d1bee90b665841b8ab97bdb38 SHA512 63dc6f7d78655c2732aa9341eea6f164458a02713587e905779652944f29f6b3ebc2112c9818e945bf14a9d2f563802dac2df8f444adb5b2c3b676a521c36c30 WHIRLPOOL 4ac5cc7e2b87fd307f5bb590ec215bcb9a374e7257fbd90f519fbc760ba845ca801159b066dbdc6e4894f2883cc1986942ddc7759ab1bca447c21a60ed5e1bbf
-MISC ChangeLog 32330 SHA256 258ab9f052e34f1eae302eeea4ac2d5cf972f82e41aa6fe67f12b5cebf6df1ef SHA512 f84b5cc7c74a7401c2d6ecd863c169deeb1fccc9238f8434e95391b19f1ddac2c6c6c173579b0085b6651da193768b6bb5c96ff68964afb83008367a5074b842 WHIRLPOOL 507bb3491a12ce92ad38d20acd54acbcd0c1d1feb2bfb9352f676eff9eb1092d62bb256196b1cbeb8842ad7356a66546a52a0a959b87270b89a90b3647b61841
+EBUILD zsh-5.0.5.ebuild 5178 SHA256 7af8e18c948e7bd9659fd96cdf8d58d8b8adb14453f9b3b828fec830fa0d9652 SHA512 6f89d97e076a647f7f59f5f2472c9b9feade5a7a2cb8a5f1e8b72dd59806e2b6a4c24835fbcb1013901cc417dbfaa2b8d43843de1c3245313621562372bcaa81 WHIRLPOOL 280940d73088876a2ee268ed5c2d0100ff543f94b18f24f73b287593103a47a2a1886a8b250539f00d0b18b1a7283f4f30095a82e26cb458d3e1b988939bb845
+MISC ChangeLog 32514 SHA256 3e22384fb3f7e0da60d6efc38725fe6b456bc8fa467a3be6c75f1c082533236e SHA512 da66097afb3d00455fa699eab0ea6df79e608cecce26905d5195ba35e0e421a938d86968a29086925b88b57961d194a6d16999d3304c5102cef2f7a688ffa449 WHIRLPOOL ecc7a64bec1ceab5834735c1129b4ad0da84b9b1bc252cd88ce48bb0f31adf5b2d00c1c65468fbbdf551298d951ff4b9251dce452758e177df36ca1cdb5d8d2d
 MISC metadata.xml 485 SHA256 84d741251360af7179bf3a275080446750e3e360b4f48937b8a623ccd7602c12 SHA512 e702b9c921b24b7303e0936fe6370f901173e1bfa9bc91bacc747c69dda8205ab785f77088e6d9ea357b4863bb56b17bbe787ddc33290c1b7561764b0856cf6e WHIRLPOOL 3abceaebe3c2ec65bcfccfe040bb7693a5100d604d247bb252ce8d670fd5eb4229ea1ae24ae3b4d3ef8d1cd4eb5d8e64063ebb019b83a021c20f47283c039a94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK4WjoACgkQCaWpQKGI+9Tj1wCeMFGw9OG87zNLty4UwfwcODua
-4FcAnRVdxLGJUNISRemD8YARqofdICLd
-=s/Dj
+iQEcBAEBCAAGBQJSzLOUAAoJEEqz6FtPBkyjxicH/0BwVXq3HP8fJvNf0qHDwHkV
+ZNNWDhnKyCDbClKsGsF7+R6Orj3lqnFa3yQYHXwKx31jrfZplKz3YEX32RKhfhgw
+RWLnjrk8CBo1Y+zpxEwZ1Me0ZqlsAe1V3+iKndlY2dcn228UE7KbYOwHi0want8M
+4A1+3Q4zMAP2KbIo7x9xNB8X/TGVwCMn2XjnWpeXbABMTr0BLBT/atl074Rz27iY
+T4AuhHe4xPemT3PWrV4s4VwkTqn5hLe/CTTWE7pwEpgC3ccfi7Axa9CmycjzrKzz
+E5Kb7oQfVg8ZhauFBabpoWjjomx14Q+GWVj9Pd3vxdi3ujnPKyJPCDU6RDdhVtI=
+=fIVK
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-5.0.5.ebuild b/app-shells/zsh/zsh-5.0.5.ebuild
new file mode 100644
index 000000000000..0e28e8034c38
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.5.ebuild
@@ -0,0 +1,170 @@
+# 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.5.ebuild,v 1.1 2014/01/08 02:10:25 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
+}