Version bumped. Updated _genlop and added quickpkg completion

  (Thanks to oberyno <oberyno@gmail.com>). This closes bug #60353.

7 files changed, 137 insertions, 122 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index fe1714e5603e..71f7b6a43777 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2004/08/12 19:11:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.57 2004/08/15 11:23:21 usata Exp $
+
+*zsh-4.2.1 (15 Aug 2004)
+
+  15 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> files/_genlop,
+  files/_portage-20040730, +zsh-4.2.1.ebuild, -zsh-4.2.1_alpha1.ebuild:
+  Version bumped. Updated _genlop and added quickpkg completion
+  (Thanks to oberyno <oberyno@gmail.com>). This closes bug #60353.
 
 *zsh-4.2.1_alpha1 (13 Aug 2004)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index f2d6521de056..91322c65cee9 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,20 +1,20 @@
-MD5 5f24ce2a901d02baa59a09e2cb7f1972 ChangeLog 10087
+MD5 10c21f1d40fa248f0ef973070384c31c ChangeLog 10381
+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 8d8c7b8b5bd2491c6a88f5829163edb4 zsh-4.2.1_alpha1.ebuild 4247
 MD5 e400db175b1bae0205d68e538940d292 files/_gcc-config 1130
 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
 MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
-MD5 4d4d3f13f7a73a8d0f8c2d1108eb366b files/digest-zsh-4.2.1_alpha1 213
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 c76debf789c176c979dd02600c707a7e files/_genlop 5248
+MD5 5e0d6408e3f21016b69f938bcd55922b files/_genlop 5185
 MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
 MD5 57e489dcba8d277ca3d44d2b415031b3 files/_gentoolkit 6555
-MD5 3f90e9d6e04d7ada6aa481519d74cc8a files/_portage-20040730 12959
+MD5 e151f7b7f6f2f44c914e33a341068357 files/_portage-20040730 13830
diff --git a/app-shells/zsh/files/_genlop b/app-shells/zsh/files/_genlop
index 763dc7697f80..18473d91c9c2 100644
--- a/app-shells/zsh/files/_genlop
+++ b/app-shells/zsh/files/_genlop
@@ -9,132 +9,111 @@
 # Adapted for genlop by oberyno <oberyno@gmail.com>
 
 _genlop () {
-    local state prev1="$words[CURRENT-1]"  prev2="$words[CURRENT-2]"
-    if (( CURRENT == 2 ));then
-        _arguments -s \
-            '*:*:->ebuilds' \
-            "$common_args[@]" "$general_args[@]" "$single_args[@]" && return 0
-    elif (( CURRENT > 2 ));then
-        case "$words[2]" in
-	    --unmerge|-u)
-		_arguments -s \
-		    '*:*:->install_portage' \
-		    "$common_args[@]" "$general_args[@]" && return 0
-		;;
-	    --current|-c)
-		_arguments -s \
-		    '*:only works when an emerge is in progress:' \
-		    "$common_args[@]" && return 0
-		;;
-      	    --pretend|-p)
-		_arguments -s \
-		    '*:needs a piped emerge; otherwise will do nothing:' \
-		    "$common_args[@]" && return 0
-		;;
-	    --date)
-		  if [[ ${prev2} == (january|february|march|april|may|june|july|august|september|october|november|december|monday|tuesday|wednesday|thursday|friday|saturday|sunday) ]]
-		  	then  _arguments -s \
-			'*:installed pkgname:_portage_installed' \
-			"$common_args[@]" "$general_args[@]" && return 0
-		  elif [[ ${prev1} == (1) ]]
-			then  _values  "date" 'day ago' 'month ago' 'year ago' 'week ago' && return 0
-		  elif [[ ${prev1} == ([2-9]|[1-9][0-9]*) ]]
-			then  _values  "date" 'days ago' 'months ago' 'years ago' 'weeks ago' && return 0
- 		  elif [[ ${prev1} == (last) ]]
-			then  _values  "date" month week
- 			_arguments '*:*:_days' && return 0
-		  elif [[ ${prev1} == (1st|2nd|3rd|4th|5th) ]]
-			then _arguments '*:*:_days' && return 0
-		  elif [[ ${prev1} == (january|february|march|april|may|june|july|august|september|october|november|december) ]]
-			then compadd {1..31} && return 0
-	  	  elif [[ ${prev2} == (1st|2nd|3rd|4th|5th) ]]
-			then  compadd in\ {january,february,march,april,may,june,july,august,september,october,november,december} && return 0
-		  elif [[ ${prev1} == --date ]] 
-		  	then _values "enter number for more options or use mm/dd/yyyy format" \
-		 	 last yesterday 1st 2nd 3rd 4th 5th 
-		 	 _alternative \
-		        '*:*:_days' '*:*:_months' && return 0
-		  else
-		  	 _arguments -s \
-			'*:installed pkgname:_portage_installed' \
-			"$common_args[@]" "$general_args[@]" && return 0
-		  fi
-		;;
+local prev1="$words[CURRENT-1]"  prev2="$words[CURRENT-2]" days months arg single state lstate
+days=(monday tuesday wednesday thursday friday saturday sunday)
+months=(january february march april may june july august september october november december)
+arg=( --current -c --time -t --gmt -g --info -i --file -f --rsync -r --unmerge -u --date --search -s --list -l )
+single=( --current -c --pretend -p --help -h --version -v )
 
