Bump zsh-completion -> zsh-completions, zsh-syntax-highlighting

12 files changed, 147 insertions, 136 deletions

diff --git a/app-shells/zsh-completion/Manifest b/app-shells/zsh-completion/Manifest
deleted file mode 100644
index 44a2740d..00000000
--- a/app-shells/zsh-completion/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zsh-completion-20140716.tar.gz 212725 SHA256 1c1d86e1f39adf00a7bfb7e64e8188c461ece10789b428d43f710b1f9245d690 SHA512 42ada76f0856ec357b0ffb48744aa278833387164845918a9b3360398ca39a54996dfd8f035a87ec0066fff307ed3e54a412cb5d4c5b108258f8a6be9650c4d4 WHIRLPOOL 61830f52f720913a96878f307429611fd7dcc045e5e3dcca6330d8e99eb476a2a586d3c9ed58246bbbea391da85633b22bd80ecadf8d0bae656f1a41af012760
diff --git a/app-shells/zsh-completion/zsh-completion-20140716.ebuild b/app-shells/zsh-completion/zsh-completion-20140716.ebuild
deleted file mode 120000
index f0fc128f..00000000
--- a/app-shells/zsh-completion/zsh-completion-20140716.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-zsh-completion-99999999.ebuild
\ No newline at end of file
diff --git a/app-shells/zsh-completion/zsh-completion-99999999.ebuild b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
deleted file mode 100644
index 0a8fef33..00000000
--- a/app-shells/zsh-completion/zsh-completion-99999999.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-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"
-	KEYWORDS=""
-	SRC_URI="";;
-*)
-	LIVE=false
-	RESTRICT="mirror"
-	TARBALL_VERSION='0.11.0'
-	SRC_URI="https://github.com/zsh-users/${PNn}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PNn}-${TARBALL_VERSION}"
-esac
-
-DESCRIPTION="Programmable Completion for zsh (includes emerge and ebuild commands)"
-HOMEPAGE="http://gentoo.org/zsh-users/zsh-completions/"
-LICENSE="ZSH"
-SLOT="0"
-DEPEND="completion_pass? ( !app-admin/pass[zsh-completion] )
-completion_pip? ( !dev-python/pip[zsh-completion] )"
-
-IUSE="completion_pass completion_pip"
-declare -a COMPLETIONS FILES
-COMPLETIONS=()
-FILES=()
-for completion in \
-	'+Android _adb _android _emulator' \
-	'+Gentoo _baselayout _eselect _gcc-config _genlop _gentoo_packages _gentoolkit _layman _portage _portage_utils' \
-	'+Google _google' \
-	'+Unix _cmake _dzen2 _logger _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' \
-	'+filesystem _zfs' \
-	'+git _git-flow _git-pulls' \
-	'+hardware _optirun _perf _primus' \
-	'+haskell _cabal _ghc' \
-	'+managers _bower _brew _debuild _lein _packagekit _pactree _pkcon _port _yaourt' \
-	'+multimedia _id3 _id3v2 _mpv _showoff' \
-	'+net _dget _dhcpcd _httpie _iw _mosh _socat _ssh-copy-id _vpnc _vnstat' \
-	'+nfs _exportfs' \
-	'+pass _pass' \
-	'+perl _cpanm' \
-	'+pip _pip' \
-	'+python _bpython _pygmentize _setup.py' \
-	'+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _lunchy _rails _rubocop _rvm _jekyll' \
-	'+search _ack _ag _jq' \
-	'+session _atach _attach _teamocil _tmuxinator _wemux' \
-	'+subtitles _language_codes _periscope _subliminal' \
-	'+virtualization _virtualbox _virsh' \
-	'+web _coffee _composer _docpad _drupal _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}";;
-	esac
-	IUSE=${IUSE}${IUSE:+ }${curr}
-	COMPLETIONS+=("${curr#'+'}")
-	FILES+=("${completion#* }")
-done
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	local i j ok
-	for i in src/*
-	do	ok=false
-		for (( j=0; j<${#FILES[@]}; ++j ))
-		do	case " ${FILES[${j}]} " in
-			*" ${i#src/} "*)
-				ok=:
-				use "${COMPLETIONS[$j]}" && doins "${i}" && break;;
-			esac
-		done
-		${ok} || {
-			elog "installing unknown completion ${i#*/}"
-			doins "${i}"
-		}
-	done
-	dodoc README.md
-}
diff --git a/app-shells/zsh-completion/ChangeLog b/app-shells/zsh-completions/ChangeLog
index d92ce2a0..41756b15 100644
--- a/app-shells/zsh-completion/ChangeLog
+++ b/app-shells/zsh-completions/ChangeLog
@@ -1,7 +1,12 @@
-# ChangeLog for app-shells/zsh-completion
+# ChangeLog for app-shells/zsh-completions
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zsh-completions-0.12.0 (26 Sep 2014)
+
+  26 Sep 2014; Martin Väth <martin@mvath.de>:
+  Rename package. Update ebuild logic. Version bump, remove old ebuild
+
 *zsh-completion-20140716 (06 Aug 2014)
 
   06 Aug 2014; Martin Väth <martin@mvath.de>:
