Version bumped. Marked 4.2.3 stable on x86 and ppc.

Package-Manager: portage-2.0.51.16

5 files changed, 178 insertions, 19 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index a3d03893001b..c49d3eb730a3 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.68 2005/01/18 13:45:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.69 2005/02/10 08:18:18 usata Exp $
+
+*zsh-4.2.4 (10 Feb 2005)
+
+  10 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> zsh-4.2.3.ebuild,
+  +zsh-4.2.4.ebuild:
+  Version bumped. Marked 4.2.3 stable on x86 and ppc.
 
 *zsh-4.2.3 (18 Jan 2005)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 69993f543c66..731890a2ebd2 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 873300be2c00a4a9a80c51456c0e1bc0 zsh-4.2.0-r1.ebuild 3721
-MD5 f67129ec9d11d77b99e22e214dfb4f60 ChangeLog 11971
+MD5 d7ed609b6f076ef37072a66c4db6153d ChangeLog 12140
+MD5 7bfaa5b5ac48263a90ebb5d2f995f3ba zsh-4.2.4.ebuild 4202
 MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
 MD5 ce3c37b881d639cfe4b58bba59bad159 zsh-4.2.1-r1.ebuild 4194
-MD5 0950b2f05fbf465785a67c208fc40052 zsh-4.2.3.ebuild 4206
-MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
-MD5 b862cd1ab51c87c0d1ec2b2c5c21c230 files/_portage-20040730 13907
-MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
+MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
+MD5 517cf4e07d70e26fe69b9d437bb3381d zsh-4.2.3.ebuild 4200
+MD5 873300be2c00a4a9a80c51456c0e1bc0 zsh-4.2.0-r1.ebuild 3721
+MD5 2b2644eb02a13fb95086cb89a920d921 files/digest-zsh-4.2.4 199
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
 MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
 MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
-MD5 d1bc426392f2bb0994ce1ad428261474 files/zsh-init.d-gentoo.diff 564
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1-r1 199
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
+MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
 MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
-MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1-r1 199
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 d1bc426392f2bb0994ce1ad428261474 files/zsh-init.d-gentoo.diff 564
+MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
+MD5 b862cd1ab51c87c0d1ec2b2c5c21c230 files/_portage-20040730 13907
 MD5 f6644a412295c3d80658438cc5f1b7f0 files/digest-zsh-4.2.3 199
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (Darwin)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD4DBQFB81shVWNWqTUmv+0RAuXNAJ9kupZxtqb4SaevEhFnW2QCLdgHcwCYjNJA
-3RvtwGGgN/wLhBeCzzR3Hg==
-=UUHY
+iD8DBQFCCxa1VWNWqTUmv+0RAnJzAKCSToj1k4wPHusDbEsqNMg/hVO/IQCgrVC0
+jSrvnaMFpk5XJ6es2CLH5Sk=
+=7R83
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/digest-zsh-4.2.4 b/app-shells/zsh/files/digest-zsh-4.2.4
new file mode 100644
index 000000000000..f47ab5f97142
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.4
@@ -0,0 +1,3 @@
+MD5 5c37fa9eb659458fe4f7f80da17fb09c zsh-4.2.4.tar.bz2 2089657
+MD5 44f829b59181749691b9725e48a9a5e8 zsh-4.2.1-euc-0.3.patch.gz 2919
+MD5 5ffbe07c766dae7708f3f0eb2c1a779f zsh-4.2.4-doc.tar.bz2 1766830
diff --git a/app-shells/zsh/zsh-4.2.3.ebuild b/app-shells/zsh/zsh-4.2.3.ebuild
index fc90f3f9c8cc..92b99be675d9 100644
--- a/app-shells/zsh/zsh-4.2.3.ebuild
+++ b/app-shells/zsh/zsh-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.3.ebuild,v 1.1 2005/01/18 13:45:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.3.ebuild,v 1.2 2005/02/10 08:18:18 usata Exp $
 
 inherit eutils
 
@@ -12,8 +12,8 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64"
-IUSE="maildir ncurses static doc pcre cap cjk"
+KEYWORDS="x86 ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64"
+IUSE="maildir ncurses static doc pcre cap"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
 	cap? ( sys-libs/libcap )
diff --git a/app-shells/zsh/zsh-4.2.4.ebuild b/app-shells/zsh/zsh-4.2.4.ebuild
new file mode 100644
index 000000000000..5c2c2b2ff8dd
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.4.ebuild,v 1.1 2005/02/10 08:18:18 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	linguas_ja? ( http://www.ono.org/software/dist/${PN}-4.2.1-euc-0.3.patch.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64"
+IUSE="maildir ncurses static doc pcre cap"
+
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	cap? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack ${P}-doc.tar.bz2
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-4.2.1-gentoo.diff
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
+	use linguas_ja && epatch ${DISTDIR}/${PN}-4.2.1-euc-0.3.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}" \
+		--with-tcsetpgrp \
+		$(use_with ncurses curses-terminfo) \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable cap) \
+		${myconf} || die "configure failed"
+
+	if 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"
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	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/${PV%_*}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
+	insinto /usr/share/zsh/${PV%_*}/Util
+	doins Util/* || die "doins Util scripts failed"
+	insinto /usr/share/zsh/${PV%_*}/Misc
+	doins Misc/* || die "doins Misc scripts failed"
+
+	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 completions and Gentoo prompt,"
+	einfo "emerge app-shells/zsh-completion and add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
+	einfo "Also, if you want to enable cache for the completions, add"
+	einfo "	zstyle ':completion::complete:*' use-cache 1"
+	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
+}