Version bump, fixed zshall manpage problem, marked 4.0.6-r3 stable on ppc, and changed ncurses to use USE

6 files changed, 91 insertions, 11 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 31d1a3a795c4..2270cfd2325e 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.17 2003/03/25 20:55:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.18 2003/04/17 08:39:02 vladimir Exp $
+
+*zsh-4.1.0_pre7 (17 Apr 2003)
+
+  17 Apr 2003; Graham Forest <vladimir@gentoo.org> zsh-4.0.6-r3.ebuild,
+  zsh-4.1.0_pre7.ebuild:
+  Version bump, fixed zshall manpage problem, marked 4.0.6-r3 stable on ppc, and
+  changed ncurses to use USE
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 8e95b4d28b37..eebf2652cb60 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,7 +1,7 @@
-MD5 649816e4ebf3eba54b9d682d1c58f249 ChangeLog 3183
-MD5 26753291863d2dd76827d15e302f4693 zsh-4.1.0_pre7.ebuild 1784
+MD5 5bdfe4355e1df41025b67db93e216225 ChangeLog 3423
+MD5 d2a0ae79f5f4509103e5e0a95bb6e85f zsh-4.1.0_pre7.ebuild 1787
 MD5 20fe4a0c8938a7d63bef94149ee8f797 zsh-4.0.6-r1.ebuild 1361
-MD5 9c592cad9412cd3b1359331bffb46ee9 zsh-4.0.6-r3.ebuild 1799
+MD5 a62e0cd1e0dbfb2c1fc4c28306e975c3 zsh-4.0.6-r3.ebuild 1800
 MD5 9363aaf4c5e5abc23ff6f07a80a52acc files/digest-zsh-4.1.0_pre7 136
 MD5 30a6361dbaeb57ce5449160c620c5daf files/digest-zsh-4.0.6-r1 62
 MD5 28e464ce201f3343debf24cced1bcfcb files/digest-zsh-4.0.6-r3 187
diff --git a/app-shells/zsh/files/digest-zsh-4.0.6-r3 b/app-shells/zsh/files/digest-zsh-4.0.6-r3
index 9364361da9b5..8db7e319f336 100644
--- a/app-shells/zsh/files/digest-zsh-4.0.6-r3
+++ b/app-shells/zsh/files/digest-zsh-4.0.6-r3
@@ -1,2 +1,3 @@
 MD5 6a86da9120e97ebe03afd6a51f717c0f zsh-4.0.6.tar.gz 2146169
 MD5 c8faa44cae89a15cd3616c0dc803fb40 zsh_4.0.6-15.diff.gz 36360
+MD5 30ff6c9df852dbce5b9546aeba22f36b zshall-4.0.6.bz2 165851
diff --git a/app-shells/zsh/files/digest-zsh-4.1.0_pre7 b/app-shells/zsh/files/digest-zsh-4.1.0_pre7
new file mode 100644
index 000000000000..6b5c3e3e8e58
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.1.0_pre7
@@ -0,0 +1,2 @@
+MD5 93899349186017aa8cff950fcb7c349f zsh-4.1.0-dev-7.tar.bz2 1844962
+MD5 64bf42ce1602831a0b6a32e6f6d2bdf1 zshall-4.1.0-dev-7.bz2 178869
diff --git a/app-shells/zsh/zsh-4.0.6-r3.ebuild b/app-shells/zsh/zsh-4.0.6-r3.ebuild
index 677eea28aa1a..fb9f9a99ff27 100644
--- a/app-shells/zsh/zsh-4.0.6-r3.ebuild
+++ b/app-shells/zsh/zsh-4.0.6-r3.ebuild
@@ -1,28 +1,35 @@
 # 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-r3.ebuild,v 1.4 2003/03/25 20:55:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.6-r3.ebuild,v 1.5 2003/04/17 08:39:02 vladimir Exp $
 
-IUSE=""
+IUSE="ncurses"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 MYPATCH="zsh_4.0.6-15.diff"
 HOMEPAGE="http://www.zsh.org/"
 SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
-	 http://ftp.debian.org/debian/pool/main/z/${PN}/${MYPATCH}.gz"
+	 http://ftp.debian.org/debian/pool/main/z/${PN}/${MYPATCH}.gz
+	 http://cvs.gentoo.org/~vladimir/distfiles/zshall-${PV}.bz2"
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="x86 alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc ~sparc"
 
-DEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
 
 src_unpack() {
 	unpack ${A}
 	patch -p0 < ${MYPATCH}
 }
 	
-
 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 \
@@ -33,7 +40,8 @@ src_compile() {
 		--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"
+		--enable-function-subdirs \
+		${MYCONF}
 	# emake still b0rks
 	make || die "make failed"
 	#make check || die "make check failed"
diff --git a/app-shells/zsh/zsh-4.1.0_pre7.ebuild b/app-shells/zsh/zsh-4.1.0_pre7.ebuild
new file mode 100644
index 000000000000..ffdf41c4d87e
--- /dev/null
+++ b/app-shells/zsh/zsh-4.1.0_pre7.ebuild
@@ -0,0 +1,62 @@
+# 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.1.0_pre7.ebuild,v 1.1 2003/04/17 08:39:02 vladimir Exp $
+
+IUSE="ncurses"
+MY_PV=${PV%_*}-dev-${PV#*_pre}
+MY_PN=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/zsh/development/${MY_PN}.tar.bz2
+		http://cvs.gentoo.org/~vladimir/distfiles/zshall-${MY_PV}.bz2"
+
+SLOT="0"
+LICENSE="ZSH"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+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-${MY_PV} ${S}/Doc/zshall.1
+	
+	use ncurses && MYCONF="--with-curses-terminfo"
+	
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/lib \
+		--with-curses-terminfo \
+		--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
+}