@@ -30,7 +35,7 @@
 *zsh-completion-0.8.0, zsh-completion-99999999 (28 Jan 2013)
 
   07 Jun 2013; Martin Väth <martin@mvath.de>:
-  Update live ebuild to new upstream completions.
+  Update live ebuild to new upstream completions
 
   28 Jan 2013; Martin Väth <martin@mvath.de>:
-  New ebuild from scratch.
+  New ebuild from scratch
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
new file mode 100644
index 00000000..eec029ad
--- /dev/null
+++ b/app-shells/zsh-completions/Manifest
@@ -0,0 +1 @@
+DIST zsh-completions-0.12.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5 SHA512 3c6b19f10d9598f40cf37ca5c5828e5652b0cad144d48ca681f5a16c1921c308f8cd3d9b8a2dd1c50ddbf167d4bb2e2e5299d1e30591971f4c7d9b28c2250feb WHIRLPOOL 7c5a1cb45d2e045fb0f8eb64deb8d87cab506f11b94996b9ff6cb169fd20672040bdc624de78a58ab5908d2222130de93a179a8e00d5aa75365af0ab0566852a
diff --git a/app-shells/zsh-completion/metadata.xml b/app-shells/zsh-completions/metadata.xml
index d32bce20..21db24fc 100644
--- a/app-shells/zsh-completion/metadata.xml
+++ b/app-shells/zsh-completions/metadata.xml
@@ -14,7 +14,6 @@
 	</upstream>
 	<use>
 		<flag name="completion_Android">Install zsh completions for Android-related programs</flag>
-		<flag name="completion_Gentoo">Install zsh completions for Gentoo and portage</flag>
 		<flag name="completion_Google">Install zsh completions for googlecl</flag>
 		<flag name="completion_Unix">Install zsh completion for unix system tools</flag>
 		<flag name="completion_database">Install zsh completions for database programs</flag>
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild
new file mode 120000
index 00000000..eb9dcfb0
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild
@@ -0,0 +1 @@
+zsh-completions-99999999.ebuild
\ No newline at end of file
diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
new file mode 100644
index 00000000..842b003b
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils
+
+case ${PV} in
+99999999*)
+	LIVE=:
+	EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+	inherit git-r3
+	PROPERTIES="live"
+	KEYWORDS=""
+	SRC_URI="";;
+*)
+	LIVE=false
+	RESTRICT="mirror"
+	TARBALL_VERSION='0.12.0'
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
+esac
+
+DESCRIPTION="Programmable Completion for zsh (includes emerge and ebuild commands)"
+HOMEPAGE="http://gentoo.org/zsh-users/zsh-completions/"
+LICENSE="ZSH"
+SLOT="0"
+DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+
+IUSE=""
+declare -a FILES
+FILES=()
+declare -A USEFILE FILEINDEX
+USEFILE=()
+FILEINDEX=()
+for completion in \
+	'+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' \
+	'+filesystem _zfs' \
+	'+git _git-flow _git-pulls' \
+	'+hardware _optirun _perf _primus' \
+	'+haskell _cabal _ghc' \
+	'+managers _bower _brew _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' \
+	'+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
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	local i j u
+	for i in src/*
+	do	j=${i#src/}
+		u=${USEFILE["${j}"]}
+		if [ -z "${u}" ]
+		then	elog "installing unknown completion ${i#*/}"
+				doins "${i}"
+				continue
+		fi
+		! use "${u}" || doins "${i}"
+		u=${FILEINDEX["${j}"]}
+		FILES[${u}]=
+	done
+	for i in ${FILES[*]}
+	do	elog "listed file ${i} not found"
+	done
+	dodoc README.md zsh-completions-howto.org
+}
diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog
index dcc1b693..de5d2454 100644
--- a/app-shells/zsh-syntax-highlighting/ChangeLog
+++ b/app-shells/zsh-syntax-highlighting/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zsh-syntax-highlighting-0.2.1 (25 Sep 2014)
+
+  25 Sep 2014; Martin Väth <martin@mvath.de>:
+  Version bump. Remove old ebuild
+
 *zsh-syntax-highlighting-0.2.0, -99999999 (14 Sep 2013)
 
   24 Jan 2014; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index e27b07d9..020adc4e 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1 +1 @@
