5 files changed, 254 insertions, 20 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 5b5efd133036..91280eb236a1 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.213 2013/05/29 10:26:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.214 2013/06/25 19:00:29 radhermit Exp $
+
+*zsh-5.0.2-r2 (25 Jun 2013)
+
+  25 Jun 2013; Tim Harder <radhermit@gentoo.org> +zsh-5.0.2-r2.ebuild,
+  files/prompt_gentoo_setup-1, +files/zshenv-1:
+  Revbump, install system zshenv file instead of zprofile (bug #19924) and use
+  local variables for gentoo prompt script (bug #453584, patch by Marckus J).
 
   29 May 2013; Tim Harder <radhermit@gentoo.org> zsh-5.0.2-r1.ebuild,
   +files/zsh-5.0.2-texinfo-5.1.patch:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index d6591224290f..894f5c7e5ad0 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX prompt_gentoo_setup-1 745 SHA256 c04da5152712fcd2eb2b83a1967f892f31cc087e1245b28e4806ab5099ac16e7 SHA512 97005a2942af11272662be5b07bfbfaa716838921a669ec1f0e5837b4df3ee226b4be43fe3d1bf663b2c3a0d3aec4101a6f5c62501492d7a3bf1a72cc0642191 WHIRLPOOL 7837760bd0a3b6a2f3ce7c99a96c88768f8ff0d3746acbd70173ae18200272958e835d933226c969475509bfd8e4cb8abfaabbd049ff000f2851298f1808bfe8
+AUX prompt_gentoo_setup-1 820 SHA256 818aede5695c1406bd2e720ab114bef13d373e48ee5a1f2cda7d36a9c26e30e1 SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0 WHIRLPOOL 228d48c52ad48e97bb6e83e2a8c9970c49d7c10f61d9fe597ed7882a07aff5ab68d6997e81ae23b1588589c0ab3e19f452b791dda0ab9f3213ac0b751a8e82c2
 AUX zprofile-1 1767 SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8 SHA512 b91712ecb491ae01c58d30b1791257cf2714523dc956d2f59a6875c390157f0492644d0bc00323b84a130e6c0fd73a6f4bd06c38707f31abbe156a2c950a7cd7 WHIRLPOOL 22820e886b459596c8c3149f77d72dfe56ca8a08d134e4c0a96f0b74ea04190d10a38f46bd009f7cf09a606a7b1cbddee9ea4800d382ccaadb96ff11e14f8e39
 AUX zsh-5.0.2-texinfo-5.1.patch 6021 SHA256 c9c1e2e022402ff2fffbcc3fd9fcfe76f5a473e443f88b9c48d5f1948a7dc241 SHA512 f5466f9e0dde5394f1fbfb383f047255c92770bb5f6c87d912e2668d17eaffea09687456b24ce488805328cb9c7e89752d9c6dcf00275af78fa01d03036bb1ed WHIRLPOOL a5491e3df7537f9f200048d4188e41a940814851d48585784615204ae8e6a56f81335ab4ee23be80bf296250d2c75ef472c8e6f344f2d1dbb30e9690df9bb962
 AUX zsh-fix-parameter-modifier-crash.patch 1473 SHA256 b09008bb59eeddad53d18c682155c0eed3b1f19408a04aa7937e00ff9d4f6ce8 SHA512 a59a7de1537a1590f070d82c5c24f56717ffab7b7129dcaa411405b20f01521010f84652cb69a7079ce471c18ae16f62c465121a46b15ea6df0b83543d513332 WHIRLPOOL 1c85779764c34340e598e18d04ca71370d34d7a9c2c67d7a25f2041e996097df7eaf5f62538f7578cbf7c477d3614fbb8e6e3227f10058a3778a72abd8685c2c
 AUX zsh-init.d-gentoo-r1.diff 987 SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6 SHA512 56ed616177c0167d1819d9749539c035907f4524a3e145b152ca7ac6236c96f0110eb23479794f35fbf86c9ea72286ab832f1a9e3e658b676353bc78e1b06a38 WHIRLPOOL 9680ac95c216d42774f6ebe5f3b28574110e82560c71b0a3dcd4d8ab90f746b3515b0119dda74038b89c457b1d9274e9f14f6923c47c7877ca64938bf24b1983
+AUX zshenv-1 1661 SHA256 9d482228fc2309fa290b1e7205257df57e38fb241acc4c699161f36c1412f757 SHA512 4f8eadc3467baac6859086320aa073639b3991808aad15c3e942e8769c5c2a4a141245def6e174be3cd4cdb87047a5f180f87ecd70af9d2ff2d1117fcf9857c4 WHIRLPOOL 5c513f86075a61b7bb8ba527430ece3e0b72d827961b71f3881ac219b88b3947a3b3f519eefd8ef006059e9be4ada18daa00104c8c31e8bc341d99aded1f6d80
 DIST zsh-4.3.17-doc.tar.bz2 2719164 SHA256 68f71ba6ba0dc56bfdd93573c7f02dcc3a4f06fd8e24a5f9e17202cf5e68cb91 SHA512 1406ed031d8f95311efb2f1b17e3738aad58fded259cb2655f4cda3a68c9ffb37e48dcbd17ad7d583a8688c33048899cc3793eb30700b43d8a8d56b588f6a789 WHIRLPOOL 976ab384271b6c0fc079f2c149e2e033d3b5f9feb4c673f94c588036a33bcea824bda71697d53bf4779649fcf2be6e44105d1b2949bfba0a95d23ad732dfa29b
 DIST zsh-4.3.17.tar.bz2 2978903 SHA256 054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704 SHA512 2849204c5633b3fbf4e61032fd81e20bc9275fa1f41316bf07c4ee482cf3fad070c228c6dd70a71fb63c31c4a34bd1b8e653e0f19649b4980510a278cdf97342 WHIRLPOOL ce599bb1fadacab49426a60625e47340f81978e57a753bc5b094440c201c10b5b0728c4b97f920f362dcc87ab23df2159be0440192daea6ce9e4baea281f7d30
 DIST zsh-5.0.0-doc.tar.bz2 2875712 SHA256 d2219eb3003c108af9d297ff055aa6df3cdb756ccf6b1b2ee3db8a72dbb2ef30 SHA512 9cacf1f77e44ab5c63f0826ed2f62a7fdcf27d96b39973e0e890689cd94773d9e3a5483d86224c48538cef1bfbecd1ad8e50cbf75c1e89f456f37c20e23d879d WHIRLPOOL 70504eae90a2b349c16c0868ee56321f5872afa660c16caf6b727060c197f9f979338d61ec94f358b396fbe9050a0603e697d4188856d844730be1a4cf2f9f71
@@ -15,17 +16,18 @@ DIST zsh-5.0.2.tar.bz2 3025767 SHA256 eb220ae5a8076191ec6b4c6a5a2f18122d074a19f2
 EBUILD zsh-4.3.17.ebuild 4939 SHA256 adb69031db2174ac7151c6db7a03bf4fc03a82b06fd6905370371ce980da9d81 SHA512 46ed833fb818da62c6e6c40da75b7bf3d7b90b65d2d8db1cc90c0eac50b08fd292c20c7f38c915f315721cb69709f5fc112d8847d95bd10d193258bfcb3f84af WHIRLPOOL bf5fa5cf60566d380ed57bd5f651bfc7fb3fb6ab7b32d3b9929a10eb08df26aa6ae201b830eeb7c8a904f112f864fa64c33d33f6dc03e657691108c9f4e213fe
 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.ebuild 4853 SHA256 4a92eeee65d278911d344d65e072d48730ff9cbe4798952fe53a89f55e6f26ff SHA512 2962ec7b748d87fe8fdbc2d08e4360fff54b3610d64328130eb188f7df9bbe9a4ac9da47c15a11296055597d52b71cd0436ab9219ee7e17b9306ce600c2ce539 WHIRLPOOL 904b8945805e19e40975f687b7d98b187134994245d9ff2b672824ea828e8a18c4c69bf3a3925fdf8e1f329d28b2dda6567a4becb81e2b7689094001fa7e7f3e
-MISC ChangeLog 30087 SHA256 b4b99952777370ef58230c92415686103784412cdfa9c0f78960576555f7b423 SHA512 a3424ac1ffc8709d5de03f05cbc22b1600f5aa0326ca6ece1dba079433a082203d429e5aabc8c29714218ac3bfed6e20eb35c861deb7b89fd4c874f2a61a3f89 WHIRLPOOL 13a33e00ea43565b9c1ec16311bd307b5f29a3be3acffafc94c65718325e2522a0e9654074000a4535de6c50639a317a444ea250560fae269614c04deb148f95
+MISC ChangeLog 30393 SHA256 d80bc68af730187ad0d6ab2ecbcd03bf553b8b531c711e6e6da71452e32e8f9b SHA512 b5138d55bdbfaf3d147fc348e279b9ec3395a35ea7c4943fb4b8f0b6ed8f9dbcb685b1ac6ff4c520e367a0d1376fe5c2139fabeb684d7304eb9cf3adfecf1b40 WHIRLPOOL bccf5f9ee745ba140aed42c7b07af4bf1934ff7cf488c3e487db28477ac3c571fb8493fc32bf843b50b7b8a5199b2277c1516363bd9b9192a3c156e7d99278b6
 MISC metadata.xml 666 SHA256 d64774b35c140959fdff968f4fa294846a7c5a48bfe02247cf5d9fe31df5f11d SHA512 3ba2361a58897750093afca4463bf05453d2c98c25b4937676ee44b01a04392ed388dd52a04fdaec618ac65112c4c54441f7576fb2a7f53e24130d52f51c52d8 WHIRLPOOL c0ba786bee0d04768b758997405af9f7b2be05786c581af6b8e9e2451444b03c1792cfba1e4f8d2ea4db5ee2212b25ef1dc7a432e0796c0610c52d881df0c0ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRpdfCAAoJEEqz6FtPBkyjAN0H/1ahC5PZTFpG/TKbboXD5SFX
-4M1OnqZVZmgy98LqfTjvPngq2Tc+r7FuOUy+LBKNRuj7M44wBfc+PD14vzzFjasY
-ZsBXmf/UnHgNIljh0898WTF818cmE1Mb3BHni0Cue2CGyP0OqHPg77APeFoAX9p9
-mb/JqjM2eLmdxcji8/KOP6mK6wMa/XT0HIowoA44lMSTM3PBAbn/VxoUvN6M25S/
-gpO6GStrItfHXu27BGKEwJi0EfT5VrLyUp/UzGV30iNClS6ySuK08m4b64VHA6OE
-nAySM+CwVVXX/WJOylr/N8KHZ9UXTCQ0Qj12kak418ZTq6FNs3axOrfhaZlN10w=
-=n8B3
+iQEcBAEBCAAGBQJRyejRAAoJEEqz6FtPBkyjxkAIAJsKGO6EMxc4Z1Iswi+nkqEV
+5d0UqZ6wy2xJP7ngPniopkWWldAA/8qN+ceU6XgeoUgz02Lr61byvwjpd4MbmbwR
+Itl7607AMxFwzZJnh6rMxq+nbiKxxfrHuh4Jale6FyrKAQeYu3shMAFpAFb4RiLe
+0LMor0p8kDSkx7lqDN2Ot+w49FyXKafU9pPLsEEEIziNtMvZ3vexx2jva6PK/taz
+iKC92A8La0310SVsl6CskjELhF/7Chd/bec9W9G/JCv9a49EzWYTpjL+Qc3E5/Lz
+TAUmtN9w4i7GM605vXiDap4UEufPcCdFIaafFmTqGkuO7BEFn5OZ9ALBGn7ni8w=
+=NHE5
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/prompt_gentoo_setup-1 b/app-shells/zsh/files/prompt_gentoo_setup-1
index 0d071e9864be..046e2d87f53a 100644
--- a/app-shells/zsh/files/prompt_gentoo_setup-1
+++ b/app-shells/zsh/files/prompt_gentoo_setup-1
@@ -10,24 +10,24 @@ EOF
 }
 
 prompt_gentoo_setup () {
-  prompt_gentoo_prompt=${1:-'blue'}
-  prompt_gentoo_user=${2:-'green'}
-  prompt_gentoo_root=${3:-'red'}
+  local prompt_gentoo_prompt=${1:-'blue'}
+  local prompt_gentoo_user=${2:-'green'}
+  local prompt_gentoo_root=${3:-'red'}
 
   if [ "$USER" = 'root' ]
   then
-    base_prompt="%B%F{$prompt_gentoo_root}%m%k "
+    local base_prompt="%B%F{$prompt_gentoo_root}%m%k "
   else
-    base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k "
+    local base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k "
   fi
-  post_prompt="%b%f%k"
+  local post_prompt="%b%f%k"
 
   #setopt noxtrace localoptions
 
-  path_prompt="%B%F{$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"
+  local path_prompt="%B%F{$prompt_gentoo_prompt}%1~"
+  typeset -g PS1="$base_prompt$path_prompt %# $post_prompt"
+  typeset -g PS2="$base_prompt$path_prompt %_> $post_prompt"
+  typeset -g PS3="$base_prompt$path_prompt ?# $post_prompt"
 }
 
 prompt_gentoo_setup "$@"
diff --git a/app-shells/zsh/files/zshenv-1 b/app-shells/zsh/files/zshenv-1
new file mode 100644
index 000000000000..8bafafeed859
--- /dev/null
+++ b/app-shells/zsh/files/zshenv-1
@@ -0,0 +1,42 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zshenv
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/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
+	@ZSH_NOPREFIX@PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+	@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
+else
+	@ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+	@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
+	[ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.0.2-r2.ebuild b/app-shells/zsh/zsh-5.0.2-r2.ebuild
new file mode 100644
index 000000000000..23612108a5ff
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.2-r2.ebuild
@@ -0,0 +1,183 @@
+# 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-r2.ebuild,v 1.1 2013/06/25 19:00:29 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}"/zshenv-1 "${T}"/zshenv || die
+	eprefixify "${T}"/zshenv || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zshenv || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zshenv || 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}"/zshenv
+
+	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
+		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
+	fi
+}