Revert to using a system zprofile instead of zshenv and add info for new users trying to set PATH in ~/.zshenv.

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

3 files changed, 209 insertions, 9 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 91280eb236a1..d21f72b99855 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.214 2013/06/25 19:00:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.215 2013/07/16 19:16:13 radhermit Exp $
+
+*zsh-5.0.2-r3 (16 Jul 2013)
+
+  16 Jul 2013; Tim Harder <radhermit@gentoo.org> +zsh-5.0.2-r3.ebuild:
+  Revert to using a system zprofile instead of zshenv and add info for new
+  users trying to set PATH in ~/.zshenv.
 
 *zsh-5.0.2-r2 (25 Jun 2013)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 894f5c7e5ad0..65ac3bd511d2 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -17,17 +17,18 @@ EBUILD zsh-4.3.17.ebuild 4939 SHA256 adb69031db2174ac7151c6db7a03bf4fc03a82b06fd
 EBUILD zsh-5.0.0.ebuild 4955 SHA256 ec653f7d6d4411a73b6b0d25769e00c77cdcc7d13b3a1381e1cddc45a0fed280 SHA512 5bfe43aa3addd2f771cd3d7ab18f4b844cb0558c06835d836ff8b81b3db9f2bfc0fac2f3bc8f69a07679e9e4c4c6203addd605908d4fbb8521a6f41d3ba110e6 WHIRLPOOL 90756bc87ce186cd72c7852598d92178ad6ef0661806c06c93475546a561485113273f212b62eae54b9ddfda55beb40e5fd066c3654db64dc58a479690bfbd0a
 EBUILD zsh-5.0.2-r1.ebuild 5046 SHA256 0d4848f9e9d418489fbaa844fdf01c4f0139e06ee02c398c4275739e2f6183bb SHA512 b9ef954ae7135bf0d24dd380629044887e8d1575e12bdd5920e26d9bfe3ace720763999748caf176867d84d4810663cbcaa481d748c41215796253993d0c326f WHIRLPOOL e25eb7e18fb08c617659449449eaf220a8f0c15cde58eda95c204ff3f5c91622edbd108fd9356c1704ac8cbd1bf8d6ded67abf4180298e433a78adbae81c626a
 EBUILD zsh-5.0.2-r2.ebuild 5034 SHA256 4a9920be5b873962371460129ce8a37b651c7e61580638aaca4c9a244e41c12e SHA512 66ed449cfda92003589ba776e48a31334729e3ca91804fdd335afdd2fdc0dee6174289c786bcdaf5eec1b272c02cfb27e682d9e03d18981a85daa6d9fa641789 WHIRLPOOL a06331d595df12c3f453ca184bdf54ffdab18adee33e83f9781477ca31b6d88d53effd4b7452186899d638ba8cb8f560d0151936881264ba36b3985211407e08
+EBUILD zsh-5.0.2-r3.ebuild 5725 SHA256 86e91e80e1eb5971439be45a87fa262bc34606543b0c36de81ea41df763aebcf SHA512 d95ee0c96497db96923fdf85b4d8db594f17edf30df4369239d02430c721d987a018a0e2c8f786386c4db2488bf6b37078953474d2544f8b6281b4251e015e91 WHIRLPOOL 44f9701984f04b4079ad6394739eca1c6276a37bd652a3fa41f911237c9feff8cc941b0840cb3e9af015fb73d4df8203c0a1b92fc057c8cb9c888c3990610f5b
 EBUILD zsh-5.0.2.ebuild 4853 SHA256 4a92eeee65d278911d344d65e072d48730ff9cbe4798952fe53a89f55e6f26ff SHA512 2962ec7b748d87fe8fdbc2d08e4360fff54b3610d64328130eb188f7df9bbe9a4ac9da47c15a11296055597d52b71cd0436ab9219ee7e17b9306ce600c2ce539 WHIRLPOOL 904b8945805e19e40975f687b7d98b187134994245d9ff2b672824ea828e8a18c4c69bf3a3925fdf8e1f329d28b2dda6567a4becb81e2b7689094001fa7e7f3e
