Bump zshrc-mv, zsh-completions, sundtek-tv, noscript

1 files changed, 44 insertions, 27 deletions

diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
index d1033fae..3c2fad76 100644
--- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -26,7 +26,10 @@ DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
 LICENSE="ZSH"
 SLOT="0"
-DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+if ${LIVE}
+then	DEPEND=""
+else	DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+fi
 
 IUSE=""
 declare -a FILES
@@ -34,51 +37,65 @@ FILES=()
 declare -A USEFILE FILEINDEX
 USEFILE=()
 FILEINDEX=()
-for completion in \
+used_value() {
+	case ${!1} in
+	'*'*)
+		eval ${1}=\${${1}#?}
+		${LIVE};;
+	'/'*)
+		eval ${1}=\${${1}#?}
+		! ${LIVE};;
+	esac
+}
+calculate_data() {
+	local comp curr currfile used
+	for comp
+	do	curr="${comp%% *}"
+		used_value curr || continue
+		case ${curr} in
+		'+'*)
+			curr="completion_${curr#?}"
+			IUSE="${IUSE}${IUSE:+ }+${curr}";;
+		*)
+			curr="completion_${curr}"
+			IUSE="${IUSE}${IUSE:+ }${curr}";;
+		esac
+		for currfile in ${comp#* }
+		do	used_value currfile
+			used=${?}
+			USEFILE["${currfile}"]="${curr}"
+			[[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
+			[ ${used} -ne 0 ] && continue
+			FILEINDEX["${currfile}"]="${#FILES[@]}"
+			FILES+=("${currfile}")
+		done
+	done
+}
+calculate_data \
 	'+Android _adb _android _emulator' \
 	'+Google _google' \
 	'+Unix _cmake _dzen2 _logger _nl _ps _shutdown _watch _xinput' \
 	'+database _redis-cli _pgsql_utils' \
 	'+dev _artisan _choc _console _gradle _geany _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
 	'+disk _sdd _smartmontools _srm' \
-	'+distribute _celery _envoy _fab _glances _kitchen _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 _ghc' \
-	'+managers _bower _brew _debuild _lein _pactree _pkcon _port _yaourt' \
+	'+managers _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \
 	'+multimedia _id3 _id3v2 _showoff' \
 	'+net _dget _dhcpcd _httpie _iw _mosh _rfkill _socat _ssh-copy-id _vpnc _vnstat' \
 	'+nfs _exportfs' \
 	'+perl _cpanm' \
-	'+pip _pip' \
+	'/+pip _pip' \
 	'+python _bpython _pygmentize _setup.py' \
 	'+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _jekyll _lunchy _rails _rspec _rubocop _rvm' \
 	'+search _ack _ag _jq' \
 	'+session _atach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
-	'+virtualization _boot2docker _docker _virtualbox _virsh' \
-	'+web _coffee _composer _docpad _drush _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}";;
-	esac
-	IUSE=${IUSE}${IUSE:+ }${curr}
-	for currfile in ${completion#* }
-	do	USEFILE["${currfile}"]="${curr#'+'}"
-		[[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
-		FILEINDEX["${currfile}"]="${#FILES[@]}"
-		FILES+=("${currfile}")
-	done
-done
+	'+virtualization _boot2docker *_docker-machine /_docker _virtualbox _virsh' \
+	'+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio _salt _sbt _scala _svm'
 
 src_prepare() {
 	epatch_user