app-shells/zsh-completions: Version bump. Adapt live

3 files changed, 43 insertions, 33 deletions

diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index fdaeb30e..41a61ec7 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1 +1 @@
-DIST zsh-completions-0.19.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5
+DIST zsh-completions-0.20.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5
diff --git a/app-shells/zsh-completions/zsh-completions-0.19.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.20.0.ebuild
index 205b1499..ffa1ffd7 100644
--- a/app-shells/zsh-completions/zsh-completions-0.19.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.20.0.ebuild
@@ -43,56 +43,61 @@ used_value() {
 	esac
 }
 calculate_data() {
-	local comp curr currfile used
+	local comp curr currfile curruse first used
 	for comp
 	do	curr="${comp%% *}"
 		used_value curr || continue
 		case ${curr} in
 		'+'*)
 			curr="completion_${curr#?}"
-			IUSE=${IUSE}${IUSE:+\ }+${curr};;
+			curruse=+${curr};;
 		*)
 			curr="completion_${curr}"
-			IUSE=${IUSE}${IUSE:+\ }${curr};;
+			curruse=${curr};;
 		esac
+		first=:
 		for currfile in ${comp#* }
 		do	used_value currfile
 			used=${?}
 			USEFILE["${currfile}"]="${curr}"
 			[[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
 			[ ${used} -ne 0 ] && continue
+			! $first || IUSE=${IUSE-}${IUSE:+\ }$curruse
+			first=false
 			FILEINDEX["${currfile}"]="${#FILES[@]}"
 			FILES+=("${currfile}")
 		done
 	done
 }
 # Prepend # or / to mark only live/-nonlive categories or files
+# (though categories are automatically marked/removed if they contain no files)
 calculate_data \
 	'+Android /_adb _android _emulator' \
 	'+Google _google' \
-	'+Unix #_chattr #_cheat  _cmake _dzen2 _logger #_lsattr /_nl #_openssl #_pixz /_ps #_rebar #_setcap _shutdown /_watch _xinput /_zfs' \
-	'#+backup _tarsnap' \
+	'+Linux #_chattr #_lsattr #_lsblk #_setcap' \
+	'+Unix #_cheat _cmake /_dzen2 /_logger /_nl #_openssl #_pixz /_ps _shutdown /_watch /_zfs' \
+	'+X _xinput' \
 	'+database _redis-cli _pgsql_utils' \
-	'+dev _artisan _choc _console _geany /_gradle _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
+	'+dev _artisan _choc _console _geany /_gradle _phing /_manage.py _mvn /_pear _play /_symfony _thor _vagrant /_veewee' \
 	'+disk #_scrub _sdd _smartmontools _srm' \
-	'+distribute _celery /_envoy _fab #_fleetctl _glances _kitchen _knife _mina _mussh' \
+	'+distribute /_celery /_envoy _fab #_fleetctl _glances _kitchen _knife _mina _mussh' \
 	'+git _git-flow _git-pulls' \
-	'#+go _go' \
-	'#+gtk _gtk-launch' \
-	'+hardware _optirun _perf _primus' \
+	'+go #_go' \
+	'+gtk #_gtk-launch' \
+	'+hardware _optirun _perf /_primus' \
 	'+haskell /_cabal _ghc #_stack' \
-	'+managers #_ansible #_ansible-galaxy #_ansible-playbook #_ansible-vault _bower /_brew #_cask _debuild _lein #_multirust _pactree _pkcon _port #_rsvm #_supervisorctl _yaourt' \
-	'+multimedia _id3 _id3v2 _showoff' \
-	'+net _dget _dhcpcd _httpie _iw /_mosh _rfkill _socat _ssh-copy-id #_ufw _vpnc _vnstat' \
+	'+managers #_ansible #_ansible-galaxy #_ansible-playbook #_ansible-vault _bower /_brew #_cask _debuild /_lein #_multirust /_pactree _pkcon _port #_rsvm #_supervisorctl _yaourt' \
+	'+multimedia /_id3 /_id3v2 _showoff' \
+	'+net _dget _dhcpcd _httpie /_iw /_mosh _rfkill /_socat _ssh-copy-id #_ufw _vpnc _vnstat' \
 	'+nfs _exportfs' \
-	'+perl _cpanm' \
+	'+perl /_cpanm' \
 	'+python /_bpython _pygmentize _setup.py' \
-	'+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _jekyll _lunchy _rails _rspec _rubocop _rvm' \
+	'+ruby _bundle _cap /_ditz _gas /_gem _gist /_github _git-wtf /_jekyll _lunchy _rails _rspec _rubocop _rvm' \
 	'+search _ack _ag _jq #_jrnl' \
 	'+session _atach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
 	'+virtualization /_boot2docker #_rkt _virtualbox _virsh' \
-	'+web _coffee _composer #_dad #_diana _docpad _drush /_heroku #_hledger #_homestead _jonas _jmeter _jmeter-plugins _lunar _middleman #_mix _node _nvm _ralio /_salt _sbt _scala _svm'
+	'+web _coffee _composer #_dad #_diana _docpad _drush /_heroku #_homestead _jonas _jmeter _jmeter-plugins /_lunar _middleman #_mix _node _nvm _ralio /_salt _sbt _scala _svm'
 
 src_prepare() {
 	# Remove colliding completions
diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
index 205b1499..ffa1ffd7 100644
--- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -43,56 +43,61 @@ used_value() {
 	esac
 }
 calculate_data() {
-	local comp curr currfile used
+	local comp curr currfile curruse first used
 	for comp
 	do	curr="${comp%% *}"
 		used_value curr || continue
 		case ${curr} in
 		'+'*)
 			curr="completion_${curr#?}"
-			IUSE=${IUSE}${IUSE:+\ }+${curr};;
+			curruse=+${curr};;
 		*)
 			curr="completion_${curr}"
-			IUSE=${IUSE}${IUSE:+\ }${curr};;
+			curruse=${curr};;
 		esac
+		first=:
 		for currfile in ${comp#* }
 		do	used_value currfile
 			used=${?}
 			USEFILE["${currfile}"]="${curr}"
 			[[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
 			[ ${used} -ne 0 ] && continue
+			! $first || IUSE=${IUSE-}${IUSE:+\ }$curruse
+			first=false
 			FILEINDEX["${currfile}"]="${#FILES[@]}"
 			FILES+=("${currfile}")
 		done
 	done
 }
 # Prepend # or / to mark only live/-nonlive categories or files
+# (though categories are automatically marked/removed if they contain no files)
 calculate_data \
 	'+Android /_adb _android _emulator' \
 	'+Google _google' \
-	'+Unix #_chattr #_cheat  _cmake _dzen2 _logger #_lsattr /_nl #_openssl #_pixz /_ps #_rebar #_setcap _shutdown /_watch _xinput /_zfs' \
-	'#+backup _tarsnap' \
+	'+Linux #_chattr #_lsattr #_lsblk #_setcap' \
+	'+Unix #_cheat _cmake /_dzen2 /_logger /_nl #_openssl #_pixz /_ps _shutdown /_watch /_zfs' \
+	'+X _xinput' \
 	'+database _redis-cli _pgsql_utils' \
-	'+dev _artisan _choc _console _geany /_gradle _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
+	'+dev _artisan _choc _console _geany /_gradle _phing /_manage.py _mvn /_pear _play /_symfony _thor _vagrant /_veewee' \
 	'+disk #_scrub _sdd _smartmontools _srm' \
-	'+distribute _celery /_envoy _fab #_fleetctl _glances _kitchen _knife _mina _mussh' \
+	'+distribute /_celery /_envoy _fab #_fleetctl _glances _kitchen _knife _mina _mussh' \
 	'+git _git-flow _git-pulls' \
-	'#+go _go' \
-	'#+gtk _gtk-launch' \
-	'+hardware _optirun _perf _primus' \
+	'+go #_go' \
+	'+gtk #_gtk-launch' \
+	'+hardware _optirun _perf /_primus' \
 	'+haskell /_cabal _ghc #_stack' \
-	'+managers #_ansible #_ansible-galaxy #_ansible-playbook #_ansible-vault _bower /_brew #_cask _debuild _lein #_multirust _pactree _pkcon _port #_rsvm #_supervisorctl _yaourt' \
-	'+multimedia _id3 _id3v2 _showoff' \
-	'+net _dget _dhcpcd _httpie _iw /_mosh _rfkill _socat _ssh-copy-id #_ufw _vpnc _vnstat' \
+	'+managers #_ansible #_ansible-galaxy #_ansible-playbook #_ansible-vault _bower /_brew #_cask _debuild /_lein #_multirust /_pactree _pkcon _port #_rsvm #_supervisorctl _yaourt' \
+	'+multimedia /_id3 /_id3v2 _showoff' \
+	'+net _dget _dhcpcd _httpie /_iw /_mosh _rfkill /_socat _ssh-copy-id #_ufw _vpnc _vnstat' \
 	'+nfs _exportfs' \
-	'+perl _cpanm' \
+	'+perl /_cpanm' \
 	'+python /_bpython _pygmentize _setup.py' \
-	'+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _jekyll _lunchy _rails _rspec _rubocop _rvm' \
+	'+ruby _bundle _cap /_ditz _gas /_gem _gist /_github _git-wtf /_jekyll _lunchy _rails _rspec _rubocop _rvm' \
 	'+search _ack _ag _jq #_jrnl' \
 	'+session _atach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
 	'+virtualization /_boot2docker #_rkt _virtualbox _virsh' \
-	'+web _coffee _composer #_dad #_diana _docpad _drush /_heroku #_hledger #_homestead _jonas _jmeter _jmeter-plugins _lunar _middleman #_mix _node _nvm _ralio /_salt _sbt _scala _svm'
+	'+web _coffee _composer #_dad #_diana _docpad _drush /_heroku #_homestead _jonas _jmeter _jmeter-plugins /_lunar _middleman #_mix _node _nvm _ralio /_salt _sbt _scala _svm'
 
 src_prepare() {
 	# Remove colliding completions