Added cjk IUSE flag and updated Copyright year in header

10 files changed, 43 insertions, 144 deletions

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 0a26978dab75..a46c3f40bee6 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,11 +1,10 @@
-MD5 24231478c254624c1891302d9ec9a26c zsh-4.0.7-r1.ebuild 2293
-MD5 b2711777ec7c828dd5b221713b736bea zsh-4.0.9.ebuild 2469
-MD5 5cf00f1ef79600ac8d511a3869496a5b zsh-4.1.1-r2.ebuild 3058
-MD5 eb1bca67b072920030c99ca7c1e933a5 ChangeLog 6544
+MD5 226ad84ab10a74bbc8cf0dea1329941c zsh-4.0.7-r1.ebuild 2291
+MD5 23e900b112727caac5567ac36ddd60ea zsh-4.0.9.ebuild 2469
+MD5 a0a4947a1238749d1f49b03c4697055a zsh-4.1.1-r2.ebuild 3057
+MD5 be74f3e2307b9eaf4400972d997b2b6b ChangeLog 6651
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 12546b89c4d6061471f2de96beeba521 zsh-4.0.9-r1.ebuild 2588
-MD5 853d5de501d54c03e6d46803b4520406 zsh-4.0.7.ebuild 2310
-MD5 1035e31205100fdde7da00acb820ecdd zsh-4.1.1-r3.ebuild 3307
+MD5 0d12007c5eebbe15ac6052e8d7489f69 zsh-4.0.9-r1.ebuild 2591
+MD5 39d0fa380eb9e44e5d8771b357472017 zsh-4.1.1-r3.ebuild 3307
 MD5 ac432d44650484450793159dce1bdce6 files/_portage 6923
 MD5 69b64f833140e51ce26127a2336e7766 files/digest-zsh-4.0.7-r1 127
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r1 199
@@ -13,6 +12,5 @@ MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r2 132
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-MD5 05078d5709e9fc4be1eb5bbedadb185d files/digest-zsh-4.0.7 125
 MD5 7daadfcc408d7d6d8766aea27dcecc21 files/digest-zsh-4.0.9 130
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r3 199
diff --git a/app-shells/zsh/files/digest-zsh-4.0.7 b/app-shells/zsh/files/digest-zsh-4.0.7
deleted file mode 100644
index a1375aa35815..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 85915f723384062480f1890b6625b6d5 zsh-4.0.7.tar.gz 2179033
-MD5 633926a0afe584878d1c3068346e9d69 zsh_4.0.7-5.diff.gz 69299
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r1 b/app-shells/zsh/files/digest-zsh-4.0.9-r1
new file mode 100644
index 000000000000..19f27e152f5f
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.9-r1
@@ -0,0 +1,3 @@
+MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
+MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
+MD5 1e755a2ffa0bad11b0ebc7d5d7622674 zsh-4.0.9-euc-0.2.patch.gz 2869
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1-r1 b/app-shells/zsh/files/digest-zsh-4.1.1-r1
deleted file mode 100644
index 8cce53db48a1..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48958b1a3fc86261a26eea40a4f7d4af zsh-4.1.1.tar.bz2 1924514
-MD5 a4fb455591ee95e5264bf985af3473ea zsh-4.1.1-euc-0.2.patch.gz 2788
diff --git a/app-shells/zsh/zsh-4.0.7-r1.ebuild b/app-shells/zsh/zsh-4.0.7-r1.ebuild
index e3930c371fc7..54d0978c44d3 100644
--- a/app-shells/zsh/zsh-4.0.7-r1.ebuild
+++ b/app-shells/zsh/zsh-4.0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.7-r1.ebuild,v 1.2 2004/01/03 18:22:36 usata Exp $
 
 inherit eutils
 
@@ -11,14 +11,14 @@ 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"
+	mirror://debian/pool/main/z/${PN}/${MYPATCH}.gz"
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ~ppc ~sparc"
 
