Stable on x86, alpha and ppc. Fixed subversion completion; bug #66766. Thanks to Gustaf Thorslund <gustaf@thorslund.org>.

7 files changed, 86 insertions, 36 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index ed2e4676b651..a6c5ef2fa700 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.58 2004/08/17 21:37:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.59 2004/10/09 16:25:09 usata Exp $
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> files/_genlop,
+  files/_gentoolkit, +files/zsh-4.2.1-gentoo.diff, zsh-4.2.1.ebuild:
+  Stable on x86, alpha and ppc. Fixed subversion completion; bug #66766.
+  Thanks to Gustaf Thorslund <gustaf@thorslund.org>.
 
   18 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> files/_gcc-config,
   files/_gentoolkit, files/_portage-20040730:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 4cab2ad45895..3abf3c27fc73 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,30 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a8d76905e8a9727607b10c1b3722dcc9 zsh-4.1.1-r5.ebuild 3389
-MD5 607a5475313774b3ee38918e633cfd6a zsh-4.2.0-r1.ebuild 3692
-MD5 708c996d82ee2e1638a48016d7f5d698 zsh-4.0.9-r3.ebuild 2701
 MD5 9290357c942fd646645b01b08e395414 ChangeLog 10602
-MD5 09549ed89ff3dcfdeff35db832854dd4 zsh-4.2.1.ebuild 4216
+MD5 e7490af8c1e746127144a159c9f4d0f8 zsh-4.2.1.ebuild 4222
+MD5 708c996d82ee2e1638a48016d7f5d698 zsh-4.0.9-r3.ebuild 2701
+MD5 a8d76905e8a9727607b10c1b3722dcc9 zsh-4.1.1-r5.ebuild 3389
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
+MD5 607a5475313774b3ee38918e633cfd6a zsh-4.2.0-r1.ebuild 3692
 MD5 006e6cf19d9020494968fb2babc9c5ab files/_gcc-config 1148
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
+MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1 199
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
-MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
-MD5 d2e3ea2dc0a0268183f7c9ca090f96dd files/_gentoolkit 6716
+MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
+MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
-MD5 5e0d6408e3f21016b69f938bcd55922b files/_genlop 5185
-MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 f03e0d125db81b28e575e0a61109cbfe files/_genlop 5838
+MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
+MD5 6a03afc2cdef547eb2af4a6f5eb0dac6 files/_gentoolkit 7369
 MD5 b862cd1ab51c87c0d1ec2b2c5c21c230 files/_portage-20040730 13907
-MD5 df0cf63f195a5d5b34845726c401766a files/digest-zsh-4.2.1 199
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOeSd/rLF9B432nYRAmaxAKCjedHPZ94c50Xla5L947A41tkLtwCgtgfT
-h36y/rvXNcuzjo863Ti+KAk=
-=sEHQ
------END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/_genlop b/app-shells/zsh/files/_genlop
index 18473d91c9c2..2acabc09f7c5 100644
--- a/app-shells/zsh/files/_genlop
+++ b/app-shells/zsh/files/_genlop
@@ -117,9 +117,29 @@ _months() {
 }
 
 #Reading informations from make.conf
-portdir="$(portageq portdir)"
+#
+# Using portageq is the right way to get PORTDIR, but it is very slow :-(
+#
+#portdir="$(portageq portdir)"
 #pkgdir="$(portageq pkgdir)"
