Version bumped.

(Portage version: 2.0.52-r1)

4 files changed, 178 insertions, 17 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index e4cf5316a145..383f86e0a3dc 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.90 2005/09/17 15:23:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.91 2005/12/07 00:33:00 usata Exp $
+
+*zsh-4.2.6 (07 Dec 2005)
+
+  07 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> +zsh-4.2.6.ebuild:
+  Version bumped.
 
   04 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> zsh-4.2.5.ebuild:
   Small multilib fix, closes bug 104669. Stable on amd64.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 391023e1173e..e35f39d17adc 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
+MD5 58c30e246f537c902f9311f9e6b275b9 ChangeLog 14266
 MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
+MD5 c2b2ed1462888163d7f8ec514e975d93 zsh-4.2.6.ebuild 4541
+MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
 MD5 c2b2ed1462888163d7f8ec514e975d93 zsh-4.2.5.ebuild 4541
-MD5 58c30e246f537c902f9311f9e6b275b9 ChangeLog 14266
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
+MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
+MD5 6a0124cadb5fb33bee5400ae9acc74c0 files/digest-zsh-4.2.6 199
 MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
 MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
+MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLDT1Kf2g/qXtneoRAgZNAJ45zVGqBaMc9m8IPtsbvDrX1hYfcACfXyeM
-KjF1vKVo0J240PB18E74DLI=
-=Q4Vf
------END PGP SIGNATURE-----
+MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
diff --git a/app-shells/zsh/files/digest-zsh-4.2.6 b/app-shells/zsh/files/digest-zsh-4.2.6
new file mode 100644
index 000000000000..4cf67a8e3149
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.6
@@ -0,0 +1,3 @@
+MD5 2cefebf742c190cbc611baded825db64 zsh-4.2.6.tar.bz2 2098671
+MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
+MD5 3ca3b7c199db6eb942f2a296e3fad270 zsh-4.2.6-doc.tar.bz2 1770113
diff --git a/app-shells/zsh/zsh-4.2.6.ebuild b/app-shells/zsh/zsh-4.2.6.ebuild
new file mode 100644
index 000000000000..823017775cea
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.6.ebuild
@@ -0,0 +1,161 @@
+# 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.6.ebuild,v 1.1 2005/12/07 00:33:00 usata Exp $
+
+inherit eutils multilib
+
+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.4-euc-0.3.patch.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+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}-init.d-gentoo.diff
+	use linguas_ja && epatch ${DISTDIR}/${PN}-4.2.4-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"
+
+	if use ppc-macos; then
+		LDFLAGS="${LDFLAGS} -Wl,-x"
+		myconf="${myconf} --enable-libs=-liconv"
+	fi
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/$(get_libdir) \
+		--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
+
+	# hack for Darwin8 broken poll()
+	if use ppc-macos ; then
+		sed -i -e "s/define HAVE_POLL_H/undef HAVE_POLL_H/g" \
+			-e "s/define HAVE_POLL/undef HAVE_POLL/g" \
+			config.h
+	fi
+
+	# emake still b0rks
+	emake -j1 || die "make failed"
+}
+
+src_test() {
+	for f in /dev/pt* ; do
+		addpredict $f
+	done
+	make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/$(get_libdir) \
+		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
+}