-	    --rsync|-r|--list|-l)
-		_arguments -s \
-		    "$common_args[@]" "$general_args[@]" && return 0
-		;;
-	    --version|-v|--help|-h)
-	    	_arguments -s \
-		    "$common_args[@]" && return 0
-		;;
+	[[ ${prev2} == (1st|2nd|3rd|4th|5th) ]] &&
+		compadd in\ $months && return 0
+	[[ ${prev1} == ([2-9]|[1-9][0-9]*) && ${prev2} != \
+	(january|february|march|april|may|june|july|august|september|october|november|december) ]] &&
+		_values  '' 'days ago' 'months ago' 'years ago' 'weeks ago' && return 0
+	[[ ${prev1} == (1) && ${prev2} != \
+	(january|february|march|april|may|june|july|august|september|october|november|december) ]] &&
+		_values  '' 'day ago' 'month ago' 'year ago' 'week ago' && return 0
+
+    case "$prev1" in
+	    last)
+	        _values  '' month week
+		compadd $days && return 0
+	;;
+	    1st|2nd|3rd|4th|5th)
+		compadd $days && return 0
+	;;
+	    january|february|march|april|may|june|july|august|september|october|november|december)
+		compadd {1..31} && return 0
+	;;
+	    --date) 
+	        _message 'enter number for more options or use mm/dd/yyyy format'
+	        _values '' \
+		last yesterday 1st 2nd 3rd 4th 5th 
+		_alternative \
+		'*:*:_days' '*:*:_months' && return 0
+	;;
+	    --file|-f)
+	        _arguments '*:logfile:_files' && return 0
+	;;
 	    *)
-		_arguments -s \
-		'*:*:->ebuilds' \
-		    "$common_args[@]" "$general_args[@]" && return 0
-		;;
-        esac
-    fi
+		 _arguments \
+		"($single $arg *)"{--current,-c}"[display the current merge in action]" \
+		"($single)*--date[specify date of event]:date:->date" \
+		"($single)*-f[specify the logfile to use]:logfile:_files" \
+		"($single --gmt -g)"{--gmt,-g}"[display time in GMT/UTC format (default is local time)]" \
+		"($single $arg *)"{--help,-h}"[display help information]" \
+		"($single --info -i --list -l)"{--info,-i}"[print brief summary about installed ebuild]" \
+		"($single --search -s --info -i --list -l *)"{--list,-l}"[list merge history]" \
+		"(--nocolor -n)"{--nocolor,-n}"[disable colored output]" \
+		"($single $arg *)"{--pretend,-p}"[estimate build time of a piped emerge -p]" \
+		"($single --search -s --info -i --time -t --unmerge -u --rsync -r *)"{--rsync,-r}"[display rsync history]" \
+		"($single --rsync -r --search -s --list -l *)"{--search,-s}"[select ebuilds matching the provided regular expression]:pattern:" \
+		"($single --time -t)"{--time,-t}"[display merge time]" \
+		"($single --rsync -r --unmerge -u)"{--unmerge,-u}"[display when packages have been unmerged]" \
+		"($single $arg *)"{--version,-v}"[display version information]" \
+		"($single)*:package:_portage_pkglist"
+	;;
+    esac
+	
     while [[ -n "$state" ]]; do
         lstate=$state
         state=''
         case "$lstate" in
-	    ebuilds)
-		_alternative \
-		    '*:installed packages:_portage_installed'
-		;;
-	    install_portage)
+	    date) _message 'enter number for more options or use mm/dd/yyyy format'
+	    _values '' \
+		last yesterday 1st 2nd 3rd 4th 5th 
 		_alternative \
-		    '*:installed packages:_portage_pkglist'
-		;;
-        esac
-    done
+		':*:_days' ':*:_months' && return 0
+	    ;;
+	esac
+    done   
 }
 
