Fixed several bugs in completions. Thanks to baptux <bapt@ifrance.com> for the patch. See bug #60530.

5 files changed, 23 insertions, 12 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 71f7b6a43777..ed2e4676b651 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.57 2004/08/15 11:23:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.58 2004/08/17 21:37:04 usata Exp $
+
+  18 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> files/_gcc-config,
+  files/_gentoolkit, files/_portage-20040730:
+  Fixed several bugs in completions. Thanks to baptux <bapt@ifrance.com>
+  for the patch. See bug #60530.
 
 *zsh-4.2.1 (15 Aug 2004)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 91322c65cee9..54adc6c1f63b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,10 +1,10 @@
-MD5 10c21f1d40fa248f0ef973070384c31c ChangeLog 10381
+MD5 9290357c942fd646645b01b08e395414 ChangeLog 10602
 MD5 09549ed89ff3dcfdeff35db832854dd4 zsh-4.2.1.ebuild 4216
 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 e400db175b1bae0205d68e538940d292 files/_gcc-config 1130
+MD5 006e6cf19d9020494968fb2babc9c5ab files/_gcc-config 1148
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
 MD5 df0cf63f195a5d5b34845726c401766a files/digest-zsh-4.2.1 199
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
@@ -16,5 +16,5 @@ MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
 MD5 5e0d6408e3f21016b69f938bcd55922b files/_genlop 5185
 MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
-MD5 57e489dcba8d277ca3d44d2b415031b3 files/_gentoolkit 6555
-MD5 e151f7b7f6f2f44c914e33a341068357 files/_portage-20040730 13830
+MD5 d2e3ea2dc0a0268183f7c9ca090f96dd files/_gentoolkit 6716
+MD5 b862cd1ab51c87c0d1ec2b2c5c21c230 files/_portage-20040730 13907
diff --git a/app-shells/zsh/files/_gcc-config b/app-shells/zsh/files/_gcc-config
index 68e61e70bbdd..695a77691f7f 100644
--- a/app-shells/zsh/files/_gcc-config
+++ b/app-shells/zsh/files/_gcc-config
@@ -14,11 +14,13 @@ arguments=(
 	'(- :)'{--get-stdcxx-incdir,-X}'[print g++ include path of given/current profile]:profiles:_gcc_profile'
 	'(- :)'{--help,-h}'[show help]'	
 	'(- :)'{--version,-v}'[show version info]'	
-	'(- :)'':profiles:_gcc_profile'
+	'(- :):profiles:_gcc_profile'
 )
 
 _gcc_profile(){
-    profile=$(_call_program tag gcc-config --list-profiles | sed -r -e 's/(\[([^]]*)\]) //g')
+    local profile
+    profile=$(_call_program tag gcc-config --list-profiles)
+    profile=${profile/\[([^]]*)\]/}
     _tags profile && { compadd "$@" -k profile || compadd "$@" ${(kv)=profile} }
 }
 
diff --git a/app-shells/zsh/files/_gentoolkit b/app-shells/zsh/files/_gentoolkit
index 37faa6af418d..25c36f2d1bdc 100644
--- a/app-shells/zsh/files/_gentoolkit
+++ b/app-shells/zsh/files/_gentoolkit
@@ -4,7 +4,11 @@
 
 #Function to show gensync overlays located in /etc/gensync
 _overlays(){
-    overlay=$(grep -h id= /etc/gensync/* | sed -e 's/id="\(.*\)"$/\1/')
+    local overlay gensynclist gensync_individual
+    gensynclist=(/etc/gensync/*.syncsource) 
+    foreach gensync_individual ($gensynclist)
+    	overlay=($overlay ${${${(M)${(f)"$(<$gensync_individual)"}##id=*}/id=\"/}%\"})
+    end
     _tags overlay && { compadd "$@" ${(kv)=overlay} }
 }
 
@@ -58,7 +62,7 @@ case $service in
 	'()'{--no-color,-C}'[turn off colours]:overlays:_overlays' \
 	'(- :)'{--help,-h}'[show help]' \
 	'(- :)'{--version,-V}'[display version info]' \
-	'(- :)'':overlays:_overlays' 
+	'(- :):overlays:_overlays' 
 ;;
 
  qpkg)
@@ -68,7 +72,7 @@ case $service in
   find=( --find-file -f --find-pattern -fp )
   dups=( --dups -d --slot -s)
   
-       _arguments \
+       _arguments -s \
     	"($check $excl $find $dups 1)"{--find-file,-f}"[finds package that owns file]:file:_files" \
 	"($check $excl $find $dups 1)"{--find-pattern,-fp}"[finds package that owns file matching pattern]:pattern:" \
 	"($excl $check $arg $find --dups -d )"{--dups,-d}"[print packages that have multiple versions installed]" \
diff --git a/app-shells/zsh/files/_portage-20040730 b/app-shells/zsh/files/_portage-20040730
index 558dcf522e45..f02ee5c24240 100644
--- a/app-shells/zsh/files/_portage-20040730
+++ b/app-shells/zsh/files/_portage-20040730
@@ -1,6 +1,6 @@
 #compdef emerge rc-update rc-status ebuild opengl-update rc quickpkg
 
-# $Id: _portage-20040730,v 1.2 2004/08/15 11:23:21 usata Exp $
+# $Id: _portage-20040730,v 1.3 2004/08/17 21:37:04 usata Exp $
 
 # ZSH completion function for Portage
 # Author: baptux <bapt@ifrance.com>
@@ -332,7 +332,7 @@ _actions() {
 	'world[Represent all packages in the world profiles]' \
 	'system[Represent all the system packages]' 
 }
-
+local portage_pkglist gentoo_runlevels portdir pkgdir portdir_overlay overlay
 #Reading informations from make.conf
 [[ -n "${PORTDIR}" ]] && portdir="${PORTDIR}"
 [[ -n "${PKGDIR}" ]] && pkgdir="${PKGDIR}"