-MISC ChangeLog 30393 SHA256 d80bc68af730187ad0d6ab2ecbcd03bf553b8b531c711e6e6da71452e32e8f9b SHA512 b5138d55bdbfaf3d147fc348e279b9ec3395a35ea7c4943fb4b8f0b6ed8f9dbcb685b1ac6ff4c520e367a0d1376fe5c2139fabeb684d7304eb9cf3adfecf1b40 WHIRLPOOL bccf5f9ee745ba140aed42c7b07af4bf1934ff7cf488c3e487db28477ac3c571fb8493fc32bf843b50b7b8a5199b2277c1516363bd9b9192a3c156e7d99278b6
+MISC ChangeLog 30610 SHA256 de71f97f4fce03fb856f8695bc5be23c89ec5a09aac97b6803d965d84cb50037 SHA512 55db439bb4adbab90e2452337c7764ac065566b15b93232a3378c0fb030e370193c2193ad1b6ef1cff79f859ce5fc896c36fbcb49968c1bec8b6ad3552add8d6 WHIRLPOOL 64d28ecf27f274e935ad3779ba62765c763d6f1c9786c5a9aff7637ffc2f69c64c13fe50a26863189455a5728896bb965904caea81da82d88c860845ae3d29f0
 MISC metadata.xml 666 SHA256 d64774b35c140959fdff968f4fa294846a7c5a48bfe02247cf5d9fe31df5f11d SHA512 3ba2361a58897750093afca4463bf05453d2c98c25b4937676ee44b01a04392ed388dd52a04fdaec618ac65112c4c54441f7576fb2a7f53e24130d52f51c52d8 WHIRLPOOL c0ba786bee0d04768b758997405af9f7b2be05786c581af6b8e9e2451444b03c1792cfba1e4f8d2ea4db5ee2212b25ef1dc7a432e0796c0610c52d881df0c0ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRyejRAAoJEEqz6FtPBkyjxkAIAJsKGO6EMxc4Z1Iswi+nkqEV
-5d0UqZ6wy2xJP7ngPniopkWWldAA/8qN+ceU6XgeoUgz02Lr61byvwjpd4MbmbwR
-Itl7607AMxFwzZJnh6rMxq+nbiKxxfrHuh4Jale6FyrKAQeYu3shMAFpAFb4RiLe
-0LMor0p8kDSkx7lqDN2Ot+w49FyXKafU9pPLsEEEIziNtMvZ3vexx2jva6PK/taz
-iKC92A8La0310SVsl6CskjELhF/7Chd/bec9W9G/JCv9a49EzWYTpjL+Qc3E5/Lz
-TAUmtN9w4i7GM605vXiDap4UEufPcCdFIaafFmTqGkuO7BEFn5OZ9ALBGn7ni8w=
-=NHE5
+iQEcBAEBCAAGBQJR5ZwBAAoJEEqz6FtPBkyjWNcH+wRfCDPJQq7t/3bfjlJkxC8t
+NHmaILzvlPy22/GfeTt+MRFqkGcLljW1deOpxR/s9m4w7V5ki2bsjgZDXvuSyNEw
+GbPbAicOCC7B0t/updGtsr7ueLUGdtVLC76AWZn9a9VfEZ9VIbG++6agNYxPTJWR
+pdXynlkGM2IGPL6TFDl/sm4TytvGYkpN9E2ZtyC9O/vJPkIXxHWRWggnWJOcA0Z9
+fFA4UpW19uddw5y8aCm3RpMeXuMNJ0OdcN8lTpmx0ZFFxZghh7+IzBYcf0AKGRR7
+G4UZbtWVbfeL8PHvh1LcORnVeGCdfCQdm4bJ5vOxM0UGqL0L0EJ70t/k3s0kaeU=
+=hNjV
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-5.0.2-r3.ebuild b/app-shells/zsh/zsh-5.0.2-r3.ebuild
new file mode 100644
index 000000000000..a4b062a5ef99
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.2-r3.ebuild
@@ -0,0 +1,193 @@
+# 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.1 2013/07/16 19:16:13 radhermit 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
+}