[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

[Tim Harder]

commit:     9d1d0ab8c38ba133d96cb849cb64a3ffe7b25752
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 20:43:57 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 20:45:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1d0ab8

app-shells/zsh: bump to EAPI 6 and skip release actions for live ebuild

 app-shells/zsh/zsh-9999.ebuild | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 695369a..e8759b0 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic multilib prefix
 
@@ -47,12 +47,15 @@ if [[ ${PV} == 9999* ]] ; then
 fi
 
 src_prepare() {
-	# fix zshall problem with soelim
-	ln -s Doc man1
-	mv Doc/zshall.1 Doc/zshall.1.soelim
-	soelim Doc/zshall.1.soelim > Doc/zshall.1
-
-	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+	if [[ ${PV} != 9999* ]]; then
+		# 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
+
+		# add openrc specific options for init.d completion
+		eapply "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+	fi
 
 	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
 	eprefixify "${T}"/zprofile || die
@@ -62,6 +65,8 @@ src_prepare() {
 		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
 	fi
 
+	default
+
 	if [[ ${PV} == 9999* ]] ; then
 		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
 		eautoreconf