Slew of updates. Updated to the latest versions of the affected

programs, cleaned up the ebuilds to conform to the new standards, and
removed the older/stale versions...

5 files changed, 18 insertions, 55 deletions

diff --git a/app-shells/zsh/files/digest-zsh-3.1.9-r1 b/app-shells/zsh/files/digest-zsh-3.1.9-r1
deleted file mode 100644
index 96da171c9d1e..000000000000
--- a/app-shells/zsh/files/digest-zsh-3.1.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b69ed3f04d2a3eb676f8d2ace562270a zsh-3.1.9.tar.gz 1859584
diff --git a/app-shells/zsh/files/digest-zsh-4.0.2 b/app-shells/zsh/files/digest-zsh-4.0.2
deleted file mode 100644
index 84b41d895f24..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38611d4ddd2547668d48867772ce214e zsh-4.0.2.tar.gz 2105344
diff --git a/app-shells/zsh/files/digest-zsh-4.0.4 b/app-shells/zsh/files/digest-zsh-4.0.4
new file mode 100644
index 000000000000..19e0d84d88b5
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.4
@@ -0,0 +1 @@
+MD5 c49e228c269b2ff4a0001941f4eb3bf7 zsh-4.0.4.tar.gz 2129920
diff --git a/app-shells/zsh/zsh-3.1.9-r1.ebuild b/app-shells/zsh/zsh-3.1.9-r1.ebuild
deleted file mode 100644
index 08e67171bb0f..000000000000
--- a/app-shells/zsh/zsh-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-3.1.9-r1.ebuild,v 1.2 2001/11/10 03:07:01 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz"
-HOMEPAGE="www.zsh.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1"
-
-src_compile() {
-
-    try ./configure --prefix=/ --mandir=/usr/share/man \
-	    --libdir=/usr/lib --host=${CHOST}
-	try make
-}
-
-src_install() {
-
-	try make prefix=${D} mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib \
-		install.bin install.man install.modules
-
-	dodoc ChangeLog META-FAQ README
-	docinto StartupFiles
- 	dodoc StartupFiles/z*
-
-}
-
-
-
-
diff --git a/app-shells/zsh/zsh-4.0.2.ebuild b/app-shells/zsh/zsh-4.0.4.ebuild
index fc22f134e5aa..764ec0cefc7b 100644
--- a/app-shells/zsh/zsh-4.0.2.ebuild
+++ b/app-shells/zsh/zsh-4.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # This ebuild by Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.2.ebuild,v 1.6 2001/11/10 03:07:01 hallski Exp $
+# /space/gentoo/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.2.ebuild,v 1.6 2001/11/10 03:07:01 hallski Exp
 
 
 S=${WORKDIR}/${P}
@@ -13,33 +13,32 @@ HOMEPAGE="www.zsh.org/"
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1"
 
-src_compile() {
 
-    try ./configure --prefix=/ --mandir=/usr/share/man \
-	--libdir=/usr/lib --host=${CHOST} --infodir=/usr/share/info \
-        --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 \
-	--enable-function-subdirs
-	try make 
-	try make check
+src_compile() {
+	./configure --prefix=/ --host=${CHOST} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib \
+		--infodir=/usr/share/info \
+		--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 \
+		--enable-function-subdirs || die
+	emake || die
+	make check || die
 }
 
 src_install() {
-
-	try make prefix=${D} mandir=${D}/usr/share/man \
+	make prefix=${D} mandir=${D}/usr/share/man \
 		libdir=${D}/usr/lib fndir=${D}/usr/share \
 		install.bin install.man install.modules \
-		install.info 
+		install.info || die
 		
 	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
 	docinto StartupFiles
  	dodoc StartupFiles/z*
 	dodir /etc/zsh
 	cp ${S}/StartupFiles/z* ${D}/etc/zsh
-	
 }
-
-
-
-