Fix for #201022 and #196722. Removed old versions. Added myself as interim maintainer.

(Portage version: 2.1.4_rc7)

10 files changed, 148 insertions, 97 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index b177a4818a82..8c8a31e961d5 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.115 2007/11/06 00:39:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.116 2007/12/04 16:10:23 tove Exp $
+
+*zsh-4.3.4-r1 (04 Dec 2007)
+*zsh-4.3.2-r3 (04 Dec 2007)
+
+  04 Dec 2007; Torsten Veller <tove@gentoo.org>
+  -files/zsh-4.2.1-gentoo.diff, metadata.xml, -zsh-4.2.5.ebuild,
+  -zsh-4.2.6-r1.ebuild, +zsh-4.3.2-r3.ebuild, +zsh-4.3.4-r1.ebuild:
+  Fix for #201022 by removing the file as it shouldn't be distributed.
+  Fix 4.3.4-r1 wrt #196722 and added zshcalsys.1.
+  Added myself as maintainer and removed old versions.
 
   06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> zsh-4.3.2-r2.ebuild,
   zsh-4.3.4.ebuild:
diff --git a/app-shells/zsh/files/digest-zsh-4.2.5 b/app-shells/zsh/files/digest-zsh-4.2.5
deleted file mode 100644
index 8acff930d4e7..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
-RMD160 82ce43a500f8ca8ca43e3a183b2cc30b4109f594 zsh-4.2.4-euc-0.3.patch.gz 2942
-SHA256 1044ddb4ca1e59fe4892b87115938026e85f7c52c2b87f3e5c5b074daeddce8d zsh-4.2.4-euc-0.3.patch.gz 2942
-MD5 6dc896b52a3bc20a514148d621e13282 zsh-4.2.5-doc.tar.bz2 1768286
-RMD160 a9fa44f2b0a3b78d0e38e47dd6c4df53dc5d1d4e zsh-4.2.5-doc.tar.bz2 1768286
-SHA256 af8b3dcb33fb8a4136a288493c7cd559a6d5f4f8ce56492b8ac3d158ed64ed45 zsh-4.2.5-doc.tar.bz2 1768286
-MD5 e2060f743dcdf3b383e80e862a6548fe zsh-4.2.5.tar.bz2 2074535
-RMD160 10e2319b30d5791d39c0a4488e297d451adbdbe5 zsh-4.2.5.tar.bz2 2074535
-SHA256 67d82adea4c002f49ca513db63d46a7b235baa358c384f9123e223a7db4bf8c4 zsh-4.2.5.tar.bz2 2074535
diff --git a/app-shells/zsh/files/digest-zsh-4.2.6-r1 b/app-shells/zsh/files/digest-zsh-4.2.6-r1
deleted file mode 100644
index 83606c39b3fa..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.6-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
-RMD160 82ce43a500f8ca8ca43e3a183b2cc30b4109f594 zsh-4.2.4-euc-0.3.patch.gz 2942
-SHA256 1044ddb4ca1e59fe4892b87115938026e85f7c52c2b87f3e5c5b074daeddce8d zsh-4.2.4-euc-0.3.patch.gz 2942
-MD5 3ca3b7c199db6eb942f2a296e3fad270 zsh-4.2.6-doc.tar.bz2 1770113
-RMD160 b99e64cebccdf20d496454ec745a85812370c1ce zsh-4.2.6-doc.tar.bz2 1770113
-SHA256 59c17155aa5085d94e4e10d7050a80f57ce3f36080271fa2da3fda6604420be0 zsh-4.2.6-doc.tar.bz2 1770113
-MD5 2cefebf742c190cbc611baded825db64 zsh-4.2.6.tar.bz2 2098671
-RMD160 e4400fc6311bf6996128ecf7899592d6d8cdb310 zsh-4.2.6.tar.bz2 2098671
-SHA256 d5b9b93e8259d3059042e82d1738d623af6981c38c9f185b3949ea3dacbe6a61 zsh-4.2.6.tar.bz2 2098671
diff --git a/app-shells/zsh/files/digest-zsh-4.3.2-r3 b/app-shells/zsh/files/digest-zsh-4.3.2-r3
new file mode 100644
index 000000000000..c6f5085724b6
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.3.2-r3
@@ -0,0 +1,9 @@
+MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375
+RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff zsh-4.3.2-doc.tar.bz2 2207375
+SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f zsh-4.3.2-doc.tar.bz2 2207375
+MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544
+RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e zsh-4.3.2.tar.bz2 2263544
+SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 zsh-4.3.2.tar.bz2 2263544
+MD5 6ac4b81c087db2197cdcd8ff02e51619 zsh-lovers_0.5.orig.tar.gz 499014
+RMD160 505261d9e28554c838864421ec81b6665e55dfa1 zsh-lovers_0.5.orig.tar.gz 499014
+SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea zsh-lovers_0.5.orig.tar.gz 499014
diff --git a/app-shells/zsh/files/digest-zsh-4.3.4 b/app-shells/zsh/files/digest-zsh-4.3.4
index 7afc774d765a..535aa4ba10dc 100644
--- a/app-shells/zsh/files/digest-zsh-4.3.4
+++ b/app-shells/zsh/files/digest-zsh-4.3.4
@@ -1,3 +1,4 @@
+MD5 1a4ab09a9d75c5ae8585ad645406f27d zsh-4.3.4-doc.tar.bz2 2358063
 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 zsh-4.3.4-doc.tar.bz2 2358063
 SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777 zsh-4.3.4-doc.tar.bz2 2358063
 MD5 8410a30e4f5c6160790bc3afc096424f zsh-4.3.4.tar.bz2 2374851
