_portage_utils: update to match remaining portage-utils-0.53 options

1 files changed, 45 insertions, 14 deletions

diff --git a/_portage_utils b/_portage_utils
index 94e82f6..a68be34 100644
--- a/_portage_utils
+++ b/_portage_utils
@@ -1,7 +1,7 @@
 #compdef qatom qcache qcheck qdepends qfile qgrep qlist qlop qpkg qsearch qsize qtbz2 quse qxpak
 
-#portage-utils-0.19
-#
+# portage-utils-0.53
+
 local common_args PORTDIR
 var=PORTDIR
 
@@ -31,12 +31,20 @@ case $service in
 		show_archs(){
 			arches=(${(f)"$(<$PORTDIR/profiles/arch.list)"})
 			allarches=($archs)
-			for arch in $arches;do
+			for arch in $arches; do
 				allarches=($allarches $arch)
 			done
 			_describe -t available-arches "arch" allarches
 		}
 		_arguments -s $common_args \
+			{'(--matchpkg)-p','(-p)--matchpkg'}'[match pkgname]:package name:_gentoo_packages available_pkgnames_only' \
+			{'(--matchcat)-c','(-c)--matchcat'}'[match catname]:category:_gentoo_packages category' \
+			{'(--imlate)-i','(-i)--imlate'}'[list packages that can be marked stable on a given arch]' \
+			{'(--dropped)-d','(-d)--dropped'}'[list packages that have dropped keywords on a version bump on a given arch]' \
+			{'(--testing)-t','(-t)--testing'}'[list packages that have ~arch versions, but no stable versions on a given arch]' \
+			{'(--stats)-s','(-s)--stats'}'[display statistics about the portage tree]' \
+			{'(--all)-a','(-a)--all'}'[list packages that have at least one version keyworded for on a given arch]' \
+			{'(--not)-n','(-n)--not'}"[list packages that aren't keyworded on a given arch]" \
 			'*:arch:show_archs'
 		;;
 	qcheck)
@@ -67,7 +75,14 @@ case $service in
 		;;
 	qfile)
 		_arguments -s $common_args \
-			{'(--exact)-e','(-e)--exact'}'[Exact match]' \
+			{'(--slots)-S','(-S)--slots'}'[Display installed packages with slots]' \
+			{'(--root-prefix)-R','(-R)--root-prefix'}'[Assume arguments are already prefixed by $ROOT]' \
+			{'(--from)-f','(-f)--from'}'[Read arguments from file <arg> ("-" for stdin)]' \
+			{'(--max-args)-m','(-m)--max-args'}'[Treat from file arguments by groups of <arg> (defaults to 5000)]:number' \
+			{'(--basename)-b','(-b)--basename'}'[Match any component of the path]' \
+			{'(--orphans)-o','(-o)--orphans'}'[List orphan files]' \
+			{'(--exclude)-x','(-x)--exclude'}"[Don't look in package <arg> (used with --orphans)]:package:_gentoo_packages installed" \
+			{'(--exact)-e','(-e)--exact'}'[Exact match (used with --exclude)]' \
 			'*:filename:_files'
 		;;
 	qgrep)
@@ -75,8 +90,18 @@ case $service in
 			{'(--invert-match)-I','(-I)--invert-match'}'[Select non-matching lines]' \
 			{'(--ignore-case)-i','(-i)--ignore-case'}'[Ignore case distinctions]' \
 			{'(--with-filename)-H','(-H)--with-filename'}'[Print the filename for each match]' \
+			{'(--with-name)-N','(-N)--with-name'}'[Print the package or eclass name for each match]' \
 			{'(--count)-c','(-c)--count'}'[Only print a count of matching lines per FILE]' \
+			{'(--list)-l','(-l)--list'}'[Only print FILE names containing matches]' \
+			{'(--invert-list)-L','(-L)--invert-list'}'[Only print FILE names containing no match]' \
 			{'(--regexp)-e','(-e)--regexp'}'[Use PATTERN as a regular expression]' \
+			{'(--extended)-x','(-x)--extended'}'[Use PATTERN as an extended regular expression]' \
+			{'(--installed)-J','(-J)--installed'}'[Search in installed ebuilds instead of the tree]' \
+			{'(--eclass)-E','(-E)--eclass'}'[Search in eclasses instead of ebuilds]' \
+			{'(--skip-comments)-s','(-s)--skip-comments'}'[Skip comments lines]' \
+			{'(--skip)-S','(-S)--skip'}'[Skip lines matching <arg>]:pattern' \
+			{'(--before)-B','(-B)--before'}'[Print <arg> lines of leading context]:number' \
+			{'(--after)-A','(-A)--after'}'[Print <arg> lines of trailing context]:number' \
 			'*:pattern::'
 		;;
 	qlist)
@@ -110,6 +135,7 @@ case $service in
 		_arguments -s $common_args \
 			{'(--all)-a','(-a)--all'}'[List the descriptions of every package in the cache]' \
 			{'(--cache)-c','(-c)--cache'}'[Use the portage cache]' \
