Updated header and correct multilib build problems discussed in Bug 133539 (introduced by changes from Bug 27064)

(Portage version: 2.0.54-r2)

11 files changed, 339 insertions, 54 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index c4c2e840c07e..de23bfcc8a13 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.94 2006/03/15 10:33:39 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.95 2006/05/25 17:40:49 merlin Exp $
+
+  25 May 2006; Cory Visi <visi@gentoo.org> zsh-4.2.6.ebuild, zsh-4.3.2.ebuild:
+  Updated header and correct multilib build problems discussed in Bug 133539
+  (introduced by changes from Bug 27064)
 
   15 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> zsh-4.3.2.ebuild:
   Added missing unicode IUSE flag.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index f356a9ab82fa..436c5505ea36 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,54 +1,22 @@
-MD5 50c49eb49d092ba6f4f87619fe4010f5 ChangeLog 14795
-RMD160 5bb34812a0bd7cbe92bceade74ffcd29c81f9d2d ChangeLog 14795
-SHA256 fed5fee7165ceab97bfb1f2c8ba1102bd139010791129ccca1698a32589f648f ChangeLog 14795
+MD5 6c2880bccb2dba7a013fca916bccb938 ChangeLog 14993
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
-RMD160 1b8b39c45159a46f45ece7fd4f876193916b7664 files/digest-zsh-4.0.9-r4 199
-SHA256 813a9aee75bc6dc4ecc969f0f31f2281101906c1762a6de844e6e326ea8363f0 files/digest-zsh-4.0.9-r4 199
 MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
-RMD160 6eda70316ac4fda7d3442da0ec454ac76a081a95 files/digest-zsh-4.2.4 199
-SHA256 beee445b08c1b046285e35045007182f2a0337c847ce89a9efb0d984b74ab696 files/digest-zsh-4.2.4 199
 MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
-RMD160 e356bf63a98977db2ac4fbf4ca129803efdd5724 files/digest-zsh-4.2.5 199
-SHA256 1f2f59ac82b58f7a16049755855237af70df6776937e1238709e4c986987e38b files/digest-zsh-4.2.5 199
 MD5 6a0124cadb5fb33bee5400ae9acc74c0 files/digest-zsh-4.2.6 199
-RMD160 9160e2b1a47dd18fd75a341785505003c80e3e5a files/digest-zsh-4.2.6 199
-SHA256 cce15859c71ecc380db6b02c50f30ac316c295a172b651be56da23129eec8ca2 files/digest-zsh-4.2.6 199
+MD5 0a98d1389721ff23a192e03df3825e70 files/digest-zsh-4.2.6-r1 199
 MD5 da3a0178918bcb34c920992cd720b743 files/digest-zsh-4.3.2 130
-RMD160 74c6faadf7ead39bfc03a5640903b37e3d48d5f6 files/digest-zsh-4.3.2 130
-SHA256 30d2699d33519c6cd671cfaf2c1bb367e37fa998422d520d934ed519732fa4cd files/digest-zsh-4.3.2 130
+MD5 da3a0178918bcb34c920992cd720b743 files/digest-zsh-4.3.2-r1 130
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
-RMD160 883f6a906300a4d8300145f722769db57c90ece2 files/prompt_gentoo_setup 1222
-SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667 files/prompt_gentoo_setup 1222
 MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
-RMD160 e0fb3dcacd3da70adc6eecb684c7066ef3493b5c files/zprofile 403
-SHA256 4b5809f1d62f47e931a161e25215d4ef97a04845e92c3f74e9daa9cc9615f56c files/zprofile 403
 MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 files/zsh-4.2.1-gentoo.diff 735
-SHA256 a8a236864616138a376aa5a2d0f9795604f7bf369d99f2fb82abb513482318f2 files/zsh-4.2.1-gentoo.diff 735
 MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
-RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a files/zsh-init.d-gentoo.diff 1389
-SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f files/zsh-init.d-gentoo.diff 1389
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-RMD160 399b597c7cc525f9d50954718c7330a9a5224a5c files/zsh-strncmp.diff 354
-SHA256 b0bc29f18c81514cf279ce7bf4bfcd4625b8c8b958889a129387c09c00440b73 files/zsh-strncmp.diff 354
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-RMD160 dc38becda0ad8ea8931ba46c84ca337e0f503800 files/zshenv 318
-SHA256 609036567f335e35b6b638233cbcd11c2e2c60b18849cecac2e1e953f4aae323 files/zshenv 318
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506
-SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729 metadata.xml 506
-MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
-RMD160 e8bded519dce1e4e5836e168bdfc74f02b19c98e zsh-4.0.9-r4.ebuild 2893
-SHA256 e4eb0f7ca5ce338ae90d1f04d1c52df26750d4a40092499141d550172c2f1e4f zsh-4.0.9-r4.ebuild 2893
-MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
-RMD160 5a33f4d22c32c5a8df979d242561614973210e6d zsh-4.2.4.ebuild 4307
-SHA256 47f39562667b2209972fde89ef2a4f210063bc8637d88f5daf5eb915c9a36c71 zsh-4.2.4.ebuild 4307
-MD5 c2b2ed1462888163d7f8ec514e975d93 zsh-4.2.5.ebuild 4541
-RMD160 aa3e730fb118876ae06e42c23ebfe9f3d8a0e0a7 zsh-4.2.5.ebuild 4541
-SHA256 7382d347c134b7e7c15fbd883c4fb2624404f28dfeb6cb09360c080ecfd80c45 zsh-4.2.5.ebuild 4541
-MD5 39091c8cc0b53e3d30539193df98e5a8 zsh-4.2.6.ebuild 4326
-RMD160 3617f7713682ff2eb2d801dbfabf6a06c14d89a0 zsh-4.2.6.ebuild 4326
-SHA256 852e684edcc2b0d5a9b1cee0e2ada0ace9ccedbac9877a79b689e879dd92b9b1 zsh-4.2.6.ebuild 4326
-MD5 801c87f6547b4608fd0e6d12894e9c10 zsh-4.3.2.ebuild 4271
-RMD160 b2ed32d9b3a2ed12a04686f69403998b674c4c22 zsh-4.3.2.ebuild 4271
-SHA256 4a17b80668f665e13171c3658183b687a80271c263fe435c46284a7e7012b8d3 zsh-4.3.2.ebuild 4271
+MD5 390cc2a61100f245e6e8ccd2d72bea33 zsh-4.0.9-r4.ebuild 2893
+MD5 358adb5077a4414bfaeaa3205609e284 zsh-4.2.4.ebuild 4307
+MD5 8bf20788366d64a5b08acd657756016b zsh-4.2.5.ebuild 4541
+MD5 1bb55a307307883f0e627504833afeb3 zsh-4.2.6-r1.ebuild 4232
+MD5 43a967dd17360f609731131152177da0 zsh-4.2.6.ebuild 4336
+MD5 a6c3f57b5a1b4ce898743b4dc9237ed0 zsh-4.3.2-r1.ebuild 4181
+MD5 f276d271ace2ad282bed072eff12be39 zsh-4.3.2.ebuild 4281
diff --git a/app-shells/zsh/files/digest-zsh-4.2.6-r1 b/app-shells/zsh/files/digest-zsh-4.2.6-r1
new file mode 100644
index 000000000000..923ad9e473f4
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.6-r1
@@ -0,0 +1,3 @@
+MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
+MD5 3ca3b7c199db6eb942f2a296e3fad270 zsh-4.2.6-doc.tar.bz2 1770113
+MD5 2cefebf742c190cbc611baded825db64 zsh-4.2.6.tar.bz2 2098671
diff --git a/app-shells/zsh/files/digest-zsh-4.3.2-r1 b/app-shells/zsh/files/digest-zsh-4.3.2-r1
new file mode 100644
index 000000000000..cac0f8281031
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.3.2-r1
@@ -0,0 +1,2 @@
+MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375
+MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544
diff --git a/app-shells/zsh/zsh-4.0.9-r4.ebuild b/app-shells/zsh/zsh-4.0.9-r4.ebuild
index 5f8154f7ba55..c3abcdece25d 100644
--- a/app-shells/zsh/zsh-4.0.9-r4.ebuild
+++ b/app-shells/zsh/zsh-4.0.9-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r4.ebuild,v 1.3 2005/01/01 16:01:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r4.ebuild,v 1.4 2006/05/25 17:40:49 merlin Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/app-shells/zsh/zsh-4.2.4.ebuild b/app-shells/zsh/zsh-4.2.4.ebuild
index ec518f20301e..ee11fc962fef 100644
--- a/app-shells/zsh/zsh-4.2.4.ebuild
+++ b/app-shells/zsh/zsh-4.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.4.ebuild,v 1.8 2005/03/31 20:56:43 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.4.ebuild,v 1.9 2006/05/25 17:40:49 merlin Exp $
 
 inherit eutils
 
