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

4 files changed, 56 insertions, 5 deletions

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
+