+			{'(--ebuilds)-e','(-e)--ebuilds'}'[Use the portage ebuild tree]' \
 			{'(--search)-s','(-s)--search'}'[Regex search package basenames]' \
 			{'(--desc)-S','(-S)--desc'}'[Regex search package descriptions]' \
 			{'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \
@@ -122,9 +148,10 @@ case $service in
 			{'(--all)-a','(-a)--all'}'[Size all installed packages]' \
 			{'(--sum)-s','(-s)--sum'}'[Include a summary]' \
 			{'(--sum-only)-S','(-S)--sum-only'}'[Show just the summary]' \
-			{'(--megabyte)-m','(-m)--megabyte'}'[Display size in megabytes]' \
-			{'(--kilobyte)-k','(-k)--kilobyte'}'[Display size in kilobytes]' \
-			{'(--byte)-b','(-b)--byte'}'[Display size in bytes]' \
+			{'(--megabytes)-m','(-m)--megabytes'}'[Display size in megabytes]' \
+			{'(--kilobytes)-k','(-k)--kilobytes'}'[Display size in kilobytes]' \
+			{'(--bytes)-b','(-b)--bytes'}'[Display size in bytes]' \
+			{'(--ignore)-i','(-i)--ignore'}'[Ignore regexp string]:pattern' \
 			'*:packages:_gentoo_packages installed'
 		;;
 	quse)
@@ -134,28 +161,32 @@ case $service in
 			{'(--keywords)-K','(-K)--keywords'}'[Use the KEYWORDS vs IUSE]' \
 			{'(--license)-L','(-L)--license'}'[Use the LICENSE vs IUSE]' \
 			{'(--describe)-D','(-D)--describe'}'[Describe the USE flag]' \
+			{'(--format)-F','(-F)--format'}'[Use your own variable formats: -F NAME=]:format' \
 			{'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \
 			'*:use flag:_gentoo_packages useflag'
 		;;
 	qtbz2)
 		_arguments -s $common_args \
-			{'(--join -s --split -t --tarbz2 -x --xpak)-j','(-t --tarbz2 -j -s --split -x --xpak)--join'}'[Join tar.bz2 + xpak into a tbz2]:*:tar.bz2 file and xpak file:_files -g \*.\(tar.bz2\|xpak\)' \
-			{'(--join -j --split -t --tarbz2 -x --xpak)-s','(-t --tarbz2 -j --join -s -x --xpak)--split'}'[Split a tbz2 into a tar.bz2 + xpak]:tbz2 file:_files -g \*.tbz2' \
-			{'(--join -j -s --split --tarbz2 -x --xpak)-t','(--join -j -s --split -t -x --xpak)--tarbz2'}'[Just split the tar.bz2]:tbz2 file:_files -g \*.tbz2' \
-			{'(--join -j -s --split -t --tarbz2 --xpak)-x','(--join -j -s --split -t --tarbz2 -x)--xpak'}'[Just split the xpak]:tbz2 file:_files -g \*.tbz2' \
+			{'(--dir)-d','(-d)--dir'}'[Change to specified directory]:directory:_files -/' \
+			{'(--join)-j','(-j)--join'}'[Join tar.bz2 + xpak into a tbz2]:*:tar.bz2 file and xpak file:_files -g \*.\(tar.bz2\|xpak\)' \
+			{'(--split)-s','(-s)--split'}'[Split a tbz2 into a tar.bz2 + xpak]:tbz2 file:_files -g \*.tbz2' \
+			{'(--tarbz2)-t','(-t)--tarbz2'}'[Just split the tar.bz2]:tbz2 file:_files -g \*.tbz2' \
+			{'(--xpak)-x','(-x)--xpak'}'[Just split the xpak]:tbz2 file:_files -g \*.tbz2' \
 			{'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]'
 		;;
 	qpkg)
 		_arguments -s $common_args \
+			{'(--clean)-c','(-c)--clean'}'[clean pkgdir of unused binary files]' \
+			{'(--eclean)-E','(-E)--eclean'}'[clean pkgdir of files not in the tree anymore (slow)]' \
 			{'(--pretend)-p','(-p)--pretend'}'[pretend only]' \
 			{'(--pkgdir)-P','(-P)--pkgdir'}'[alternate package directory]:alternate pkgdir:_files -/' \
 			'*:Installed packages:_gentoo_packages installed_versions'
 		;;
 	qxpak)
 		_arguments -s $common_args \
-			{'(--list --extract -x --create -c)-l','(-l --extract -x --create -c)--list'}'[List the contents of an archive]:xpak archive:_files -g \*.xpak' \
-			{'(--list -l --extract --create -c)-x','(--list -l -x --create -c)--extract'}'[Extract the contents of an archive]:xpak archive:_files -g \*.xpak' \
-			{'(--list -l --extract -x --create)-c','(--list -l --extract -x -c)--create'}'[Create an archive of a directory/files]:*:archive name and files to archive:_files' \
+			{'(--list)-l','(-l)--list'}'[List the contents of an archive]:xpak archive:_files -g \*.xpak' \
+			{'(--extract)-x','(-x)--extract'}'[Extract the contents of an archive]:xpak archive:_files -g \*.xpak' \
+			{'(--create)-c','(-c)--create'}'[Create an archive of a directory/files]:*:archive name and files to archive:_files' \
 			{'(--dir)-d','(-d)--dir'}'[Change to specified directory]:directory:_files -/' \
 			{'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]'
 		;;