-DIST zsh-syntax-highlighting-0.2.0.tar.gz 11911 SHA256 5b31d98248f61a55572ae9ddf95ca105109fcb922680bc05cd76e21151c113ce SHA512 8886af4474db025ad2343df7dcca0ff09b37a4115e2f4905947dd6652e3394ab40b9e2493bdc6f075ac0a9cc8ac0414d2d2be2295382034d6d79846675e8469b WHIRLPOOL fde8963943a2ebeec38cdfb4a51b18a15853618abe4d97a9efe42eff6016915c3862ee0b850c2a04122fc06f8e4c514b43911a040c507d978663f4763b2ec375
+DIST zsh-syntax-highlighting-0.2.1.tar.gz 12400 SHA256 3cdf47ee613ff748230e9666c0122eca22dc05352f266fe640019c982f3ef6db SHA512 40b04f45035081858d14d8044659db3e96e881e387c91564ff58314972207a47145f13ecdb604c0a7a5683c0a922811c4ee36e3d18558c6126db24b5da2d862c WHIRLPOOL 7707bd843d77bf53bd2aef4260a683fe8de6fb0529d9c58e7780b43131eda4541054165c3cd5e69f8d04721d2264a60233f4efda6958af819d1345e19dc715bb
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
index 54239a6c..54239a6c 120000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2e7e52a8..26d40cd8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -28,32 +28,31 @@ app-shells/zsh:completion_Solaris - Install zsh completions for Solaris
 app-shells/zsh:completion_Unix - Install zsh completions for Unix
 app-shells/zsh:completion_X - Install zsh completions for X
 app-shells/zsh:completion_openSUSE - Install zsh completions for openSUSE
-app-shells/zsh-completion:completion_Android - Install zsh completions for Android-related programs
-app-shells/zsh-completion:completion_Gentoo - Install zsh completions for Gentoo and portage
-app-shells/zsh-completion:completion_Google - Install zsh completions for googlecl
-app-shells/zsh-completion:completion_Unix - Install zsh completion for unix system tools
-app-shells/zsh-completion:completion_database - Install zsh completions for database programs
-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
-app-shells/zsh-completion:completion_managers - Install zsh completions for package managers (not portage)
-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
-app-shells/zsh-completion:completion_session - Install zsh completion for session-handling frontends
-app-shells/zsh-completion:completion_subtitles - Install zsh completion for subtitle tools
-app-shells/zsh-completion:completion_virtualization - Install zsh completion for virtualbox
-app-shells/zsh-completion:completion_web - Install zsh completion for web-related tools incl. java/javascript/scala
+app-shells/zsh-completions:completion_Android - Install zsh completions for Android-related programs
+app-shells/zsh-completions:completion_Google - Install zsh completions for googlecl
+app-shells/zsh-completions:completion_Unix - Install zsh completion for unix system tools
+app-shells/zsh-completions:completion_database - Install zsh completions for database programs
+app-shells/zsh-completions:completion_dev - Install zsh completions for development (build systems, editors, web)
+app-shells/zsh-completions:completion_disk - Install zsh completions for disk tools
+app-shells/zsh-completions:completion_distribute - Install zsh completions for tools for distributing tasks to machines
+app-shells/zsh-completions:completion_filesystem - Install zsh completions for filesystem tools
+app-shells/zsh-completions:completion_git - Install zsh completions for special git tools
+app-shells/zsh-completions:completion_hardware - Install zsh completions for low-level hardware tools
+app-shells/zsh-completions:completion_haskell - Install zsh completions for Haskell tools
+app-shells/zsh-completions:completion_managers - Install zsh completions for package managers (not portage)
+app-shells/zsh-completions:completion_multimedia - Install zsh completions for multimedia programs
+app-shells/zsh-completions:completion_net - Install zsh completions for net-related tools
+app-shells/zsh-completions:completion_nfs - Install zsh completions for network filesystem tools
+app-shells/zsh-completions:completion_pass - Install zsh completion for app-admin/pass (instead of completion of app-admin/pass project)
+app-shells/zsh-completions:completion_perl - Install zsh completion for perl-related tools
+app-shells/zsh-completions:completion_pip - Install zsh completion for dev-python/pip (instead of completion of dev-python/pip project)
+app-shells/zsh-completions:completion_python - Install zsh completion for python development tools
+app-shells/zsh-completions:completion_ruby - Install zsh completion for ruby tools and tools in ruby
+app-shells/zsh-completions:completion_search - Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher
+app-shells/zsh-completions:completion_session - Install zsh completion for session-handling frontends
+app-shells/zsh-completions:completion_subtitles - Install zsh completion for subtitle tools
+app-shells/zsh-completions:completion_virtualization - Install zsh completion for virtualization programs
+app-shells/zsh-completions:completion_web - Install zsh completion for web-related tools incl. java/javascript/scala
 app-text/stardict:espeak - Enable text to speech synthesizer using espeak engine
 app-text/stardict:gnome2 - Enable deprecated gnome2 support
 app-text/stardict:gucharmap - Enable gucharmap dictionary plugin