Version bump (bug #494786), add support for run-help data (bug #431402), and skip zpty tests that require LEGACY_PTYS enabled on Linux.

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

3 files changed, 190 insertions, 10 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 21656b05a4f5..bb2804b289d8 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.228 2013/09/11 07:54:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.229 2013/12/23 06:09:32 radhermit Exp $
+
+*zsh-5.0.4 (23 Dec 2013)
+
+  23 Dec 2013; Tim Harder <radhermit@gentoo.org> +zsh-5.0.4.ebuild:
+  Version bump (bug #494786), add support for run-help data (bug #431402), and
+  skip zpty tests that require LEGACY_PTYS enabled on Linux.
 
   11 Sep 2013; Tim Harder <radhermit@gentoo.org> -zsh-5.0.2.ebuild:
   Remove old.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c0ab98a6ac1b..7ba3d1a57fed 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -8,17 +8,20 @@ AUX zsh-fix-parameter-modifier-crash.patch 1473 SHA256 b09008bb59eeddad53d18c682
 AUX zsh-init.d-gentoo-r1.diff 987 SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6 SHA512 56ed616177c0167d1819d9749539c035907f4524a3e145b152ca7ac6236c96f0110eb23479794f35fbf86c9ea72286ab832f1a9e3e658b676353bc78e1b06a38 WHIRLPOOL 9680ac95c216d42774f6ebe5f3b28574110e82560c71b0a3dcd4d8ab90f746b3515b0119dda74038b89c457b1d9274e9f14f6923c47c7877ca64938bf24b1983
 DIST zsh-5.0.2-doc.tar.bz2 2902019 SHA256 99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1 SHA512 95a197b5220fccefce43b8cb3f868186a84db697de768d897a3a50f8eb74802e7974e9b9df15d39b897af54852f66d0af668cc8ab0e557412ea1a712ec1c601f WHIRLPOOL f13e09e71d51e769eec68910a155fcb036f0910adc87f357071dc78edf2c3a830d75e9d75a256aa2d6415c5aa0200721ddcbc7e590c84cf7d7febe92b0c513c3
 DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 SHA512 096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d WHIRLPOOL ff5214ced2cebe50c3fd090a1d12727ee5672875f38fdda5f068ccdd260cc85336bb22fa445d028d6e8df8bdbe53605034e55c3f435cf5a11e981b8ae6821bf0
+DIST zsh-5.0.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
 EBUILD zsh-5.0.2-r3.ebuild 5709 SHA256 842db561fd08a8e1600cf715bc8af7bfcf7c6153de6f0ebae416d6f4b60882c4 SHA512 9ed6b1b57f701dfdcb0863b31403cff0bc9072c3492b5109dd3cf102432718d9dcb67fd08b31dfdf123a57b76906528bb427c030e6e9057f9f368898de180a8d WHIRLPOOL 8434427f419830fcbe65705676069bfb198ac9d98527127e4a3187fa77a2f67518f91e5ee0e57d7c2acc6281d001e87677aa89a8c4428f5477f9ef6ad32dd176
-MISC ChangeLog 32013 SHA256 ca509586c39759eac75beaf7572576d84cee98ab9179892c0b72c5839b9d2f92 SHA512 03aeb7ac125c9155e21bf140e2f0470bef2a2e05d32e0365a178ba4e6bc7dd5f077d1b1d5183088a066117bdd860957997b032d31be61cff59f22e0eb6924595 WHIRLPOOL 09fe2cf9d2778b00e3136d637269d8e4eb157c2d5a1767efe383dc0d50b75144e51790709d8c44b5ece8478ff4383aa63c8b3c96bc10cef1bebdc1192952edd6
+EBUILD zsh-5.0.4.ebuild 5217 SHA256 3c9642d074e5aedcb95e653c2308a650a8e2c63d1bee90b665841b8ab97bdb38 SHA512 63dc6f7d78655c2732aa9341eea6f164458a02713587e905779652944f29f6b3ebc2112c9818e945bf14a9d2f563802dac2df8f444adb5b2c3b676a521c36c30 WHIRLPOOL 4ac5cc7e2b87fd307f5bb590ec215bcb9a374e7257fbd90f519fbc760ba845ca801159b066dbdc6e4894f2883cc1986942ddc7759ab1bca447c21a60ed5e1bbf
+MISC ChangeLog 32248 SHA256 e240a8238f5b4da4df73f46c2df1afec7ff14bb19b8a7e1388f1ee5962254c70 SHA512 7f6566e895bf1b434a657334391bf4d0c3253624fec3f9b7279a4cf11f43ec632e3490a075f6bf40146bd36055dabab0f554f66c988b8274befd031678318377 WHIRLPOOL 3c12476a8a23e89622e401ed5ab39915b1c6ccc79a0381569df1dba14930f7fb521bf9f77388e39a1c1650c365370e1b32521a9a6aea6efa616590fc56ba4aec
 MISC metadata.xml 623 SHA256 4a0ef2c5b1e84fa69ae3f083100783c94a2aeaaf7b2873c742c17d3d3eb774f9 SHA512 ffca6940323e6a69207712e3e7d1af49bbb8e090aeb2c44f05c5cd71065262cc8ebd05687fc65b6342e1f54ed7e135f6546d7271a82ca290ceb6a6b50248f3c7 WHIRLPOOL 048c6ae42b18d16197a8593f83ab519a9a25571828abc50d1ca0b6a9d019b9bcaf28c2343069771c392547c66b55fd6c517bf6e5608269f433f36d32bb5b2b9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMCHZAAoJEEqz6FtPBkyjX/EH/itmxTunf0v9DCsPQsMZ7YDQ
-EG9g5fFmQiFTiwpWXkkgROx3L/VOxGxw6SCGdp3FKNW7Cibhrg4JRMV85IZkoLWd
-uYH2ENGGZ1092duM6XglHUOjIUfpJW5SORfNpmn6lRAX1tYuDqwYTo2eg1lSMo9G
-c9drFJu7Tt0GlrgYX3xlCNe0kp26d6KmauzBlpjz+38iUpekDd4X1wyISHzWnnef
-9KqxQh+MDtXQEYuiUtlrG1bbYy9IavWSPYH1l4voZv5XJJw5aqkmjxcJRr1FstAb
-sKBmdPesR7eegih8inW+7c80L9pHbhHQm1EFa6Ne5IUn+7oOZJedGoMJTQzeXa8=
-=y4c5
+iQEcBAEBCAAGBQJSt9OhAAoJEEqz6FtPBkyjfUsH/3JlVr4wvRliXQ0VERMtHJi5
+Bz0NvZcqimg8f9TE/Xtr+9M+c7rE28TT7lQKfcdmz8l0ZUD/j0sEHCAmHnsN+b8p
+f5GU6tQDZSbFSNOYJR3LR5BHt56rCNk+xIl6G/DkKd3Gs1GVlTl7PEDtOVnj1fv3
+VwwkrCyOvdnN+kIed1zHtWCbjS8Jtap6LfD58CTX3vAcxWlc9zU2A3FMHDzmwZNu
+TjKRtIb1aoclIrh2S5gBMLrtUpwA4k0RBqZKLDUqUHgUS+qDpZmIT+Gtn6bgTDjA
+9NfvF5s13xWcSOB2hqgh7OXHDfjV3A3Z7fYLgtG1c16/m/32YYil97GajEnbPlk=
+=YrM8
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-5.0.4.ebuild b/app-shells/zsh/zsh-5.0.4.ebuild
new file mode 100644
index 000000000000..5dc0b95b811c
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.4.ebuild
@@ -0,0 +1,171 @@
+# 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
+}