-DEPEND="sys-apps/groff
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
 
 src_unpack() {
diff --git a/app-shells/zsh/zsh-4.0.7.ebuild b/app-shells/zsh/zsh-4.0.9-r1.ebuild
index fbfd90343ddc..c8a750205f6f 100644
--- a/app-shells/zsh/zsh-4.0.7.ebuild
+++ b/app-shells/zsh/zsh-4.0.9-r1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.ebuild,v 1.6 2003/09/21 13:00:37 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r1.ebuild,v 1.1 2004/01/03 18:22:36 usata Exp $
 
-inherit eutils
-
-IUSE="maildir ncurses static"
+IUSE="maildir ncurses static doc cjk"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
 
-MYPATCH="${P/-/_}-5.diff"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
-	 mirror://debian/pool/main/z/${PN}/${MYPATCH}.gz"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="x86 alpha ppc sparc"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 
-DEPEND="sys-apps/groff
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="virtual/glibc
+	sys-apps/groff
+	${RDEPEND}"
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${MYPATCH}
+	cd ${S}
+	use cjk && epatch ../${P}-euc-0.2.patch
 	cd ${S}/Doc
 	ln -sf . man1
 	# fix zshall problem with soelim
@@ -70,8 +70,18 @@ src_install() {
 	insinto /etc/zsh
 	doins ${FILESDIR}/zprofile
 
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/site-functions
+	doins ${FILESDIR}/_portage
+
 	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*
 }
diff --git a/app-shells/zsh/zsh-4.0.9.ebuild b/app-shells/zsh/zsh-4.0.9.ebuild
index d3e3ad24cbed..0db7993d4c75 100644
--- a/app-shells/zsh/zsh-4.0.9.ebuild
+++ b/app-shells/zsh/zsh-4.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.9.ebuild,v 1.1 2003/12/28 19:51:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9.ebuild,v 1.2 2004/01/03 18:22:36 usata Exp $
 
 IUSE="maildir ncurses static doc"
 
diff --git a/app-shells/zsh/zsh-4.1.1-r1.ebuild b/app-shells/zsh/zsh-4.1.1-r1.ebuild
deleted file mode 100644
index 82962781bca3..000000000000
--- a/app-shells/zsh/zsh-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,108 +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.1.1-r1.ebuild,v 1.4 2003/12/17 09:23:18 usata Exp $
-
-inherit eutils
-
-IUSE="cjk maildir ncurses static"
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="x86 alpha ppc sparc"
-
-DEPEND="sys-apps/groff
-	>=dev-libs/libpcre-3.9
-	>=sys-apps/sed-4
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-RDEPEND=">=dev-libs/libpcre-3.9
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	use cjk && epatch ${DISTDIR}/${P}-euc-0.2.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 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"
-
-	if [ -n "`use static`" ] ; then
-		sed -i -e "s/link=no/link=static/g" \
-			-e "s/load=no/load=yes/g" config.modules
-	fi
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# 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.1.1-r2.ebuild b/app-shells/zsh/zsh-4.1.1-r2.ebuild
index 4e74c0b5e721..d8687626c899 100644
--- a/app-shells/zsh/zsh-4.1.1-r2.ebuild
+++ b/app-shells/zsh/zsh-4.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.1-r2.ebuild,v 1.6 2003/12/21 23:42:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r2.ebuild,v 1.7 2004/01/03 18:22:36 usata Exp $
 
 inherit eutils
 
diff --git a/app-shells/zsh/zsh-4.1.1-r3.ebuild b/app-shells/zsh/zsh-4.1.1-r3.ebuild
index c6f2d62dba27..31e48ba06a9d 100644
--- a/app-shells/zsh/zsh-4.1.1-r3.ebuild
+++ b/app-shells/zsh/zsh-4.1.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.1-r3.ebuild,v 1.1 2003/12/28 19:51:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r3.ebuild,v 1.2 2004/01/03 18:22:36 usata Exp $
 
 inherit eutils