diff --git a/app-shells/zsh/zsh-4.2.5.ebuild b/app-shells/zsh/zsh-4.2.5.ebuild
index e71450670589..2d23f0ff31d9 100644
--- a/app-shells/zsh/zsh-4.2.5.ebuild
+++ b/app-shells/zsh/zsh-4.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.5.ebuild,v 1.10 2005/09/04 12:23:41 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.5.ebuild,v 1.11 2006/05/25 17:40:49 merlin Exp $
 
 inherit eutils multilib
 
diff --git a/app-shells/zsh/zsh-4.2.6-r1.ebuild b/app-shells/zsh/zsh-4.2.6-r1.ebuild
new file mode 100644
index 000000000000..d69d9572a5bb
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.6-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.6-r1.ebuild,v 1.1 2006/05/25 17:40:49 merlin Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	linguas_ja? ( http://www.ono.org/software/dist/${PN}-4.2.4-euc-0.3.patch.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="maildir ncurses static doc pcre cap"
+
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	cap? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack ${P}-doc.tar.bz2
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
+	use linguas_ja && epatch ${DISTDIR}/${PN}-4.2.4-euc-0.3.patch.gz
+	cd ${S}/Doc
+	ln -sf . man1
+	# fix zshall problem with soelim
+	soelim zshall.1 > zshall.1.soelim
+	mv zshall.1.soelim zshall.1
+}
+
+src_compile() {
+	local myconf
+
+	use static && myconf="${myconf} --disable-dynamic" \
+		&& LDFLAGS="${LDFLAGS} -static"
+
+	if use ppc-macos; then
+		LDFLAGS="${LDFLAGS} -Wl,-x"
+		myconf="${myconf} --enable-libs=-liconv"
+	fi
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/$(get_libdir) \
+		--enable-etcdir=/etc/zsh \
+		--enable-zshenv=/etc/zsh/zshenv \
+		--enable-zlogin=/etc/zsh/zlogin \
+		--enable-zlogout=/etc/zsh/zlogout \
+		--enable-zprofile=/etc/zsh/zprofile \
+		--enable-zshrc=/etc/zsh/zshrc \
+		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir=/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--enable-ldflags="${LDFLAGS}" \
+		--with-tcsetpgrp \
+		$(use_with ncurses curses-terminfo) \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable cap) \
+		${myconf} || die "configure failed"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		sed -i -e "s/link=no/link=static/g" \
+			-e "s/load=no/load=yes/g" \
+			config.modules || die
+	else
+		# avoid linking to libs in /usr/lib, see Bug #27064
+		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+			Makefile || die
+	fi
+
+	# emake still b0rks
+	emake -j1 || die "make failed"
+}
+
+src_test() {
+	for f in /dev/pt* ; do
+		addpredict $f
+	done
+	make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/$(get_libdir) \
+		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
+		sitefndir=${D}/usr/share/zsh/site-functions \
+		install.bin install.man install.modules \
+		install.info install.fns || die "make install failed"
+
+	insinto /etc/zsh
+	doins ${FILESDIR}/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
+	insinto /usr/share/zsh/${PV%_*}/Util
+	doins Util/* || die "doins Util scripts failed"
+	insinto /usr/share/zsh/${PV%_*}/Misc
+	doins Misc/* || die "doins Misc scripts failed"
+
+	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+
+	if use doc ; then
+		dohtml Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_preinst() {
+	# Our zprofile file does the job of the old zshenv file
+	# Move the old version into a zprofile script so the normal
+	# etc-update process will handle any changes.
+	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
+		mv /etc/zsh/zshenv /etc/zsh/zprofile
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you want to enable Portage completions and Gentoo prompt,"
+	einfo "emerge app-shells/zsh-completion and add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
+	einfo "Also, if you want to enable cache for the completions, add"
+	einfo "	zstyle ':completion::complete:*' use-cache 1"
+	einfo "to your ~/.zshrc"
+	einfo
+	# see Bug 26776
+	ewarn
+	ewarn "If you are upgrading from zsh-4.0.x you may need to"
+	ewarn "remove all your old ~/.zcompdump files in order to use"
+	ewarn "completion.  For more info see zcompsys manpage."
+	ewarn
+}
diff --git a/app-shells/zsh/zsh-4.2.6.ebuild b/app-shells/zsh/zsh-4.2.6.ebuild
index 904c6df4379f..290830c6056e 100644
--- a/app-shells/zsh/zsh-4.2.6.ebuild
+++ b/app-shells/zsh/zsh-4.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.6.ebuild,v 1.2 2005/12/28 22:56:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.6.ebuild,v 1.3 2006/05/25 17:40:49 merlin Exp $
 
 inherit eutils multilib
 
@@ -73,7 +73,7 @@ src_compile() {
 			config.modules || die
 	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
 			Makefile || die
 	fi
 
diff --git a/app-shells/zsh/zsh-4.3.2-r1.ebuild b/app-shells/zsh/zsh-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..ff566fed78c1
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r1.ebuild,v 1.1 2006/05/25 17:40:49 merlin Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="maildir ncurses static doc pcre cap unicode"
+
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	cap? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack ${P}-doc.tar.bz2
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
+	cd ${S}/Doc
+	ln -sf . man1
+	# fix zshall problem with soelim
+	soelim zshall.1 > zshall.1.soelim
+	mv zshall.1.soelim zshall.1
+}
+
+src_compile() {
+	local myconf
+
+	use static && myconf="${myconf} --disable-dynamic" \
+		&& LDFLAGS="${LDFLAGS} -static"
+
+	if use ppc-macos; then
+		LDFLAGS="${LDFLAGS} -Wl,-x"
+		myconf="${myconf} --enable-libs=-liconv"
+	fi
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/$(get_libdir) \
+		--enable-etcdir=/etc/zsh \
+		--enable-zshenv=/etc/zsh/zshenv \
+		--enable-zlogin=/etc/zsh/zlogin \
+		--enable-zlogout=/etc/zsh/zlogout \
+		--enable-zprofile=/etc/zsh/zprofile \
+		--enable-zshrc=/etc/zsh/zshrc \
+		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir=/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--enable-ldflags="${LDFLAGS}" \
+		--with-tcsetpgrp \
+		$(use_with ncurses curses-terminfo) \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable cap) \
+		$(use_enable unicode multibyte) \
+		${myconf} || die "configure failed"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		sed -i -e "s/link=no/link=static/g" \
+			-e "s/load=no/load=yes/g" \
+			config.modules || die
+	else
+		# avoid linking to libs in /usr/lib, see Bug #27064
+		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+			Makefile || die
+	fi
+
+	# emake still b0rks
+	emake -j1 || die "make failed"
+}
+
+src_test() {
+	for f in /dev/pt* ; do
+		addpredict $f
+	done
+	make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/$(get_libdir) \
+		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
+		sitefndir=${D}/usr/share/zsh/site-functions \
+		scriptdir=${D}/usr/share/zsh/${PV%_*}/scripts \
+		install.bin install.man install.modules \
+		install.info install.fns || die "make install failed"
+
+	insinto /etc/zsh
+	doins ${FILESDIR}/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
+	insinto /usr/share/zsh/${PV%_*}/Util
+	doins Util/* || die "doins Util scripts failed"
+	insinto /usr/share/zsh/${PV%_*}/Misc
+	doins Misc/* || die "doins Misc scripts failed"
+
+	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+
+	if use doc ; then
+		dohtml Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_preinst() {
+	# Our zprofile file does the job of the old zshenv file
+	# Move the old version into a zprofile script so the normal
+	# etc-update process will handle any changes.
+	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
+		mv /etc/zsh/zshenv /etc/zsh/zprofile
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you want to enable Portage completions and Gentoo prompt,"
+	einfo "emerge app-shells/zsh-completion and add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
+	einfo "Also, if you want to enable cache for the completions, add"
+	einfo "	zstyle ':completion::complete:*' use-cache 1"
+	einfo "to your ~/.zshrc"
+	einfo
+	# see Bug 26776
+	ewarn
+	ewarn "If you are upgrading from zsh-4.0.x you may need to"
+	ewarn "remove all your old ~/.zcompdump files in order to use"
+	ewarn "completion.  For more info see zcompsys manpage."
+	ewarn
+}
diff --git a/app-shells/zsh/zsh-4.3.2.ebuild b/app-shells/zsh/zsh-4.3.2.ebuild
index 4a6865884118..088d3a96dafa 100644
--- a/app-shells/zsh/zsh-4.3.2.ebuild
+++ b/app-shells/zsh/zsh-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2.ebuild,v 1.2 2006/03/15 10:33:39 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2.ebuild,v 1.3 2006/05/25 17:40:49 merlin Exp $
 
 inherit eutils multilib
 
@@ -72,7 +72,7 @@ src_compile() {
 			config.modules || die
 	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
 			Makefile || die
 	fi