7 files changed, 91 insertions, 123 deletions
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 423941c57c49..c732d6c646aa 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,14 +1,10 @@
-MD5 a87e556f73ff2f9fd4541f922e491156 ChangeLog 5868
-MD5 471b685d96479d8645a2e76a9926f0bb zsh-4.0.6-r1.ebuild 1359
+MD5 32e52f19864295ab90ad7a68f1415bd2 ChangeLog 6073
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 7409ed3a95a015ecf56235326d8e3fe8 zsh-4.0.6-r4.ebuild 1754
-MD5 834673d302966ef09a493415763b1afa zsh-4.0.7-r1.ebuild 2315
+MD5 a675ceb133d1a013a74e7e8f02048555 zsh-4.1.1-r1.ebuild 2994
+MD5 1d5c1b96cb88592470a3e8ca75c5023c zsh-4.0.7-r1.ebuild 2319
 MD5 853d5de501d54c03e6d46803b4520406 zsh-4.0.7.ebuild 2310
 MD5 35548159472757fde21d4137f9adf3e4 zsh-4.1.1-r2.ebuild 3195
-MD5 a675ceb133d1a013a74e7e8f02048555 zsh-4.1.1-r1.ebuild 2994
-MD5 30a6361dbaeb57ce5449160c620c5daf files/digest-zsh-4.0.6-r1 62
 MD5 69b64f833140e51ce26127a2336e7766 files/digest-zsh-4.0.7-r1 127
-MD5 e935d74fdb80864981ed34df680f8a3c files/digest-zsh-4.0.6-r4 181
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 05078d5709e9fc4be1eb5bbedadb185d files/digest-zsh-4.0.7 125
diff --git a/app-shells/zsh/files/digest-zsh-4.0.6-r1 b/app-shells/zsh/files/digest-zsh-4.0.6-r1
deleted file mode 100644
index dba4516cff6d..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a86da9120e97ebe03afd6a51f717c0f zsh-4.0.6.tar.gz 2146169
diff --git a/app-shells/zsh/files/digest-zsh-4.0.6-r4 b/app-shells/zsh/files/digest-zsh-4.0.6-r4
deleted file mode 100644
index fce686dcc566..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a86da9120e97ebe03afd6a51f717c0f zsh-4.0.6.tar.gz 2146169
-MD5 9f4f6553099b08eae40547f4ecce258d zsh_4.0.6-15.gz 6873
-MD5 30ff6c9df852dbce5b9546aeba22f36b zshall-4.0.6.bz2 165851
diff --git a/app-shells/zsh/files/digest-zsh-4.0.7-r1 b/app-shells/zsh/files/digest-zsh-4.0.7-r1
new file mode 100644
index 000000000000..9dadbb2f32e9
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.7-r1
@@ -0,0 +1,2 @@
+MD5 85915f723384062480f1890b6625b6d5 zsh-4.0.7.tar.gz 2179033
+MD5 886e922b43f677a4d16f6399c0ec6420 zsh_4.0.7-18.diff.gz 250567
diff --git a/app-shells/zsh/zsh-4.0.6-r1.ebuild b/app-shells/zsh/zsh-4.0.6-r1.ebuild
deleted file mode 100644
index 526dc4e3062f..000000000000
--- a/app-shells/zsh/zsh-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.6-r1.ebuild,v 1.8 2003/09/11 01:03:59 msterret Exp $
-
-IUSE=""
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND=">=sys-libs/ncurses-5.1"
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--enable-maildir-support \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zshlogin=/etc/zsh/zshlogin \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs || die "configure failed"
-	# emake still b0rks
-	make || die "make failed"
-	#make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/lib \
-		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"
-
-	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-	dodir /etc/zsh
-	cp ${S}/StartupFiles/z* ${D}/etc/zsh
-}
diff --git a/app-shells/zsh/zsh-4.0.6-r4.ebuild b/app-shells/zsh/zsh-4.0.6-r4.ebuild
deleted file mode 100644
index c38942d2ec4c..000000000000
--- a/app-shells/zsh/zsh-4.0.6-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.6-r4.ebuild,v 1.5 2003/10/28 07:09:25 usata Exp $
-
-IUSE="ncurses"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
-	 mirror://debian/pool/main/z/zsh/${P/-/_}-15.gz
-	 http://dev.gentoo.org/~vladimir/distfiles/zshall-${PV}.bz2"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="x86 alpha ppc ~sparc"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${P/-/_}
-}
-
-src_compile() {
-
-	# New zshall.1 generated with the following, run in Doc:
-	# perl -nle'$_ = `cat $1` if /^\.so man1\/(.+\.1)/;print' zshall.1
-	mv ${WORKDIR}/zshall-${PV} ${S}/Doc/zshall.1
-
-	use ncurses && MYCONF="--with-curses-terminfo"
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--enable-maildir-support \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zshlogin=/etc/zsh/zshlogin \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		${MYCONF}
-	# emake still b0rks
-	make || die "make failed"
-	#make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/lib \
-		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"
-
-	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zshenv
-}
diff --git a/app-shells/zsh/zsh-4.0.7-r1.ebuild b/app-shells/zsh/zsh-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..e3930c371fc7
--- /dev/null
+++ b/app-shells/zsh/zsh-4.0.7-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.7-r1.ebuild,v 1.1 2003/12/11 19:30:44 usata Exp $
+
+inherit eutils
+
+IUSE="maildir ncurses static"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+MYPATCH="${P/-/_}-18.diff"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
+	 mirror://debian/pool/main/z/${PN}/${MYPATCH}.gz"
+
+SLOT="0"
+LICENSE="ZSH"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND="sys-apps/groff
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${MYPATCH}
+	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 ncurses && myconf="--with-curses-terminfo"
+	use maildir && myconf="${myconf} --enable-maildir-support"
+	use static && myconf="${myconf} --disable-dynamic" \
+		&& LDFLAGS="${LDFLAGS} -static"
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/lib \
+		--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}" \
+		${myconf} || die "configure failed"
+	# emake still b0rks
+	make || die "make failed"
+	#make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/lib \
+		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
+
+	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+
+	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
+}