Clear history for egencache --repo=mv --update-changelogs

40 files changed, 1833 insertions, 0 deletions

diff --git a/app-shells/auto-fu-zsh/Manifest b/app-shells/auto-fu-zsh/Manifest
new file mode 100644
index 00000000..e0c1e71b
--- /dev/null
+++ b/app-shells/auto-fu-zsh/Manifest
@@ -0,0 +1 @@
+DIST auto-fu-zsh-0.0.1.12.tar.gz 9409 SHA256 cf692f8a81588289e44396f06e30e36fc6fa6bdcb2c87e4d462a15bad61db1c1 SHA512 7e5dbbb7329bfb220fe467de0eebc7d2aa2469ddea84d516deaa00d193729362f02355325765b29f16df66fbf458df69f984b70fad801b97af65a498080272ba WHIRLPOOL 10960ac344555312310170e6384e539767ce2c86a2948bf165b23b00bc282cea0f84d7a876e774df73e54a78bdc0606d4c9fc5b0cb9b41df99e2dc55f1a59bdd
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
new file mode 100644
index 00000000..feb8d9bb
--- /dev/null
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+pPN=${PN%-zsh}
+mPN="${pPN}.zsh"
+case ${PV} in
+99999999*)
+	LIVE=:
+	EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
+	EGIT_BRANCH="pu"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*)
+	LIVE=false
+	RESTRICT="mirror"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${PV}"
+	KEYWORDS="~amd64 ~x86";;
+esac
+
+DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
+HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE="+compile"
+
+DEPEND="compile? ( app-shells/zsh )"
+
+DESTPATH="/usr/share/zsh/site-contrib/${mPN}"
+
+generate_example() {
+	echo "# Put something like the following into your ~/.zshrc
+
+# First, we set sane options for the standard completion system:
+
+autoload -Uz compinit is-at-least
+compinit -D -u
+zstyle ':completion:*' completer _complete
+zstyle ':completion:*' list-colors \${(s.:.)LS_COLORS}
+zstyle ':completion:*' menu select=1 # interactive
+zstyle ':completion:*' accept-exact-dirs true
+zstyle ':completion:*' path-completion false
+if is-at-least 4.3.10
+then	zstyle ':completion:*' format \"%B%F{yellow}%K{blue}%d%k%f%b\"
+else	zstyle ':completion:*' format \"%B%d%b\"
+fi
+
+# Now we source ${PN}"
+	if use compile
+	then	echo ". ${DESTPATH}/${pPN}
+auto-fu-install"
+	else	echo ". ${DESTPATH}/${pPN}.zsh"
+	fi
+	echo "
+# Finally, we configure ${PN}
+
+zstyle ':auto-fu:highlight' input
+zstyle ':auto-fu:highlight' completion bold,fg=blue
+zstyle ':auto-fu:highlight' completion/one fg=blue
+zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-'
+#zstyle ':auto-fu:var' enable all
+#zstyle ':auto-fu:var' track-keymap-skip opp
+#zstyle ':auto-fu:var' disable magic-space
+zle-line-init() auto-fu-init
+zle -N zle-line-init
+zle -N zle-keymap-select auto-fu-zle-keymap-select
+
+# Starting a line with a space or tab or quoting the first word
+# or escaping a word should deactivate auto-fu for that line/word.
+# This is useful e.g. if auto-fu is too slow for you in some cases.
+zstyle ':auto-fu:var' autoable-function/skiplines '[[:blank:]\\\\\"'\'']*'
+zstyle ':auto-fu:var' autoable-function/skipwords '[\\\\]*'
+
+# Let Ctrl-d successively remove tail of line, whole line, and exit
+kill-line-maybe() {
+	if ((\$#BUFFER > CURSOR))
+	then	zle kill-line
+	else	zle kill-whole-line
+	fi
+}
+zle -N kill-line-maybe
+bindkey '\C-d' kill-line-maybe
+
+# Keep Ctrl-d behavior also when auto-fu is active
+afu+orf-ignoreeof-deletechar-list() {
+	afu-eof-maybe afu-ignore-eof zle kill-line-maybe
+}
+afu+orf-exit-deletechar-list() {
+	afu-eof-maybe exit zle kill-line-maybe
+}"
+}
+
+src_prepare() {
+	(
+		umask 022
+		generate_example >"${S}"/zshrc-example
+	)
+	if ! ${LIVE}
+	then
+		# Make Ctrl-D return correctly.
+		epatch "${FILESDIR}"/exit.patch
+		# Reset color with "return":
+		epatch "${FILESDIR}"/reset-color.patch
+		# Make it work with older zsh versions:
+		epatch "${FILESDIR}"/zsh-compatibility.patch
+	fi
+	epatch_user
+}
+
+src_compile() {
+	! use compile || mPN="${mPN}" \
+		zsh -c 'setopt extendedglob no_shwordsplit
+source ${mPN}
+auto-fu-zcompile ${PWD}/${mPN} ${PWD}' || die
+}
+
+src_install() {
+	insinto "${DESTPATH}"
+	doins "${mPN}"
+	! use compile || doins "${pPN}" "${pPN}.zwc"
+	dodoc zshrc-example README*
+}
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
new file mode 100644
index 00000000..feb8d9bb
--- /dev/null
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+pPN=${PN%-zsh}
+mPN="${pPN}.zsh"
+case ${PV} in
+99999999*)
+	LIVE=:
+	EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
+	EGIT_BRANCH="pu"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*)
+	LIVE=false
+	RESTRICT="mirror"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${PV}"
+	KEYWORDS="~amd64 ~x86";;
+esac
+
+DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
+HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE="+compile"
+
+DEPEND="compile? ( app-shells/zsh )"
+
+DESTPATH="/usr/share/zsh/site-contrib/${mPN}"
+
+generate_example() {
+	echo "# Put something like the following into your ~/.zshrc
+
+# First, we set sane options for the standard completion system:
+
+autoload -Uz compinit is-at-least
+compinit -D -u
+zstyle ':completion:*' completer _complete
+zstyle ':completion:*' list-colors \${(s.:.)LS_COLORS}
+zstyle ':completion:*' menu select=1 # interactive
+zstyle ':completion:*' accept-exact-dirs true
+zstyle ':completion:*' path-completion false
+if is-at-least 4.3.10
+then	zstyle ':completion:*' format \"%B%F{yellow}%K{blue}%d%k%f%b\"
+else	zstyle ':completion:*' format \"%B%d%b\"
+fi
+
+# Now we source ${PN}"
+	if use compile
+	then	echo ". ${DESTPATH}/${pPN}
+auto-fu-install"
+	else	echo ". ${DESTPATH}/${pPN}.zsh"
+	fi
+	echo "
+# Finally, we configure ${PN}
+
+zstyle ':auto-fu:highlight' input
+zstyle ':auto-fu:highlight' completion bold,fg=blue
+zstyle ':auto-fu:highlight' completion/one fg=blue
+zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-'
+#zstyle ':auto-fu:var' enable all
+#zstyle ':auto-fu:var' track-keymap-skip opp
+#zstyle ':auto-fu:var' disable magic-space
+zle-line-init() auto-fu-init
+zle -N zle-line-init
+zle -N zle-keymap-select auto-fu-zle-keymap-select
+
+# Starting a line with a space or tab or quoting the first word
+# or escaping a word should deactivate auto-fu for that line/word.
+# This is useful e.g. if auto-fu is too slow for you in some cases.
+zstyle ':auto-fu:var' autoable-function/skiplines '[[:blank:]\\\\\"'\'']*'
+zstyle ':auto-fu:var' autoable-function/skipwords '[\\\\]*'
+
+# Let Ctrl-d successively remove tail of line, whole line, and exit
+kill-line-maybe() {
+	if ((\$#BUFFER > CURSOR))
+	then	zle kill-line
+	else	zle kill-whole-line
+	fi
+}
+zle -N kill-line-maybe
+bindkey '\C-d' kill-line-maybe
+
+# Keep Ctrl-d behavior also when auto-fu is active
+afu+orf-ignoreeof-deletechar-list() {
+	afu-eof-maybe afu-ignore-eof zle kill-line-maybe
+}
+afu+orf-exit-deletechar-list() {
+	afu-eof-maybe exit zle kill-line-maybe
+}"
+}
+
+src_prepare() {
+	(
+		umask 022
+		generate_example >"${S}"/zshrc-example
+	)
+	if ! ${LIVE}
+	then
+		# Make Ctrl-D return correctly.
+		epatch "${FILESDIR}"/exit.patch
+		# Reset color with "return":
+		epatch "${FILESDIR}"/reset-color.patch
+		# Make it work with older zsh versions:
+		epatch "${FILESDIR}"/zsh-compatibility.patch
+	fi
+	epatch_user
+}
+
+src_compile() {
+	! use compile || mPN="${mPN}" \
+		zsh -c 'setopt extendedglob no_shwordsplit
+source ${mPN}
+auto-fu-zcompile ${PWD}/${mPN} ${PWD}' || die
+}
+
+src_install() {
+	insinto "${DESTPATH}"
+	doins "${mPN}"
+	! use compile || doins "${pPN}" "${pPN}.zwc"
+	dodoc zshrc-example README*
+}
diff --git a/app-shells/auto-fu-zsh/files/exit.patch b/app-shells/auto-fu-zsh/files/exit.patch
new file mode 100644
index 00000000..a916f37f
--- /dev/null
+++ b/app-shells/auto-fu-zsh/files/exit.patch
@@ -0,0 +1,11 @@
+--- 1/auto-fu.zsh
++++ 1/auto-fu.zsh
+@@ -287,7 +287,7 @@
+ 
+ afu-eof-maybe () {
+   local eof="$1"; shift
+-  [[ "$BUFFER" != '' ]] || { $eof; return }
++  [[ -z $BUFFER ]] && { $eof; return }
+   "$@"
+ }
+ 
diff --git a/app-shells/auto-fu-zsh/files/reset-color.patch b/app-shells/auto-fu-zsh/files/reset-color.patch
new file mode 100644
index 00000000..12b5265b
--- /dev/null
+++ b/app-shells/auto-fu-zsh/files/reset-color.patch
@@ -0,0 +1,11 @@
+--- 1/auto-fu.zsh
++++ 1/auto-fu.zsh
+@@ -370,7 +370,7 @@
+       [[ -z ${hi} ]] || region_highlight=("0 ${#BUFFER} ${hi}")
+     }
+     zstyle -T ':auto-fu:var' postdisplay/clearp && POSTDISPLAY=''
+-    return 0
++    echo -en '\e[0m'
+   }
+   zle -N $afufun
+ EOT
diff --git a/app-shells/auto-fu-zsh/files/zsh-compatibility.patch b/app-shells/auto-fu-zsh/files/zsh-compatibility.patch
new file mode 100644
index 00000000..1c2d546c
--- /dev/null
+++ b/app-shells/auto-fu-zsh/files/zsh-compatibility.patch
@@ -0,0 +1,15 @@
+--- 1/auto-fu.zsh
++++ 1/auto-fu.zsh
+@@ -305,7 +305,11 @@
+ afu+vi-ins-mode () { zle -K afu      ; }; zle -N afu+vi-ins-mode
+ afu+vi-cmd-mode () { zle -K afu-vicmd; }; zle -N afu+vi-cmd-mode
+ 
+-auto-fu-zle-keymap-select () { afu-track-keymap "$@" afu-adjust-main-keymap }
++# Some zsh versions omit the first argument:
++auto-fu-zle-keymap-select() {
++[[ $# -ge 2 ]] || set -- zle-keymap-select "${@}"
++afu-track-keymap "${@}" afu-adjust-main-keymap
++}
+ 
+ afu-adjust-main-keymap () { [[ "$KEYMAP" == 'main' ]] && { zle -K "$1" } }
+ 
diff --git a/app-shells/auto-fu-zsh/metadata.xml b/app-shells/auto-fu-zsh/metadata.xml
new file mode 100644
index 00000000..1576938b
--- /dev/null
+++ b/app-shells/auto-fu-zsh/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>takebi@laafc.net</email>
+			<name>Takeshi Banse</name>
+		</maintainer>
+		<remote-id type="github">hchbaw/auto-fu.zsh</remote-id>
+	</upstream>
+	<use>
+		<flag name="compile">Byte-compile to speed up. Do not use this if you are cross-compiling</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-shells/command-not-found/Manifest b/app-shells/command-not-found/Manifest
new file mode 100644
index 00000000..73ec8857
--- /dev/null
+++ b/app-shells/command-not-found/Manifest
@@ -0,0 +1 @@
+DIST command-not-found-0.4.5.tar.gz 28761 SHA256 891c5a7f2e55e420dd92ce4358d7c2f6028144c92bd522163848345c4c32b914 SHA512 3512ef8618a23416dd0da37ea2ccd40b78e44751b16703b745360345430ce697713a7b781c065536d7fd8b54ca0f4713ce153b2f32f5266b6db222ac2aa23c0b WHIRLPOOL 95e730db83571e6cab799a8c8865117cae74573cb1f2b769fb72e329793643058f6e49c406dd26adc18f63d38b66151a48c06e565382d2c78f864bdb22268fbc
diff --git a/app-shells/command-not-found/command-not-found-0.4.5.ebuild b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
new file mode 100644
index 00000000..77f3273f
--- /dev/null
+++ b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit cmake-utils eutils flag-o-matic multilib
+
+DESCRIPTION="If a command is not found (bash/zsh), search ARCH database for packages with similar commands"
+HOMEPAGE="https://github.com/metti/command-not-found/"
+SRC_URI="https://github.com/metti/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON="sys-libs/tdb"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	PREFIX=${EPREFIX}
+	filter-flags -fwhole-program
+	sed -i -e 1d -e '2i#! /bin/sh' cnf-cron.in || die
+	sed -i \
+		-e "s!usr/lib!usr/$(get_libdir)!g" \
+		-e "/^INSTALL.*cnf\.sh/,/^INSTALL/{/EXECUTE/d}" \
+		CMakeLists.txt || die
+	sed -i -e "s/function[[:space:]]*\([^[:space:](]*\)[[:space:]]*(/\1(/" \
+		cnf.sh || die
+	epatch_user
+}
+
+src_install() {
+	dodir /var/lib/cnf
+	cmake-utils_src_install
+}
+
+pkg_postrm() {
+	local a
+	if [ -z "${REPLACED_BY_VERSION}" ] && a="${EPREFIX}/var/lib/cnf" && \
+		test -d "${a}"
+	then	ewarn "removing now unneeded ${a}"
+		rm -rf -- "${a}"
+	fi
+}
diff --git a/app-shells/command-not-found/metadata.xml b/app-shells/command-not-found/metadata.xml
new file mode 100644
index 00000000..cc0f89f0
--- /dev/null
+++ b/app-shells/command-not-found/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>matthias@maennich.net</email>
+			<name>Matthias Maennich</name>
+		</maintainer>
+		<bugs-to>mailto:matthias@maennich.net</bugs-to>
+		<remote-id type="github">metti/command-not-found</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/oh-my-zsh/metadata.xml b/app-shells/oh-my-zsh/metadata.xml
new file mode 100644
index 00000000..ef32a6e3
--- /dev/null
+++ b/app-shells/oh-my-zsh/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email></email>
+			<name>Robby Russell</name>
+		</maintainer>
+		<bugs-to>https://github.com/robbyrussell/oh-my-zsh/issues</bugs-to>
+		<remote-id type="github">robbyrussell/oh-my-zsh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
new file mode 100644
index 00000000..16b8d791
--- /dev/null
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/robbyrussell/${PN}.git"
+inherit eutils git-r3 readme.gentoo
+
+DESCRIPTION="A ready-to-use zsh configuration with plugins"
+HOMEPAGE="https://github.com/robbyrussell/oh-my-zsh"
+SRC_URI=""
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+PROPERTIES="live"
+
+RDEPEND="app-shells/zsh"
+
+ZSH_DEST="/usr/share/zsh/site-contrib/${PN}"
+ZSH_EDEST="${EPREFIX}${ZSH_DEST}"
+ZSH_TEMPLATE="templates/zshrc.zsh-template"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add to your ~/.zshrc
+source '${ZSH_DEST}/${ZSH_TEMPLATE}'
+or copy a modification of that file to your ~/.zshrc
+If you just want to try, enter the above command in your zsh."
+
+src_prepare() {
+	local i
+	for i in "${S}"/tools/*install* "${S}"/tools/*upgrade*
+	do	test -f "${i}" && : >"${i}"
+	done
+	sed -i -e 's!^ZSH=.*$!ZSH='"${ZSH_EDEST}"'!' \
+		   -e 's!~/.oh-my-zsh!'"${ZSH_EDEST}"'!' "${S}/${ZSH_TEMPLATE}"
+	sed -i -e 's!~/.oh-my-zsh!'"${ZSH_EDEST}"'!' \
+		"${S}/plugins/dirpersist/dirpersist.plugin.zsh"
+	sed -i -e '/zstyle.*cache/d' "${S}/lib/completion.zsh"
+	epatch_user
+}
+
+src_install() {
+	insinto "${ZSH_DEST}"
+	doins -r *
+	readme.gentoo_create_doc
+}
diff --git a/app-shells/runtitle/Manifest b/app-shells/runtitle/Manifest
new file mode 100644
index 00000000..67133def
--- /dev/null
+++ b/app-shells/runtitle/Manifest
@@ -0,0 +1 @@
+DIST runtitle-2.7.tar.gz 3372 SHA256 6ea63935ad18ad3544e42db4ca93a218e1c9b7e3b70033af07cdc3c74e278022 SHA512 c31910a1af307fd0dcb12a4faf19de6613b70b13ed118e0e97f947540ee6128955de9c245de29b87ce75b611f08800df9bfafd70f53ae4b54772485607b87e46 WHIRLPOOL 75859849587241b34b4a8e1dc3cbbf8ce2fe54a37cb2473299d4b24a8e616ea8ccc71c1656e1b37a171582bdb4a76d8d53d858d950cfe24170d2af2c9d7a1b4a
diff --git a/app-shells/runtitle/metadata.xml b/app-shells/runtitle/metadata.xml
new file mode 100644
index 00000000..3b185b53
--- /dev/null
+++ b/app-shells/runtitle/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>martin@mvath.de</email>
+			<name>Martin Väth</name>
+		</maintainer>
+		<bugs-to>mailto:martin@mvath.de</bugs-to>
+		<remote-id type="github">vaeth/runtitle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/runtitle/runtitle-2.7.ebuild b/app-shells/runtitle/runtitle-2.7.ebuild
new file mode 100644
index 00000000..71ebe8a4
--- /dev/null
+++ b/app-shells/runtitle/runtitle-2.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Scripts to run commands and set the hard status line (windows title)"
+HOMEPAGE="https://github.com/vaeth/runtitle/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-- bin/* || die
+	epatch_user
+}
+
+src_install() {
+	dobin bin/*
+	insinto /usr/share/zsh/site-functions
+	doins zsh/*
+	dodoc README
+}
diff --git a/app-shells/set_prompt/Manifest b/app-shells/set_prompt/Manifest
new file mode 100644
index 00000000..12db831c
--- /dev/null
+++ b/app-shells/set_prompt/Manifest
@@ -0,0 +1 @@
+DIST set_prompt-1.22.tar.gz 7981 SHA256 7dd9023da52099d60da7c4e0faca99aa421355c605c713371f2de9fad1d54596 SHA512 48b99c3e611297127059effdc1dadd9b1c50f8d7047922a75368780ea632c4e884cf537c5fa97f668cb7151764b9d42365bbf16c5c87ce612ebcc3881d7ccbb7 WHIRLPOOL 3cbe1b2f9dd0c277c0351165aa1a2d464337f31483dbd0d0629af4fc25490389bb7b1da111779d3bd35ae9de408ab5168a33e345c2e42bec4a8326253c2cb17f
diff --git a/app-shells/set_prompt/metadata.xml b/app-shells/set_prompt/metadata.xml
new file mode 100644
index 00000000..a7fc3713
--- /dev/null
+++ b/app-shells/set_prompt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>martin@mvath.de</email>
+			<name>Martin Väth</name>
+		</maintainer>
+		<bugs-to>mailto:martin@mvath.de</bugs-to>
+		<remote-id type="github">vaeth/set_prompt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/set_prompt/set_prompt-1.22.ebuild b/app-shells/set_prompt/set_prompt-1.22.ebuild
new file mode 100644
index 00000000..94a9288d
--- /dev/null
+++ b/app-shells/set_prompt/set_prompt-1.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="An intelligent prompt for zsh or bash with status line (window title) support"
+HOMEPAGE="https://github.com/vaeth/set_prompt/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
+		-e '1s"^#!/usr/bin/env zsh$"#!'"${EPREFIX}"'/bin/zsh"' \
+		-- * || die
+	epatch_user
+}
+
+src_install() {
+	insinto /etc
+	doins set_prompt.config
+	insinto /usr/bin
+	doins set_prompt.sh git_prompt.zsh
+	dobin set_prompt git_update
+	dodoc README
+}
diff --git a/app-shells/termcolors-mv/Manifest b/app-shells/termcolors-mv/Manifest
new file mode 100644
index 00000000..85b3f608
--- /dev/null
+++ b/app-shells/termcolors-mv/Manifest
@@ -0,0 +1 @@
+DIST termcolors-mv-3.11.tar.gz 7821 SHA256 d2938b2e6e9080782c71e355090cc1f14ada6fa43b8c5dd866422545603f4489 SHA512 c8784352f5d6652fe358ee65d5481cc146b8ee57a83b20f7af5a1a3864b17230244e03e8e6a60e9e65ac3323db3ad2a82b3621416dddf342399a73b848965fbe WHIRLPOOL a646b0b0c8961f826d3c578c24fc4528186da2240d112753906584aace574c5e682ed3520ce5c6c84014f9a0c6b4323ef0dcd9eca7998f6369c477b8e2c62d01
diff --git a/app-shells/termcolors-mv/metadata.xml b/app-shells/termcolors-mv/metadata.xml
new file mode 100644
index 00000000..afa70177
--- /dev/null
+++ b/app-shells/termcolors-mv/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>martin@mvath.de</email>
+			<name>Martin Väth</name>
+		</maintainer>
+		<bugs-to>mailto:martin@mvath.de</bugs-to>
+		<remote-id type="github">vaeth/termcolors-mv</remote-id>
+	</upstream>
+	<use>
+		<flag name="create">Install DIR_COLORS-create perl script</flag>
+		<flag name="perl">Install 256colors perl script</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
new file mode 100644
index 00000000..dddc447e
--- /dev/null
+++ b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils readme.gentoo
+
+DESCRIPTION="256colors sample script and dircolors configuration for standard or 256 colors"
+HOMEPAGE="https://github.com/vaeth/termcolors-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="create +perl"
+DEPEND="dev-lang/perl"
+RDEPEND="create? ( dev-lang/perl )
+perl? ( dev-lang/perl )"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="To use the colorschemes of ${PN} call
+	eval \"\`dircolors-mv\`\"
+e.g. in your bashrc; make sure that SOLARIZED (if desired)
+and DEFAULTS is set appropriately, see the documentation.
+For zsh, this happens if you use zshrc-mv"
+
+src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
+		-- bin/* || die
+	epatch_user
+}
+
+src_compile() {
+	perl bin/DIR_COLORS-create
+}
+
+src_install() {
+	dodoc README
+	dobin bin/dircolors-mv
+	use create && dobin bin/DIR_COLORS-create
+	use perl && dobin bin/256colors
+	insinto /etc/dir_colors
+	doins DIR_COLORS*
+	readme.gentoo_create_doc
+}
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-completions/metadata.xml b/app-shells/zsh-completions/metadata.xml
new file mode 100644
index 00000000..cb5fb51b
--- /dev/null
+++ b/app-shells/zsh-completions/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email></email>
+			<name>zsh-users</name>
+		</maintainer>
+		<remote-id type="github">zsh-users/zsh-completions</remote-id>
+	</upstream>
+	<use>
+		<flag name="completion_Android">Install zsh completions for Android-related programs</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>
+		<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>
+		<flag name="completion_managers">Install zsh completions for package managers (not portage)</flag>
+		<flag name="completion_multimedia">Install zsh completions for multimedia programs</flag>
+		<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_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>
+		<flag name="completion_session">Install zsh completion for session-handling frontends</flag>
+		<flag name="completion_subtitles">Install zsh completion for subtitle tools</flag>
+		<flag name="completion_virtualization">Install zsh completion for virtualization programs</flag>
+		<flag name="completion_web">Install zsh completion for web-related tools incl. java/javascript/scala</flag>
+	</use>
+</pkgmetadata>
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 100644
index 00000000..51991693
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Additional completion definitions for Zsh"
+HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
+LICENSE="ZSH"
+SLOT="0"
+if ${LIVE}
+then	DEPEND=""
+else	DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+fi
+
+IUSE=""
+declare -a FILES
+FILES=()
+declare -A USEFILE FILEINDEX
+USEFILE=()
+FILEINDEX=()
+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' \
+	'+filesystem _zfs' \
+	'+git _git-flow _git-pulls' \
+	'+hardware _optirun _perf _primus' \
+	'+haskell _cabal _ghc' \
+	'+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' \
+	'+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-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
+}
+
+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-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
new file mode 100644
index 00000000..51991693
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Additional completion definitions for Zsh"
+HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
+LICENSE="ZSH"
+SLOT="0"
+if ${LIVE}
+then	DEPEND=""
+else	DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+fi
+
+IUSE=""
+declare -a FILES
+FILES=()
+declare -A USEFILE FILEINDEX
+USEFILE=()
+FILEINDEX=()
+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' \
+	'+filesystem _zfs' \
+	'+git _git-flow _git-pulls' \
+	'+hardware _optirun _perf _primus' \
+	'+haskell _cabal _ghc' \
+	'+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' \
+	'+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-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
+}
+
+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/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
new file mode 100644
index 00000000..020adc4e
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -0,0 +1 @@
+DIST zsh-syntax-highlighting-0.2.1.tar.gz 12400 SHA256 3cdf47ee613ff748230e9666c0122eca22dc05352f266fe640019c982f3ef6db SHA512 40b04f45035081858d14d8044659db3e96e881e387c91564ff58314972207a47145f13ecdb604c0a7a5683c0a922811c4ee36e3d18558c6126db24b5da2d862c WHIRLPOOL 7707bd843d77bf53bd2aef4260a683fe8de6fb0529d9c58e7780b43131eda4541054165c3cd5e69f8d04721d2264a60233f4efda6958af819d1345e19dc715bb
diff --git a/app-shells/zsh-syntax-highlighting/metadata.xml b/app-shells/zsh-syntax-highlighting/metadata.xml
new file mode 100644
index 00000000..a1caaddd
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/zsh-users/zsh-syntax-highlighting/issues</bugs-to>
+		<remote-id type="github">zsh-users/zsh-syntax-highlighting</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
new file mode 100644
index 00000000..be2a231c
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+case ${PV} in
+99999999*)
+	EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*)
+	RESTRICT="mirror"
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86";;
+esac
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-shells/zsh"
+DEPEND=""
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh."
+
+src_prepare() {
+	grep -q 'local .*cdpath_dir' \
+		"${S}/highlighters/main/main-highlighter.zsh" >/dev/null 2>&1 || \
+		sed -i -e '/for cdpath_dir/ilocal cdpath_dir' \
+			-- "${S}/highlighters/main/main-highlighter.zsh" || die
+	epatch_user
+}
+
+src_install() {
+	dodoc *.md
+	insinto /usr/share/zsh/site-contrib/${PN}
+	doins *.zsh
+	doins -r highlighters
+	readme.gentoo_create_doc
+}
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
new file mode 100644
index 00000000..be2a231c
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+case ${PV} in
+99999999*)
+	EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*)
+	RESTRICT="mirror"
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86";;
+esac
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-shells/zsh"
+DEPEND=""
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh."
+
+src_prepare() {
+	grep -q 'local .*cdpath_dir' \
+		"${S}/highlighters/main/main-highlighter.zsh" >/dev/null 2>&1 || \
+		sed -i -e '/for cdpath_dir/ilocal cdpath_dir' \
+			-- "${S}/highlighters/main/main-highlighter.zsh" || die
+	epatch_user
+}
+
+src_install() {
+	dodoc *.md
+	insinto /usr/share/zsh/site-contrib/${PN}
+	doins *.zsh
+	doins -r highlighters
+	readme.gentoo_create_doc
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
new file mode 100644
index 00000000..74a49796
--- /dev/null
+++ b/app-shells/zsh/Manifest
@@ -0,0 +1,2 @@
+DIST zsh-5.1.1-doc.tar.xz 3061616 SHA256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f SHA512 868444662ca9b1cc91f2ecff56ce0944e5e75fc5f5a349eb538ca23a8eb8fb4ebaa8efc2ba1d8581424f25b0009305ed7a6f08ca06db1ecde467eeb5d6b71621 WHIRLPOOL c72760d754e19e7fe1f501bd395becc13877d4b0ba20fbf1f08855be5affb78aac07e2c14e779c1b554e21e29d8bfd5203dd41da5d3f21020dac7033510a4662
+DIST zsh-5.1.1.tar.xz 2788676 SHA256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec SHA512 732f183a03125e83da11a38c638ca54a667326a23ca19418b0df27b1d5b3b1f360383d84f66bde064911effaa2ce9cbb9b6ab86deddb92f80e8f601af8a82b3e WHIRLPOOL 55199e45557c2667e8f9b7564af44b32b610fe09db451493bd64642c2987e12a638b2b96d6530a16427ba17a6ca8c20e73f88013cf47996eea24e5e1595691e7
diff --git a/app-shells/zsh/files/prompt_gentoo_setup-1 b/app-shells/zsh/files/prompt_gentoo_setup-1
new file mode 100644
index 00000000..046e2d87
--- /dev/null
+++ b/app-shells/zsh/files/prompt_gentoo_setup-1
@@ -0,0 +1,33 @@
+# gentoo prompt theme
+
+prompt_gentoo_help () {
+  cat <<'EOF'
+This prompt is color-scheme-able.  You can invoke it thus:
+
+  prompt gentoo [<promptcolor> [<usercolor> [<rootcolor>]]]
+
+EOF
+}
+
+prompt_gentoo_setup () {
+  local prompt_gentoo_prompt=${1:-'blue'}
+  local prompt_gentoo_user=${2:-'green'}
+  local prompt_gentoo_root=${3:-'red'}
+
+  if [ "$USER" = 'root' ]
+  then
+    local base_prompt="%B%F{$prompt_gentoo_root}%m%k "
+  else
+    local base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k "
+  fi
+  local post_prompt="%b%f%k"
+
+  #setopt noxtrace localoptions
+
+  local path_prompt="%B%F{$prompt_gentoo_prompt}%1~"
+  typeset -g PS1="$base_prompt$path_prompt %# $post_prompt"
+  typeset -g PS2="$base_prompt$path_prompt %_> $post_prompt"
+  typeset -g PS3="$base_prompt$path_prompt ?# $post_prompt"
+}
+
+prompt_gentoo_setup "$@"
diff --git a/app-shells/zsh/files/zprofile-1 b/app-shells/zsh/files/zprofile-1
new file mode 100644
index 00000000..0602c9c5
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-1
@@ -0,0 +1,43 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile-1,v 1.1 2010/08/15 12:21:56 tove Exp $
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings.  For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+	@ZSH_NOPREFIX@PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+	@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
+else
+	@ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+	@ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
+	[ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
new file mode 100644
index 00000000..74756d29
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/547950
+http://www.zsh.org/mla/workers/2015/msg02660.html
+
+fix building w/gcc-5
+
+--- a/Src/Modules/system.mdd
++++ b/Src/Modules/system.mdd
+@@ -15,7 +15,7 @@
+ 		touch errtmp.out; \
+ 	   else \
+ 		$(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \
+-		$(CPP) errtmp.c >errtmp.out; \
++		$(CPP) -P errtmp.c >errtmp.out; \
+ 	   fi
+ 	   $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@
+ 	   rm -f errtmp.c errtmp.out
diff --git a/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
new file mode 100644
index 00000000..9597a733
--- /dev/null
+++ b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
@@ -0,0 +1,30 @@
+--- zsh-4.3.11/Completion/Unix/Command/_init_d
++++ zsh-4.3.11/Completion/Unix/Command/_init_d
+@@ -1,6 +1,6 @@
+ #compdef -p */(init|rc[0-9S]#).d/*
+ 
+-local cmds script
++local cmds script opts
+ 
+ _compskip=all
+ 
+@@ -83,10 +83,17 @@
+ 
+ script=$words[1]
+ [[ $script = */* ]] || script="$(_init_d_fullpath "$script")"
++[[ ! -f $script ]] &&
++    { _message "${words[1]:t} is not an init script" && return }
+ 
+ cmds=( $(_init_d_get_cmds) ) || return
+ 
+-(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
+-    cmds=(start stop)
++(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds
++opts=(start stop restart pause zap status ineed iuse needsme usesme broken)
++
++# If we didn't get $cmds from a zstyle, then read init script for opts.
++# If script doesn't specify opts, then default to the standard opts.
++(( $#cmds )) || cmds=( ${(eQz)${(M)${(f)"$( <$script)"}:#[[:blank:]]#opts=*}#*=} )
++(( $#cmds )) || cmds=($opts)
+ 
+ _sub_commands $cmds
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
new file mode 100644
index 00000000..14b074fe
--- /dev/null
+++ b/app-shells/zsh/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>tove@gentoo.org</email>
+  <name>Torsten Veller</name>
+  <description>Interim maintainer</description>
+</maintainer>
+<maintainer>
+  <email>radhermit@gentoo.org</email>
+  <name>Tim Harder</name>
+  <description>Co-maintainer</description>
+</maintainer>
+<maintainer>
+  <email>martin@mvath.de</email>
+  <name>Martin Väth</name>
+  <description>Maintainer of run-help, compile, and completion_* USE-flags</description>
+</maintainer>
+<longdescription>
+  Zsh is a shell designed for interactive use, although it is also a
+  powerful scripting language. Many of the useful features of bash, ksh,
+  and tcsh were incorporated into zsh; many original features were
+  added.
+</longdescription>
+<use>
+  <flag name="compile">Byte-compile. This costs disk space and may make things faster or slower. Do not use this if you are cross-compiling</flag>
+  <flag name='completion_AIX'>Install zsh completions for AIX</flag>
+  <flag name='completion_BSD'>Install zsh completions for BSD</flag>
+  <flag name='completion_Cygwin'>Install zsh completions for Cygwin</flag>
+  <flag name='completion_Darwin'>Install zsh completions for Darwin</flag>
+  <flag name='completion_Debian'>Install zsh completions for Debian</flag>
+  <flag name='completion_Linux'>Install zsh completions for Linux</flag>
+  <flag name='completion_Mandriva'>Install zsh completions for Mandriva</flag>
+  <flag name='completion_openSUSE'>Install zsh completions for openSUSE</flag>
+  <flag name='completion_Redhat'>Install zsh completions for Redhat</flag>
+  <flag name='completion_Solaris'>Install zsh completions for Solaris</flag>
+  <flag name='completion_Unix'>Install zsh completions for Unix</flag>
+  <flag name='completion_X'>Install zsh completions for X</flag>
+</use>
+</pkgmetadata>
diff --git a/app-shells/zsh/zsh-5.1.1-r1.ebuild b/app-shells/zsh/zsh-5.1.1-r1.ebuild
new file mode 100644
index 00000000..d5a8bc8e
--- /dev/null
+++ b/app-shells/zsh/zsh-5.1.1-r1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix readme.gentoo
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="http://www.zsh.org/pub"
+
+ZSH_URI="${zsh_ftp}/${PN}-${MY_PV}.tar.xz"
+ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.xz"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+case ${PV} in
+9999*)
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+	inherit git-r3
+	WANT_LIBTOOL="none"
+	inherit autotools
+	KEYWORDS=""
+# Creating help files needs util-linux for colcrt.
+# Please let me know if you have an arch where "colcrt" (or at least "col")
+# is provided by a different package.
+	DEPEND="app-text/yodl
+		dev-lang/perl
+		sys-apps/man
+		sys-apps/util-linux
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+	PROPERTIES="live"
+	LIVE=:;;
+*)
+	SRC_URI="${ZSH_URI}
+		doc? ( ${ZSH_DOC_URI} )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	DEPEND=""
+	LIVE=false;;
+esac
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps compile"
+COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X"
+for curr in ${COMPLETIONS}
+do	case ${curr} in
+	[+-]*)
+		IUSE+=" ${curr%%[!+-]*}completion_${curr#?}"
+		continue;;
+	esac
+	IUSE+=" completion_${curr}"
+done
+IUSE+=" debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm )
+"
+DEPEND+="
+	sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="
+If you want to enable Portage completions and Gentoo prompt,
+emerge app-shells/zsh-completion and add
+	autoload -U compinit promptinit
+	compinit
+	promptinit; prompt gentoo
+to your ~/.zshrc
+
+Also, if you want to enable cache for the completions, add
+	zstyle ':completion::complete:*' use-cache 1
+to your ~/.zshrc
+
+If you want to use run-help add to your ~/.zshrc
+	unalias run-help
+	autoload -Uz run-help
+
+Note that a system zprofile startup file is installed. This will override
+PATH and possibly other variables that a user may set in ~/.zshenv.
+Custom PATH settings and similar overridden variables can be moved
+to ~/.zprofile or other user startup files that are sourced after the
+system zprofile.
+
+If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,
+one method is to use a separate path-setting file that is conditionally sourced
+in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the
+zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/.
+
+See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation.
+"
+
+src_prepare() {
+	# fix zshall problem with soelim
+	ln -s Doc man1 || die
+	mv Doc/zshall.1 Doc/zshall.1.soelim || die
+	soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+	epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+	set --
+	file='Src/Zle/complete.mdd'
+	for i in ${COMPLETIONS}
+	do	case ${i} in
+		[+-]*)
+			i=${i#?};;
+		esac
+		grep -q "Completion\/${i}" -- "${S}/${file}" \
+			|| die "${file} does not contain Completion/${i}"
+		use completion_${i} || set -- "${@}" -e "s/Completion\/${i}[^ ']*//"
+	done
+	[ ${#} -eq 0 ] || sed -i "${@}" -- "${S}/${file}" \
+		|| die "patching ${file} failed"
+	epatch_user
+	! ${LIVE} || eautoreconf
+	PVPATH=$(. "${S}"/Config/version.mk && printf '%s' "${VERSION}") && \
+		[ -n "${PVPATH}" ] || PVPATH=${PV}
+}
+
+src_configure() {
+	local myconf
+	myconf=()
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-etcdir="${EPREFIX}"/etc/zsh \
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PVPATH}/help \
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PVPATH}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		"${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+	! ${LIVE} || ! use doc || emake -C Doc everything
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+zcompile_dirs() {
+	use compile || return 0
+	einfo "compiling modules"
+	local i
+	i="${S}/Src/zshpaths.h"
+	test -f "${i}" || die "cannot find ${i}"
+	# We need this directory also in pkg_postinst
+	FPATH_DIR="$(sed -n -e \
+		's/^#define FPATH_DIR .*\"\(.*\)\".*$/\1/p' -- "${i}" 2>/dev/null)" \
+		|| FPATH_DIR=
+	[ -n "${FPATH_DIR}" ] || die "cannot parse ${i}"
+	pushd -- "${ED}" >/dev/null || die
+	test -d ".${FPATH_DIR}" || die "parsing ${i} gave strange result ${FPATH_DIR}"
+	find ".${FPATH_DIR}" -type d -exec "${ED}bin/zsh" -fc 'setopt nullglob
+for i
+do	a=(${i}/*(.))
+	[[ ${#a} -eq 0 ]] && continue
+	echo "Compiling ${i#.}.zwc"
+	zcompile -U -M ${i}.zwc ${a} || exit
+done' zsh '{}' '+' || die 'compiling failed. If you are cross-compiling set USE=-compile'
+	popd >/dev/null
+}
+
+touch_zwc() {
+	use compile || return 0
+	einfo "touching *.zwc files"
+	# Make a sanity check that variables are preserved after zcompile_dirs:
+	# If the package mangler is not faulty, this *must* succeeed.
+	[ -n "${FPATH_DIR}" ] && test -d "${FPATH_DIR}" || die "strange FPATH_DIR"
+	# Now the actual action
+	find "${EPREFIX}${FPATH_DIR}" -type f -name '*.zwc' \
+		-exec "$(command -v touch)" -- '{}' '+'
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install.info
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i "${S}"/{Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/"${PVPATH}"/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+	readme.gentoo_create_doc
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+
+	zcompile_dirs
+
+	rm -vf -- "${ED}"/bin/zsh?*
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	touch_zwc
+}
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
new file mode 100644
index 00000000..d5a8bc8e
--- /dev/null
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix readme.gentoo
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="http://www.zsh.org/pub"
+
+ZSH_URI="${zsh_ftp}/${PN}-${MY_PV}.tar.xz"
+ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.xz"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+case ${PV} in
+9999*)
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+	inherit git-r3
+	WANT_LIBTOOL="none"
+	inherit autotools
+	KEYWORDS=""
+# Creating help files needs util-linux for colcrt.
+# Please let me know if you have an arch where "colcrt" (or at least "col")
+# is provided by a different package.
+	DEPEND="app-text/yodl
+		dev-lang/perl
+		sys-apps/man
+		sys-apps/util-linux
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+	PROPERTIES="live"
+	LIVE=:;;
+*)
+	SRC_URI="${ZSH_URI}
+		doc? ( ${ZSH_DOC_URI} )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	DEPEND=""
+	LIVE=false;;
+esac
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps compile"
+COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X"
+for curr in ${COMPLETIONS}
+do	case ${curr} in
+	[+-]*)
+		IUSE+=" ${curr%%[!+-]*}completion_${curr#?}"
+		continue;;
+	esac
+	IUSE+=" completion_${curr}"
+done
+IUSE+=" debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm )
+"
+DEPEND+="
+	sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="
+If you want to enable Portage completions and Gentoo prompt,
+emerge app-shells/zsh-completion and add
+	autoload -U compinit promptinit
+	compinit
+	promptinit; prompt gentoo
+to your ~/.zshrc
+
+Also, if you want to enable cache for the completions, add
+	zstyle ':completion::complete:*' use-cache 1
+to your ~/.zshrc
+
+If you want to use run-help add to your ~/.zshrc
+	unalias run-help
+	autoload -Uz run-help
+
+Note that a system zprofile startup file is installed. This will override
+PATH and possibly other variables that a user may set in ~/.zshenv.
+Custom PATH settings and similar overridden variables can be moved
+to ~/.zprofile or other user startup files that are sourced after the
+system zprofile.
+
+If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,
+one method is to use a separate path-setting file that is conditionally sourced
+in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the
+zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/.
+
+See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation.
+"
+
+src_prepare() {
+	# fix zshall problem with soelim
+	ln -s Doc man1 || die
+	mv Doc/zshall.1 Doc/zshall.1.soelim || die
+	soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+	epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+	set --
+	file='Src/Zle/complete.mdd'
+	for i in ${COMPLETIONS}
+	do	case ${i} in
+		[+-]*)
+			i=${i#?};;
+		esac
+		grep -q "Completion\/${i}" -- "${S}/${file}" \
+			|| die "${file} does not contain Completion/${i}"
+		use completion_${i} || set -- "${@}" -e "s/Completion\/${i}[^ ']*//"
+	done
+	[ ${#} -eq 0 ] || sed -i "${@}" -- "${S}/${file}" \
+		|| die "patching ${file} failed"
+	epatch_user
+	! ${LIVE} || eautoreconf
+	PVPATH=$(. "${S}"/Config/version.mk && printf '%s' "${VERSION}") && \
+		[ -n "${PVPATH}" ] || PVPATH=${PV}
+}
+
+src_configure() {
+	local myconf
+	myconf=()
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-etcdir="${EPREFIX}"/etc/zsh \
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PVPATH}/help \
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PVPATH}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		"${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+	! ${LIVE} || ! use doc || emake -C Doc everything
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+zcompile_dirs() {
+	use compile || return 0
+	einfo "compiling modules"
+	local i
+	i="${S}/Src/zshpaths.h"
+	test -f "${i}" || die "cannot find ${i}"
+	# We need this directory also in pkg_postinst
+	FPATH_DIR="$(sed -n -e \
+		's/^#define FPATH_DIR .*\"\(.*\)\".*$/\1/p' -- "${i}" 2>/dev/null)" \
+		|| FPATH_DIR=
+	[ -n "${FPATH_DIR}" ] || die "cannot parse ${i}"
+	pushd -- "${ED}" >/dev/null || die
+	test -d ".${FPATH_DIR}" || die "parsing ${i} gave strange result ${FPATH_DIR}"
+	find ".${FPATH_DIR}" -type d -exec "${ED}bin/zsh" -fc 'setopt nullglob
+for i
+do	a=(${i}/*(.))
+	[[ ${#a} -eq 0 ]] && continue
+	echo "Compiling ${i#.}.zwc"
+	zcompile -U -M ${i}.zwc ${a} || exit
+done' zsh '{}' '+' || die 'compiling failed. If you are cross-compiling set USE=-compile'
+	popd >/dev/null
+}
+
+touch_zwc() {
+	use compile || return 0
+	einfo "touching *.zwc files"
+	# Make a sanity check that variables are preserved after zcompile_dirs:
+	# If the package mangler is not faulty, this *must* succeeed.
+	[ -n "${FPATH_DIR}" ] && test -d "${FPATH_DIR}" || die "strange FPATH_DIR"
+	# Now the actual action
+	find "${EPREFIX}${FPATH_DIR}" -type f -name '*.zwc' \
+		-exec "$(command -v touch)" -- '{}' '+'
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install.info
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i "${S}"/{Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/"${PVPATH}"/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+	readme.gentoo_create_doc
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+
+	zcompile_dirs
+
+	rm -vf -- "${ED}"/bin/zsh?*
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	touch_zwc
+}
diff --git a/app-shells/zshrc-mv/Manifest b/app-shells/zshrc-mv/Manifest
new file mode 100644
index 00000000..fc7f4b24
--- /dev/null
+++ b/app-shells/zshrc-mv/Manifest
@@ -0,0 +1 @@
+DIST zshrc-mv-2.22.tar.gz 9335 SHA256 b8239c42abc7ba7cca92b7f21da137f082c722002027473deb24881300353f84 SHA512 5da027365d77f61735031c9a1d298b4d01131921c2b4fab8f7d9777a775a124c203446f3f1d7872c04f6da58e9d474b9b777a2940250b336f89fa103c72640b3 WHIRLPOOL d0bef8dce9b5219a461d056e9bf20b1c2842a8ad173db6b49bb960102d5d945814de3799b6376650335218d1f969130b538f37e9e7cead9ca4deec33f17ac904
diff --git a/app-shells/zshrc-mv/metadata.xml b/app-shells/zshrc-mv/metadata.xml
new file mode 100644
index 00000000..079e97cc
--- /dev/null
+++ b/app-shells/zshrc-mv/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>martin@mvath.de</email>
+			<name>Martin Väth</name>
+		</maintainer>
+		<bugs-to>mailto:martin@mvath.de</bugs-to>
+		<remote-id type="github">vaeth/zshrc-mv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
new file mode 100644
index 00000000..6f08fdd9
--- /dev/null
+++ b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="A zshrc file initializing zsh specific interactive features"
+HOMEPAGE="https://github.com/vaeth/zshrc-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	dodoc README
+	insinto /etc/zsh
+	doins zshrc
+}
+
+pkg_postinst() {
+	optfeature "automagic completion" '>=app-shells/auto-fu-zsh-0.0.1.13'
+	optfeature "syntax highlighting" 'app-shells/zsh-syntax-highlighting'
+	optfeature "a nice prompt" 'app-shells/set_prompt'
+	optfeature "nice directory colors" 'app-shells/termcolors-mv'
+}