diff --git a/app-shells/zsh/files/digest-zsh-4.3.4-r1 b/app-shells/zsh/files/digest-zsh-4.3.4-r1
new file mode 100644
index 000000000000..9d3abd176979
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.3.4-r1
@@ -0,0 +1,12 @@
+MD5 1a4ab09a9d75c5ae8585ad645406f27d zsh-4.3.4-doc.tar.bz2 2358063
+RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 zsh-4.3.4-doc.tar.bz2 2358063
+SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777 zsh-4.3.4-doc.tar.bz2 2358063
+MD5 f32c2456e1e209095c61783b7ee9f592 zsh-4.3.4-zshcalsys.tar.bz2 9346
+RMD160 d26b370853419494725a73524ba81c754d63a201 zsh-4.3.4-zshcalsys.tar.bz2 9346
+SHA256 4225eb85ead732423405b567c879280780073a39fff3a05c6b6b13f29f0a382e zsh-4.3.4-zshcalsys.tar.bz2 9346
+MD5 8410a30e4f5c6160790bc3afc096424f zsh-4.3.4.tar.bz2 2374851
+RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c zsh-4.3.4.tar.bz2 2374851
+SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6 zsh-4.3.4.tar.bz2 2374851
+MD5 6ac4b81c087db2197cdcd8ff02e51619 zsh-lovers_0.5.orig.tar.gz 499014
+RMD160 505261d9e28554c838864421ec81b6665e55dfa1 zsh-lovers_0.5.orig.tar.gz 499014
+SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea zsh-lovers_0.5.orig.tar.gz 499014
diff --git a/app-shells/zsh/files/zsh-4.2.1-gentoo.diff b/app-shells/zsh/files/zsh-4.2.1-gentoo.diff
deleted file mode 100644
index db7bf3be3082..000000000000
--- a/app-shells/zsh/files/zsh-4.2.1-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Completion/Unix/Command/_subversion.orig	2004-04-15 19:29:36.000000000 +0900
-+++ Completion/Unix/Command/_subversion	2004-10-10 00:44:00.000000000 +0900
-@@ -41,7 +41,7 @@
-   if (( ! $+_svn_cmds )); then
-     typeset -gA _svn_cmds
-     _svn_cmds=(
--      ${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
-+      ${=${(f)${${"$(_call_program commands LC_ALL=C svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
-     )
-   fi
- 
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index 9c238a958de0..4c58d5b43ea6 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -3,8 +3,9 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>usata@gentoo.org</email>
-  <name>Mamoru KOMACHI</name>
+  <email>tove@gentoo.org</email>
+  <name>Torsten Veller</name>
+  <description>Interim maintainer</description>
 </maintainer>
 <longdescription>
   Zsh is a shell designed for interactive use, although it is also a
diff --git a/app-shells/zsh/zsh-4.2.6-r1.ebuild b/app-shells/zsh/zsh-4.3.2-r3.ebuild
index f332e5cba7e1..cdf68ab097bf 100644
--- a/app-shells/zsh/zsh-4.2.6-r1.ebuild
+++ b/app-shells/zsh/zsh-4.3.2-r3.ebuild
@@ -1,34 +1,41 @@
 # Copyright 1999-2007 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.5 2007/02/27 16:59:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r3.ebuild,v 1.1 2007/12/04 16:10:23 tove Exp $
 
 inherit eutils multilib
 
+LOVERS_PV=0.5
+LOVERS_P=zsh-lovers-${LOVERS_PV}
+
 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 )
+	examples? (
+	http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz )
 	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="maildir ncurses static doc pcre cap"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="maildir ncurses static doc examples pcre caps unicode"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	cap? ( sys-libs/libcap )
+	caps? ( 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
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo.diff
+
+	# fixes #201022 and
+	# http://www.zsh.org/mla/workers/2007/msg01065.html
+	rm Util/difflog.pl
+
+	cd "${S}"/Doc
 	ln -sf . man1
 	# fix zshall problem with soelim
 	soelim zshall.1 > zshall.1.soelim
@@ -58,7 +65,8 @@ src_compile() {
 		$(use_with ncurses curses-terminfo) \
 		$(use_enable maildir maildir-support) \
 		$(use_enable pcre) \
-		$(use_enable cap) \
+		$(use_enable caps) \
+		$(use_enable unicode multibyte) \
 		${myconf} || die "configure failed"
 
 	if use static ; then
@@ -66,10 +74,10 @@ src_compile() {
 		sed -i -e "s/link=no/link=static/g" \
 			-e "s/load=no/load=yes/g" \
 			config.modules || die
-	else
+#	else
 		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
-			Makefile || die
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
+#			Makefile || die
 	fi
 
 	# emake still b0rks
@@ -85,19 +93,20 @@ src_test() {
 
 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 \
+		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
+	doins "${FILESDIR}"/zprofile
 
 	keepdir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
+	doins "${FILESDIR}"/prompt_gentoo_setup || die
 
 	# install miscellaneous scripts; bug #54520
 	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
@@ -111,7 +120,19 @@ src_install() {
 	if use doc ; then
 		dohtml Doc/*
 		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
+		doins Doc/zsh.{dvi,pdf}
+	fi
+
+	if use examples; then
+		cd "${WORKDIR}"/${LOVERS_P}
+		doman  zsh-lovers.1    || die "doman zsh-lovers failed"
+		dohtml zsh-lovers.html || die "dohtml zsh-lovers failed"
+		docinto zsh-lovers
+		dodoc zsh.vim README
+		insinto /usr/share/doc/${PF}/zsh-lovers
+		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf}
+		doins -r zsh_people || die "doins zsh_people failed"
+		cd -
 	fi
 
 	docinto StartupFiles
@@ -122,8 +143,10 @@ 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
+	if [ -f "${ROOT}/etc/zsh/zshenv" -a ! -f "${ROOT}/etc/zsh/zprofile" ]; then
+		ewarn "Renaming /etc/zsh/zshenv to /etc/zsh/zprofile."
+		ewarn "The zprofile file does the job of the old zshenv file."
+		mv "${ROOT}"/etc/zsh/{zshenv,zprofile}
 	fi
 }
 
diff --git a/app-shells/zsh/zsh-4.2.5.ebuild b/app-shells/zsh/zsh-4.3.4-r1.ebuild
index 7ea9e8d919d0..352aa16cbd0a 100644
--- a/app-shells/zsh/zsh-4.2.5.ebuild
+++ b/app-shells/zsh/zsh-4.3.4-r1.ebuild
@@ -1,46 +1,56 @@
 # Copyright 1999-2007 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.14 2007/02/27 16:59:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4-r1.ebuild,v 1.1 2007/12/04 16:10:23 tove Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
+
+LOVERS_PV=0.5
+LOVERS_P=zsh-lovers-${LOVERS_PV}
 
 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 )
+	mirror://gentoo/${P}-zshcalsys.tar.bz2
+	examples? (
+	http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz )
 	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE="maildir ncurses static doc pcre cap"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="maildir static doc examples pcre caps unicode"
 
-RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+RDEPEND=">=sys-libs/ncurses-5.1
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9 )"
 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}-4.2.1-gentoo.diff
-	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
+	unpack ${A}
+	cd "${S}"
+
 	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
+	ln -s Doc man1
+	mv Doc/zshall.1 Doc/zshall.1.soelim
+	soelim Doc/zshall.1.soelim > Doc/zshall.1
+
+	# fixes #201022 and
+	# http://www.zsh.org/mla/workers/2007/msg01065.html
+	rm Util/difflog.pl
+
+	epatch "${FILESDIR}/${PN}"-init.d-gentoo.diff
+	epatch "${FILESDIR}/${P}"-configure-changequote.patch
+	eautoreconf
 }
 
 src_compile() {
-	local myconf
+	local myconf=
 
-	use static && myconf="${myconf} --disable-dynamic" \
-		&& LDFLAGS="${LDFLAGS} -static"
+	if use static ; then
+		myconf="${myconf} --disable-dynamic"
+		LDFLAGS="${LDFLAGS} -static"
+	fi
 
 	econf \
 		--bindir=/bin \
@@ -55,11 +65,12 @@ src_compile() {
 		--enable-site-fndir=/usr/share/zsh/site-functions \
 		--enable-function-subdirs \
 		--enable-ldflags="${LDFLAGS}" \
+		--with-curses-terminfo \
 		--with-tcsetpgrp \
-		$(use_with ncurses curses-terminfo) \
 		$(use_enable maildir maildir-support) \
 		$(use_enable pcre) \
-		$(use_enable cap) \
+		$(use_enable caps) \
+		$(use_enable unicode multibyte) \
 		${myconf} || die "configure failed"
 
 	if use static ; then
@@ -67,38 +78,37 @@ src_compile() {
 		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
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
 	fi
 
-	# emake still b0rks
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_test() {
+	local f=
 	for f in /dev/pt* ; do
-		addpredict $f
+		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 \
+		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
+	doins "${FILESDIR}"/zprofile
 
 	keepdir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
+	doins "${FILESDIR}"/prompt_gentoo_setup || die
 
 	# install miscellaneous scripts; bug #54520
 	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
@@ -107,12 +117,24 @@ src_install() {
 	insinto /usr/share/zsh/${PV%_*}/Misc
 	doins Misc/* || die "doins Misc scripts failed"
 
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+	dodoc ChangeLog* META-FAQ README config.modules
 
 	if use doc ; then
 		dohtml Doc/*
 		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
+		doins Doc/zsh.{dvi,pdf}
+	fi
+
+	if use examples; then
+		cd "${WORKDIR}/${LOVERS_P}"
+		doman  zsh-lovers.1    || die "doman zsh-lovers failed"
+		dohtml zsh-lovers.html || die "dohtml zsh-lovers failed"
+		docinto zsh-lovers
+		dodoc zsh.vim README
+		insinto /usr/share/doc/"${PF}"/zsh-lovers
+		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf}
+		doins -r zsh_people || die "doins zsh_people failed"
+		cd -
 	fi
 
 	docinto StartupFiles
@@ -123,8 +145,10 @@ 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
+	if [ -f "${ROOT}/etc/zsh/zshenv" -a ! -f "${ROOT}/etc/zsh/zprofile" ]; then
+		ewarn "Renaming /etc/zsh/zshenv to /etc/zsh/zprofile."
+		ewarn "The zprofile file does the job of the old zshenv file."
+		mv "${ROOT}"/etc/zsh/{zshenv,zprofile}
 	fi
 }