Added cjk patch. Marked 4.2.0 stable on x86 and alpha

5 files changed, 168 insertions, 17 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 759662da6ffc..7a1885e3ccab 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.46 2004/03/27 17:18:26 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.47 2004/05/03 18:46:32 usata Exp $
+
+*zsh-4.2.0-r1 (04 May 2004)
+
+  04 May 2004; Mamoru KOMACHI <usata@gentoo.org> zsh-4.2.0-r1.ebuild,
+  zsh-4.2.0.ebuild:
+  Added cjk patch. Marked 4.2.0 stable on x86 and alpha
 
   27 Mar 2004; Guy Martin <gmsoft@gentoo.org> zsh-4.1.1-r5.ebuild:
   Marked stable on hppa.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 41c190cc393f..c45f7c903c66 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,19 +1,21 @@
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 dee06ea964bd8915d51b349db0415718 zsh-4.0.9-r3.ebuild 2712
+MD5 0c7aa1e2d63fa0f952f19f214336ad42 zsh-4.1.1-r5.ebuild 3399
+MD5 54b1853e1cf25b536be57c594f96e410 zsh-4.2.0.ebuild 3571
+MD5 0575b2f8c904aca97cee308e8eeae73c ChangeLog 8811
+MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
+MD5 f92460994988aed6ce2389c9ee43c6ea zsh-4.0.9-r2.ebuild 2674
+MD5 284d6b319413f24209b92ab160e6e43b zsh-4.1.1-r4.ebuild 3354
+MD5 f8511808817622c7b77bdb271ea3ec89 zsh-4.2.0-r1.ebuild 3718
+MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
 MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
-MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
+MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
+MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
+MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
 MD5 476cf7906a080d52beee81d76fd2a82a files/digest-zsh-4.2.0 130
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
 MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
-MD5 6ec891fc1454fbb5e85a9cd11e25d52c ChangeLog 8636
-MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 f92460994988aed6ce2389c9ee43c6ea zsh-4.0.9-r2.ebuild 2674
-MD5 dee06ea964bd8915d51b349db0415718 zsh-4.0.9-r3.ebuild 2712
-MD5 284d6b319413f24209b92ab160e6e43b zsh-4.1.1-r4.ebuild 3354
-MD5 0c7aa1e2d63fa0f952f19f214336ad42 zsh-4.1.1-r5.ebuild 3399
-MD5 7cd710306e746958d641c5992ddd2617 zsh-4.2.0.ebuild 3573
+MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
diff --git a/app-shells/zsh/files/digest-zsh-4.2.0-r1 b/app-shells/zsh/files/digest-zsh-4.2.0-r1
new file mode 100644
index 000000000000..21510ec50646
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.0-r1
@@ -0,0 +1,3 @@
+MD5 866bcdad8c0c4974650f5eff395a9a35 zsh-4.2.0.tar.bz2 1990884
+MD5 3c222b6d7b974c07ba244c37eb5d65fb zsh-4.2.0-euc-0.2.patch.gz 2857
+MD5 14aa2d8d9e6f546593fd42f45dfee669 zsh-4.2.0-doc.tar.bz2 1695230
diff --git a/app-shells/zsh/zsh-4.2.0-r1.ebuild b/app-shells/zsh/zsh-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..a7e81ba8482b
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.0-r1.ebuild
@@ -0,0 +1,140 @@
+# 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.2.0-r1.ebuild,v 1.1 2004/05/03 18:46:32 usata Exp $
+
+inherit eutils
+
+IUSE="maildir ncurses static doc pcre cap"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+MYDATE="20040204"
+MY_P="${P/_pre/-pre-}"
+
+SRC_URI="ftp://ftp.zsh.org/pub/${MY_P}.tar.bz2
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${MY_P}-doc.tar.bz2 )"
+
+SLOT="0"
+LICENSE="ZSH"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~hppa"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	cap? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	use doc && unpack ${MY_P}-doc.tar.bz2
+	cd ${S}
+	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 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}" \
+		`use_with ncurses curses-terminfo` \
+		`use_enable maildir maildir-support` \
+		`use_enable pcre` \
+		`use_enable cap` \
+		${myconf} || die "configure failed"
+
+	if [ -n "`use static`" ] ; then
+		# compile all modules statically, see Bug #27392
+		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
+	fi
+
+	# emake still b0rks
+	emake -j1 || 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
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/site-functions
+	newins ${FILESDIR}/_portage-${MYDATE} _portage
+	insinto /usr/share/zsh/${PV}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup
+
+	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*
+}
+
+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() {
+
+	einfo
+	einfo "If you want to enable Portage completion and Gentoo prompt,"
+	einfo "add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
+	# 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.2.0.ebuild b/app-shells/zsh/zsh-4.2.0.ebuild
index 1225467b3ec6..f21782736361 100644
--- a/app-shells/zsh/zsh-4.2.0.ebuild
+++ b/app-shells/zsh/zsh-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0.ebuild,v 1.1 2004/03/20 21:25:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0.ebuild,v 1.2 2004/05/03 18:46:32 usata Exp $
 
 IUSE="maildir ncurses static doc pcre cap"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~hppa"
+KEYWORDS="x86 alpha ~ppc ~sparc ~amd64 ~hppa"
 
 DEPEND="sys-apps/groff
 	>=sys-apps/sed-4