app-shells/auto-fu-zsh: inofficial intermediate version

6 files changed, 157 insertions, 10 deletions

diff --git a/app-shells/auto-fu-zsh/Manifest b/app-shells/auto-fu-zsh/Manifest
index 708e2f3d..1fc413a2 100644
--- a/app-shells/auto-fu-zsh/Manifest
+++ b/app-shells/auto-fu-zsh/Manifest
@@ -1 +1,2 @@
 DIST auto-fu-zsh-0.0.1.12.tar.gz 9409 SHA256 cf692f8a81588289e44396f06e30e36fc6fa6bdcb2c87e4d462a15bad61db1c1
+DIST auto-fu-zsh-0.0.1.12_p0.tar.gz 17131 SHA256 ed24fa3b1464a1d1f80ade02b9ae7d81610b62d60ed7f784a1bc5c022db8e6a0
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
index 4b8642ca..518c23ad 100644
--- 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
@@ -6,21 +6,27 @@ EAPI=6
 
 pPN=${PN%-zsh}
 mPN="${pPN}.zsh"
+NEED_PATCHES=false
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
 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="";;
+0.0.1.12_p0)
+	RESTRICT="mirror"
+	EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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";;
 *)
-	LIVE=false
 	RESTRICT="mirror"
 	SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${mPN}-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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";;
+	NEED_PATCHES=:;;
 esac
 
 DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
@@ -101,7 +107,7 @@ src_prepare() {
 		umask 022
 		generate_example >"${S}"/zshrc-example
 	)
-	if ! ${LIVE}
+	if ${NEED_PATCHES}
 	then
 		# Make Ctrl-D return correctly.
 		eapply "${FILESDIR}"/exit.patch
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild
new file mode 100644
index 00000000..d7361190
--- /dev/null
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+pPN=${PN%-zsh}
+mPN="${pPN}.zsh"
+NEED_PATCHES=false
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+case ${PV} in
+99999999*)
+	EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
+	EGIT_BRANCH="pu"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+0.0.1.12_p0)
+	RESTRICT="mirror"
+	EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${EGIT_COMMIT}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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";;
+*)
+	RESTRICT="mirror"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${PV}"
+	NEED_PATCHES=:;;
+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 ${NEED_PATCHES}
+	then
+		# Make Ctrl-D return correctly.
+		eapply "${FILESDIR}"/exit.patch
+		# Reset color with "return":
+		eapply "${FILESDIR}"/reset-color.patch
+		# Make it work with older zsh versions:
+		eapply "${FILESDIR}"/zsh-compatibility.patch
+	fi
+	eapply_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
index 4b8642ca..518c23ad 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -6,21 +6,27 @@ EAPI=6
 
 pPN=${PN%-zsh}
 mPN="${pPN}.zsh"
+NEED_PATCHES=false
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
 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="";;
+0.0.1.12_p0)
+	RESTRICT="mirror"
+	EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
+	SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${mPN}-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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";;
 *)
-	LIVE=false
 	RESTRICT="mirror"
 	SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${mPN}-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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";;
+	NEED_PATCHES=:;;
 esac
 
 DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
@@ -101,7 +107,7 @@ src_prepare() {
 		umask 022
 		generate_example >"${S}"/zshrc-example
 	)
-	if ! ${LIVE}
+	if ${NEED_PATCHES}
 	then
 		# Make Ctrl-D return correctly.
 		eapply "${FILESDIR}"/exit.patch
diff --git a/app-shells/zshrc-mv/zshrc-mv-2.30.ebuild b/app-shells/zshrc-mv/zshrc-mv-2.30.ebuild
index 76d43325..b65ce341 100644
--- a/app-shells/zshrc-mv/zshrc-mv-2.30.ebuild
+++ b/app-shells/zshrc-mv/zshrc-mv-2.30.ebuild
@@ -23,7 +23,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "automagic completion" '>=app-shells/auto-fu-zsh-0.0.1.13'
+	optfeature "automagic completion" '>=app-shells/auto-fu-zsh-0.0.1.12_p0'
 	optfeature "syntax highlighting" 'app-shells/zsh-syntax-highlighting'
 	optfeature "a nice prompt" 'app-shells/set_prompt'
 	optfeature "nice directory colors" 'app-shells/termcolors-mv'
diff --git a/sets/zshrc-mv b/sets/zshrc-mv
index 8dc71598..bd992bf9 100644
--- a/sets/zshrc-mv
+++ b/sets/zshrc-mv
@@ -1,4 +1,4 @@
->=app-shells/auto-fu-zsh-0.0.1.13
+>=app-shells/auto-fu-zsh-0.0.1.12_p0
 app-shells/set_prompt
 app-shells/termcolors-mv
 app-shells/zsh-syntax-highlighting