-portdir_overlay="$(portageq portdir_overlay)"
+#portdir_overlay="$(portageq portdir_overlay)"
+[[ -n "${PORTDIR}" ]] && portdir="${PORTDIR}"
+[[ -n "${PKGDIR}" ]] && pkgdir="${PKGDIR}"
+if [[ -n "${PORTDIR_OVERLAY}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
+[[ -r /etc/make.globals ]] && source /etc/make.globals
+[[ -r /etc/make.conf ]] && source /etc/make.conf
+
+[[ -z "${portdir}" ]] && portdir="${PORTDIR}"
+[[ -z "${pkgdir}" ]] && pkgdir="${PKGDIR}"
+if [[ -z "${portdir_overlay}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
 
 portage_pkglist=(${portdir}/*-*/* ${=portdir_overlay}/*-*/*)
 portage_pkglist=(${portage_pkglist##*/})
diff --git a/app-shells/zsh/files/_gentoolkit b/app-shells/zsh/files/_gentoolkit
index 25c36f2d1bdc..333043e39ad6 100644
--- a/app-shells/zsh/files/_gentoolkit
+++ b/app-shells/zsh/files/_gentoolkit
@@ -46,9 +46,29 @@ _portage_pkglist(){
 }
 
 #Reading informations from Portage
-portdir="$(portageq portdir)"
+#
+# Using portageq is the right way to get PORTDIR, but it is very slow :-(
+#
+#portdir="$(portageq portdir)"
 #pkgdir="$(portageq pkgdir)"
-portdir_overlay="$(portageq portdir_overlay)"
+#portdir_overlay="$(portageq portdir_overlay)"
+[[ -n "${PORTDIR}" ]] && portdir="${PORTDIR}"
+[[ -n "${PKGDIR}" ]] && pkgdir="${PKGDIR}"
+if [[ -n "${PORTDIR_OVERLAY}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
+[[ -r /etc/make.globals ]] && source /etc/make.globals
+[[ -r /etc/make.conf ]] && source /etc/make.conf
+
+[[ -z "${portdir}" ]] && portdir="${PORTDIR}"
+[[ -z "${pkgdir}" ]] && pkgdir="${PKGDIR}"
+if [[ -z "${portdir_overlay}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
 
 portage_pkglist=(${portdir}/*-*/* ${portdir_overlay}/*-*/*)
 portage_pkglist=(${portage_pkglist##*/})
diff --git a/app-shells/zsh/files/digest-zsh-4.2.1 b/app-shells/zsh/files/digest-zsh-4.2.1
index a54f06fe9899..5a7134f4f087 100644
--- a/app-shells/zsh/files/digest-zsh-4.2.1
+++ b/app-shells/zsh/files/digest-zsh-4.2.1
@@ -1,3 +1,3 @@
 MD5 b59ef34b8de288d5fd16f842451125c8 zsh-4.2.1.tar.bz2 2039188
-MD5 3c222b6d7b974c07ba244c37eb5d65fb zsh-4.2.0-euc-0.2.patch.gz 2857
+MD5 44f829b59181749691b9725e48a9a5e8 zsh-4.2.1-euc-0.3.patch.gz 2919
 MD5 943bdc398c6138bdb2294a355f4d0959 zsh-4.2.1-doc.tar.bz2 1632937
diff --git a/app-shells/zsh/files/zsh-4.2.1-gentoo.diff b/app-shells/zsh/files/zsh-4.2.1-gentoo.diff
new file mode 100644
index 000000000000..db7bf3be3082
--- /dev/null
+++ b/app-shells/zsh/files/zsh-4.2.1-gentoo.diff
@@ -0,0 +1,11 @@
+--- Completion/Unix/Command/_subversion.orig	2004-04-15 19:29:36.000000000 +0900
++++ Completion/Unix/Command/_subversion	2004-10-10 00:44:00.000000000 +0900
+@@ -41,7 +41,7 @@
+   if (( ! $+_svn_cmds )); then
+     typeset -gA _svn_cmds
+     _svn_cmds=(
+-      ${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
++      ${=${(f)${${"$(_call_program commands LC_ALL=C svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
+     )
+   fi
+ 
diff --git a/app-shells/zsh/zsh-4.2.1.ebuild b/app-shells/zsh/zsh-4.2.1.ebuild
index 5a5e19ff7ed8..a42159373580 100644
--- a/app-shells/zsh/zsh-4.2.1.ebuild
+++ b/app-shells/zsh/zsh-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1.ebuild,v 1.1 2004/08/15 11:23:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1.ebuild,v 1.2 2004/10/09 16:25:09 usata Exp $
 
 inherit eutils
 
@@ -11,12 +11,12 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
 SRC_URI="ftp://ftp.zsh.org/pub/${MY_P}.tar.bz2
-	cjk? ( http://www.ono.org/software/dist/zsh-4.2.0-euc-0.2.patch.gz )
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.3.patch.gz )
 	doc? ( ftp://ftp.zsh.org/pub/${MY_P}-doc.tar.bz2 )"
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~arm ~hppa ~amd64"
 IUSE="maildir ncurses static doc pcre cap cjk"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
@@ -32,7 +32,8 @@ src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	use doc && unpack ${MY_P}-doc.tar.bz2
 	cd ${S}
-	use cjk && epatch ${DISTDIR}/zsh-4.2.0-euc-0.2.patch.gz
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	use cjk && epatch ${DISTDIR}/${P}-euc-0.3.patch.gz
 	cd ${S}/Doc
 	ln -sf . man1
 	# fix zshall problem with soelim
@@ -59,10 +60,10 @@ src_compile() {
 		--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` \
+		$(use_with ncurses curses-terminfo) \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable cap) \
 		${myconf} || die "configure failed"
 
 	if use static ; then
@@ -78,7 +79,10 @@ src_compile() {
 
 	# emake still b0rks
 	emake -j1 || die "make failed"
-	#make check || die "make check failed"
+}
+
+src_test() {
+	make check || die "make check failed"
 }
 
 src_install() {