Add new zsh-completions. Fix collisions

3 files changed, 26 insertions, 9 deletions

diff --git a/app-shells/zsh-completion/metadata.xml b/app-shells/zsh-completion/metadata.xml
index 49974de3..b1583996 100644
--- a/app-shells/zsh-completion/metadata.xml
+++ b/app-shells/zsh-completion/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="completion_dev">Install zsh completions for development (build systems, editors, web)</flag>
 		<flag name="completion_disk">Install zsh completions for disk tools</flag>
 		<flag name="completion_distribute">Install zsh completions for tools for distributing tasks to machines</flag>
+		<flag name="completion_filesystem">Install zsh completions for filesystem tools</flag>
 		<flag name="completion_git">Install zsh completions for special git tools</flag>
 		<flag name="completion_hardware">Install zsh completions for low-level hardware tools</flag>
 		<flag name="completion_haskell">Install zsh completions for Haskell tools</flag>
@@ -29,6 +30,8 @@
 		<flag name="completion_net">Install zsh completions for net-related tools</flag>
 		<flag name="completion_nfs">Install zsh completions for network filesystem tools</flag>
 		<flag name="completion_perl">Install zsh completion for perl-related tools</flag>
+		<flag name="completion_pass">Install zsh completion for app-admin/pass (instead of completion of app-admin/pass project)</flag>
+		<flag name="completion_pip">Install zsh completion for dev-python/pip (instead of completion of dev-python/pip project)</flag>
 		<flag name="completion_python">Install zsh completion for python development tools</flag>
 		<flag name="completion_ruby">Install zsh completion for ruby tools and tools in ruby</flag>
 		<flag name="completion_search">Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher</flag>
diff --git a/app-shells/zsh-completion/zsh-completion-99999999.ebuild b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
index 4f66684f..ca834628 100644
--- a/app-shells/zsh-completion/zsh-completion-99999999.ebuild
+++ b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
@@ -8,12 +8,14 @@ inherit eutils
 PNn="${PN}s"
 case ${PV} in
 99999999*)
+	LIVE=:
 	EGIT_REPO_URI="git://github.com/zsh-users/${PNn}.git"
 	inherit git-r3
 	PROPERTIES="live"
 	SRC_URI=""
 	KEYWORDS="";;
 *)
+	LIVE=false
 	RESTRICT="mirror"
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/zsh-users/${PNn}/archive/0.10.0.tar.gz -> ${PN}-${PV}.tar.gz"
@@ -24,7 +26,8 @@ DESCRIPTION="Programmable Completion for zsh (includes emerge and ebuild command
 HOMEPAGE="http://gentoo.org/zsh-users/zsh-completions/"
 LICENSE="ZSH"
 SLOT="0"
-DEPEND=""
+DEPEND="completion_pass? ( !!app-admin/pass[zsh-completion] )
+completion_pip? ( !!dev-python/pip[zsh-completion] )"
 
 IUSE=""
 declare -a COMPLETIONS FILES
@@ -34,30 +37,38 @@ for completion in \
 	'+Android _adb _android _emulator' \
 	'+Gentoo _baselayout _eselect _gcc-config _genlop _gentoo_packages _gentoolkit _layman _portage _portage_utils' \
 	'+Google _google' \
-	'+Unix _dzen2 _logger' \
+	'+Unix _dzen2 _logger _ps _shutdown _xinput' \
 	'+database _redis-cli _pgsql_utils' \
-	'+dev _choc _gradle _geany _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
+	'+dev _artisan _choc _console _gradle _geany _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
 	'+disk _sdd _smartmontools _srm' \
-	'+distribute _celery _fab _knife _mina _mussh' \
+	'+distribute _celery _envoy _fab _glances _kitchen _knife _mina _mussh' \
+	'*+filesystem _zfs' \
 	'+git _git-flow _git-pulls' \
 	'+hardware _optirun _perf _primus' \
 	'+haskell _cabal' \
 	'+managers _brew _debuild _lein _packagekit _pactree _pkcon _port _yaourt' \
 	'+multimedia _id3 _id3v2 _mpv _showoff' \
-	'+net _dget _dhcpcd _httpie _mosh _socat _ssh-copy-id _vpnc _vnstat' \
+	'+net _dget _dhcpcd _httpie _iw _mosh _socat _ssh-copy-id _vpnc _vnstat' \
 	'+nfs _exportfs' \
+	'*pass _pass' \
 	'+perl _cpanm' \
-	'+python _bpython _pip _pygmentize _setup.py' \
+	'pip _pip' \
+	'+python _bpython _pygmentize _setup.py' \
 	'+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _lunchy _rails _rvm _jekyll' \
 	'+search _ack _ag _jq' \
-	'+session _attach _teamocil _tmuxinator _wemux' \
+	'+session _atach _attach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
 	'+virtualbox _virtualbox' \
-	'+web _coffee _docpad _gradle _heroku _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio _salt _sbt _scala _svm'
+	'+web _coffee _composer _docpad _gradle _heroku _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio _salt _sbt _scala _svm'
 do	curr=${completion%% *}
 	case ${curr} in
+	'*'*)
+		curr=${curr#?}
+		${LIVE} || continue;;
+	esac
+	case ${curr} in
 	'+'*)
-		curr="+completion_${curr#'+'}";;
+		curr="+completion_${curr#?}";;
 	*)
 		curr="completion_${curr}";;
 	esac
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 37904197..3bd4feca 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -37,6 +37,7 @@ app-shells/zsh-completion:completion_database - Install zsh completions for data
 app-shells/zsh-completion:completion_dev - Install zsh completions for development (build systems, editors, web)
 app-shells/zsh-completion:completion_disk - Install zsh completions for disk tools
 app-shells/zsh-completion:completion_distribute - Install zsh completions for tools for distributing tasks to machines
+app-shells/zsh-completion:completion_filesystem - Install zsh completions for filesystem tools
 app-shells/zsh-completion:completion_git - Install zsh completions for special git tools
 app-shells/zsh-completion:completion_hardware - Install zsh completions for low-level hardware tools
 app-shells/zsh-completion:completion_haskell - Install zsh completions for Haskell tools
@@ -44,7 +45,9 @@ app-shells/zsh-completion:completion_managers - Install zsh completions for pack
 app-shells/zsh-completion:completion_multimedia - Install zsh completions for multimedia programs
 app-shells/zsh-completion:completion_net - Install zsh completions for net-related tools
 app-shells/zsh-completion:completion_nfs - Install zsh completions for network filesystem tools
+app-shells/zsh-completion:completion_pass - Install zsh completion for app-admin/pass (instead of completion of app-admin/pass project)
 app-shells/zsh-completion:completion_perl - Install zsh completion for perl-related tools
+app-shells/zsh-completion:completion_pip - Install zsh completion for dev-python/pip (instead of completion of dev-python/pip project)
 app-shells/zsh-completion:completion_python - Install zsh completion for python development tools
 app-shells/zsh-completion:completion_ruby - Install zsh completion for ruby tools and tools in ruby
 app-shells/zsh-completion:completion_search - Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher