Bump to EAPI=6

7 files changed, 35 insertions, 45 deletions

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 feb8d9bb..ba681293 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
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 pPN=${PN%-zsh}
 mPN="${pPN}.zsh"
@@ -105,13 +104,13 @@ src_prepare() {
 	if ! ${LIVE}
 	then
 		# Make Ctrl-D return correctly.
-		epatch "${FILESDIR}"/exit.patch
+		eapply "${FILESDIR}"/exit.patch
 		# Reset color with "return":
-		epatch "${FILESDIR}"/reset-color.patch
+		eapply "${FILESDIR}"/reset-color.patch
 		# Make it work with older zsh versions:
-		epatch "${FILESDIR}"/zsh-compatibility.patch
+		eapply "${FILESDIR}"/zsh-compatibility.patch
 	fi
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
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 feb8d9bb..ba681293 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 pPN=${PN%-zsh}
 mPN="${pPN}.zsh"
@@ -105,13 +104,13 @@ src_prepare() {
 	if ! ${LIVE}
 	then
 		# Make Ctrl-D return correctly.
-		epatch "${FILESDIR}"/exit.patch
+		eapply "${FILESDIR}"/exit.patch
 		# Reset color with "return":
-		epatch "${FILESDIR}"/reset-color.patch
+		eapply "${FILESDIR}"/reset-color.patch
 		# Make it work with older zsh versions:
-		epatch "${FILESDIR}"/zsh-compatibility.patch
+		eapply "${FILESDIR}"/zsh-compatibility.patch
 	fi
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
diff --git a/app-shells/runtitle/runtitle-2.7.ebuild b/app-shells/runtitle/runtitle-2.7.ebuild
index 71ebe8a4..59598f45 100644
--- a/app-shells/runtitle/runtitle-2.7.ebuild
+++ b/app-shells/runtitle/runtitle-2.7.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 RESTRICT="mirror"
-inherit eutils
 
 DESCRIPTION="Scripts to run commands and set the hard status line (windows title)"
 HOMEPAGE="https://github.com/vaeth/runtitle/"
@@ -19,7 +18,7 @@ src_prepare() {
 	use prefix || sed -i \
 		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
 		-- bin/* || die
-	epatch_user
+	eapply_user
 }
 
 src_install() {
diff --git a/app-shells/set_prompt/set_prompt-1.23.ebuild b/app-shells/set_prompt/set_prompt-1.23.ebuild
index 94a9288d..42a8e326 100644
--- a/app-shells/set_prompt/set_prompt-1.23.ebuild
+++ b/app-shells/set_prompt/set_prompt-1.23.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 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/"
@@ -20,7 +19,7 @@ src_prepare() {
 		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
 		-e '1s"^#!/usr/bin/env zsh$"#!'"${EPREFIX}"'/bin/zsh"' \
 		-- * || die
-	epatch_user
+	eapply_user
 }
 
 src_install() {
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
index 351b7e58..8a0f58e4 100644
--- a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 case ${PV} in
 99999999*)
@@ -15,7 +14,7 @@ case ${PV} in
 	SRC_URI="";;
 *)
 	LIVE=false
-	RESTRICT="mirror"
+	#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"
@@ -39,11 +38,11 @@ USEFILE=()
 FILEINDEX=()
 used_value() {
 	case ${!1} in
-	'*'*)
-		eval ${1}=\${${1}#?}
+	'#'*)
+		eval "${1}=\${${1}#?}"
 		${LIVE};;
 	'/'*)
-		eval ${1}=\${${1}#?}
+		eval "${1}=\${${1}#?}"
 		! ${LIVE};;
 	esac
 }
@@ -82,8 +81,8 @@ calculate_data \
 	'+filesystem _zfs' \
 	'+git _git-flow _git-pulls' \
 	'+hardware _optirun _perf _primus' \
-	'+haskell _cabal _ghc *_stack' \
-	'+managers *_ansible *_ansible-galaxy *_ansible-playbook _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \
+	'+haskell _cabal _ghc #_stack' \
+	'+managers #_ansible #_ansible-galaxy #_ansible-playbook _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' \
@@ -93,8 +92,8 @@ calculate_data \
 	'+search _ack _ag _jq' \
 	'+session _atach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
-	'+virtualization _boot2docker *_docker-compose *_docker-machine _virtualbox _virsh' \
-	'+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio *_salt _sbt _scala _svm'
+	'+virtualization _boot2docker #_docker-compose #_docker-machine _virtualbox _virsh' \
+	'+web _coffee _composer _docpad _drush _heroku #_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio /_salt _sbt _scala _svm'
 
 src_prepare() {
 	# Remove colliding completions
@@ -102,7 +101,7 @@ src_prepare() {
 	then	mv src/_docker . || eerror "mv failed"
 	else	mv src/_docker src/_pip . || die
 	fi
-	epatch_user
+	eapply_user
 }
 
 src_install() {
diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
index 351b7e58..8a0f58e4 100644
--- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 case ${PV} in
 99999999*)
@@ -15,7 +14,7 @@ case ${PV} in
 	SRC_URI="";;
 *)
 	LIVE=false
-	RESTRICT="mirror"
+	#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"
@@ -39,11 +38,11 @@ USEFILE=()
 FILEINDEX=()
 used_value() {
 	case ${!1} in
-	'*'*)
-		eval ${1}=\${${1}#?}
+	'#'*)
+		eval "${1}=\${${1}#?}"
 		${LIVE};;
 	'/'*)
-		eval ${1}=\${${1}#?}
+		eval "${1}=\${${1}#?}"
 		! ${LIVE};;
 	esac
 }
@@ -82,8 +81,8 @@ calculate_data \
 	'+filesystem _zfs' \
 	'+git _git-flow _git-pulls' \
 	'+hardware _optirun _perf _primus' \
-	'+haskell _cabal _ghc *_stack' \
-	'+managers *_ansible *_ansible-galaxy *_ansible-playbook _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \
+	'+haskell _cabal _ghc #_stack' \
+	'+managers #_ansible #_ansible-galaxy #_ansible-playbook _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' \
@@ -93,8 +92,8 @@ calculate_data \
 	'+search _ack _ag _jq' \
 	'+session _atach _teamocil _tmuxinator _wemux' \
 	'+subtitles _language_codes _periscope _subliminal' \
-	'+virtualization _boot2docker *_docker-compose *_docker-machine _virtualbox _virsh' \
-	'+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio *_salt _sbt _scala _svm'
+	'+virtualization _boot2docker #_docker-compose #_docker-machine _virtualbox _virsh' \
+	'+web _coffee _composer _docpad _drush _heroku #_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio /_salt _sbt _scala _svm'
 
 src_prepare() {
 	# Remove colliding completions
@@ -102,7 +101,7 @@ src_prepare() {
 	then	mv src/_docker . || eerror "mv failed"
 	else	mv src/_docker src/_pip . || die
 	fi
-	epatch_user
+	eapply_user
 }
 
 src_install() {
diff --git a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
index 6f08fdd9..41952656 100644
--- a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
+++ b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 RESTRICT="mirror"
 inherit eutils
 
@@ -16,10 +16,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]"
 
-src_prepare() {
-	epatch_user
-}
-
 src_install() {
 	dodoc README
 	insinto /etc/zsh