-_portage_installed(){
-    installed_portage=(/var/db/pkg/*-*/*)
-    installed_pkgname=${(M)${${installed_portage##*/}%%-[0-9]*}}
-    _tags installed_pkgname && {  compadd "$@" ${(kv)=installed_pkgname} }
-    _path_files -/ -W /var/db/pkg/
-} 
 #Function to show all available portage names
 _portage_pkglist(){
     portage_pkglist="$portage_pkglist"
     _tags -s portage_pkglist && { compadd "$@" ${(kv)=portage_pkglist} }
     _path_files -/ -F "*CVSROOT" -F "*eclass" -F "*distfiles" -F "*licences" -F "*files" -W "${portdir}"
-    _path_files -g \*.ebuild
 }
-common_args=(
-    {'(-n)--nocolor','(--nocolor)-n'}'[disable colored output]'
-)
-
-general_args=(
-	{'(--time)-t','(-t)--time'}'[calculate merge time]'
-	{'(--gmt)-g','(-g)--gmt'}'[display time in GMT/UTC format (default is local time)]'
-	{'(--info)-i','(-i)--info'}'[prints brief summary about installed ebuild]'
-	{'(--file)-f','(-f)--file'}'[specify the logfile to use]:filename:_files'
-	{'(--rsync -r --unmerge)-u','(--rsync -r -u)--unmerge'}'[show when packages have been unmerged]'
-	'*--date[specify date of event]'
-	{'(--search -s --info -i --time -t --unmerge -u --rsync)-r','(--search -s --info -i --time -t --unmerge -u -r)--rsync'}'[looks for portage rsync/sync history]'
-	{'(--search -s --info -i --list)-l','(--search -s --info -i -l)--list'}'[list complete merge history]'
-	{'(--rsync -r --search)-s','(--rsync -r -s)--search'}'[select ebuilds matching the provided regular expression]:enter:_guard "^--*" search pattern'
-)
-
-single_args=(
-	{'(--current)-c','(-c)--current'}'[show the current merge in action]'
-	{'(--pretend)-p','(-p)--pretend'}'[take output from a piped emerge -p and calculate estimated build time]'
-	{'(--version)-v','(-v)--version'}'[output version information]'
-	{'(--help)-h','(-h)--help'}'[show help]'
-)
 
 _days() {
-    _values  "" \
-	monday tuesday wednesday thursday friday saturday sunday
+	local m="monday" t="tuesday" w="wednesday" T="thursday" f="friday" s="saturday" S="sunday"	
+	local day=$(date +%u)
+	if   [[ ${day} == 1 ]] then compadd $m
+	elif [[ ${day} == 2 ]] then compadd $m $t
+	elif [[ ${day} == 3 ]] then compadd $m $t $w	 
+	elif [[ ${day} == 4 ]] then compadd $m $t $w $T
+	elif [[ ${day} == 5 ]] then compadd $m $t $w $T $f
+	elif [[ ${day} == 6 ]] then compadd $m $t $w $T $f $s
+	elif [[ ${day} == 7 ]] then compadd $m $t $w $T $f $s $S
+	fi
 }
 _months() {
-    _values  "" \
-	january february march april may june july august september october november december
+	local j="january" f="february" m="march" a="april" M="may" ju="june" J="july" A="august" s="september" o="october" n="november" d="december"
+	local month=$(date +%m)
+	if   [[ ${month} == 01 ]] then compadd $j
+	elif [[ ${month} == 02 ]] then compadd $j $f
+	elif [[ ${month} == 03 ]] then compadd $j $f $m	 
+	elif [[ ${month} == 04 ]] then compadd $j $f $m $a
+	elif [[ ${month} == 05 ]] then compadd $j $f $m $a $M 
+	elif [[ ${month} == 06 ]] then compadd $j $f $m $a $M $ju
+	elif [[ ${month} == 07 ]] then compadd $j $f $m $a $M $ju $J
+	elif [[ ${month} == 08 ]] then compadd $j $f $m $a $M $ju $J $A
+	elif [[ ${month} == 09 ]] then compadd $j $f $m $a $M $ju $J $A $s
+	elif [[ ${month} == 10 ]] then compadd $j $f $m $a $M $ju $J $A $s $o
+	elif [[ ${month} == 11 ]] then compadd $j $f $m $a $M $ju $J $A $s $o $n
+	elif [[ ${month} == 12 ]] then compadd $j $f $m $a $M $ju $J $A $s $o $n $d
+	fi
 }
 
 #Reading informations from make.conf
@@ -142,5 +121,5 @@ portdir="$(portageq portdir)"
 #pkgdir="$(portageq pkgdir)"
 portdir_overlay="$(portageq portdir_overlay)"
 
-portage_pkglist=(${portdir}/*-*/* ${portdir_overlay}/*-*/*)
+portage_pkglist=(${portdir}/*-*/* ${=portdir_overlay}/*-*/*)
 portage_pkglist=(${portage_pkglist##*/})
diff --git a/app-shells/zsh/files/_portage-20040730 b/app-shells/zsh/files/_portage-20040730
index e372e15c4a98..558dcf522e45 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
+#compdef emerge rc-update rc-status ebuild opengl-update rc quickpkg
 
-# $Id: _portage-20040730,v 1.1 2004/08/12 19:11:59 usata Exp $
+# $Id: _portage-20040730,v 1.2 2004/08/15 11:23:21 usata Exp $
 
 # ZSH completion function for Portage
 # Author: baptux <bapt@ifrance.com>
@@ -104,6 +104,23 @@ _rc-update () {
     fi
 }
 
+# Stuff for quickpkg
+
+_quickpkg () {
+	if compset -P '(\\|)[><][=]'; then
+	_arguments -s \
+    	    '*:installed pkgname with versions:_portage_unmerge_vers' && return 0
+	  elif compset -P '(\\|)[<=>]'; then
+		_arguments -s \
+		    '*:installed pkgname with versions:_portage_unmerge_vers' && return 0
+	  elif compset -P '(\\|)[/]'; then
+		_files -W / -/ && return 0
+	  else 
+		_arguments -s \
+		    '*:installed pkgname:_portage_quickpkg' && return 0
+	  fi
+}
+ 
 # Stuff for emerge
 
 _emerge () {
@@ -193,6 +210,13 @@ _portage_unmerge(){
     _path_files -/ -W "/var/db/pkg/"
 }
 
+#Function to show only installed packages -- no _path_files 
+_portage_quickpkg(){
+    installed_portage=(/var/db/pkg/*-*/*)
+    installed_pkgname=${(M)${${installed_portage##*/}%%-[0-9]*}}
+    _tags -s installed_pkgname && { compadd "$@" ${(kv)=installed_pkgname} }
+}
+
 #Function to show only installed packages -- cat/name-ver
 _portage_unmerge_vers(){
     installed_portage=(/var/db/pkg/*-*/*)
@@ -274,6 +298,7 @@ install_args=(
     '(-l --changelog)--oneshot[Do not add package to the world profile]'
     {'(--onlydeps --changelog -l)-o','(--changelog -o -l)--onlydeps'}'[Only merge (or pretend to merge) the dependencies]'
     {'(--quiet --changelog -l)-q','(-q --changelog -l)--quiet'}'[General outcome is a reduced or condensed output]'
+    {'(-l --changelog -t)--tree','(-l --changelog --tree)-t'}'[Show dependency tree]'
     {'(--update --changelog -l)-u','(-u --changelog -l)--update'}'[Updates packages to the most recent version available]'
     {'(--upgradeonly --changelog -l)-U','(-U --changelog -l)--upgradeonly'}'[Do not update packages to a lower version]'
     {'(--usepkg --changelog -l)-k','(-k --changelog -l)--usepkg'}'[Tells emerge to use binary packages if available]'
@@ -351,4 +376,8 @@ case "$service" in
 	rc)
 		_rc "$@" && return 0
 		;;
+	quickpkg)
+		_quickpkg "$@" && return 0
+		;;
+
 esac
diff --git a/app-shells/zsh/files/digest-zsh-4.2.1 b/app-shells/zsh/files/digest-zsh-4.2.1
new file mode 100644
index 000000000000..a54f06fe9899
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.1
@@ -0,0 +1,3 @@
+MD5 b59ef34b8de288d5fd16f842451125c8 zsh-4.2.1.tar.bz2 2039188
+MD5 3c222b6d7b974c07ba244c37eb5d65fb zsh-4.2.0-euc-0.2.patch.gz 2857
+MD5 943bdc398c6138bdb2294a355f4d0959 zsh-4.2.1-doc.tar.bz2 1632937
diff --git a/app-shells/zsh/files/digest-zsh-4.2.1_alpha1 b/app-shells/zsh/files/digest-zsh-4.2.1_alpha1
deleted file mode 100644
index bbc862c1bc8c..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.1_alpha1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e76611901723d08637115d8a550fc650 zsh-4.2.1-test-A.tar.bz2 2036847
-MD5 3c222b6d7b974c07ba244c37eb5d65fb zsh-4.2.0-euc-0.2.patch.gz 2857
-MD5 d2b5e31c64d63c0f6acbfd9d545a9822 zsh-4.2.1-test-A-doc.tar.bz2 1752490
diff --git a/app-shells/zsh/zsh-4.2.1_alpha1.ebuild b/app-shells/zsh/zsh-4.2.1.ebuild
index 1b89e2ebfaa2..5a5e19ff7ed8 100644
--- a/app-shells/zsh/zsh-4.2.1_alpha1.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_alpha1.ebuild,v 1.1 2004/08/12 19:11:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1.ebuild,v 1.1 2004/08/15 11:23:21 usata Exp $
 
 inherit eutils
 
@@ -10,9 +10,9 @@ 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/development/${MY_P}.tar.bz2
+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 )
-	doc? ( ftp://ftp.zsh.org/pub/development/${MY_P}-doc.tar.bz2 )"
+	doc? ( ftp://ftp.zsh.org/pub/${MY_P}-doc.tar.bz2 )"
 
 LICENSE="ZSH"
 SLOT="0"