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

[Tim Harder]

commit:     93846eacac31080fd5180ddf0d7e35413c7c6428
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 04:58:00 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 05:03:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93846eac

app-shells/zsh: only install info files when doc USE flag is enabled

Fixes bug #593838.

 app-shells/zsh/{zsh-9999.ebuild => zsh-5.2-r1.ebuild} | 7 ++++---
 app-shells/zsh/zsh-9999.ebuild                        | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-5.2-r1.ebuild
similarity index 98%
copy from app-shells/zsh/zsh-9999.ebuild
copy to app-shells/zsh/zsh-5.2-r1.ebuild
index e8759b0..d4080ea 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-5.2-r1.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
                sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' 
"${T}"/zprofile || die
        fi
 
-       default
+       eapply_user
 
        if [[ ${PV} == 9999* ]] ; then
                sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
@@ -143,7 +143,7 @@ src_test() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install install.info
+       emake DESTDIR="${D}" install $(usex doc "install.info" "")
 
        insinto /etc/zsh
        doins "${T}"/zprofile
@@ -177,7 +177,8 @@ src_install() {
 
        if use doc ; then
                pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-               dohtml -r Doc/*
+               docinto html
+               dodoc Doc/*.html
                insinto /usr/share/doc/${PF}
                doins Doc/zsh.{dvi,pdf}
                popd >/dev/null

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index e8759b0..d4080ea 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
                sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' 
"${T}"/zprofile || die
        fi
 
-       default
+       eapply_user
 
        if [[ ${PV} == 9999* ]] ; then
                sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
@@ -143,7 +143,7 @@ src_test() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install install.info
+       emake DESTDIR="${D}" install $(usex doc "install.info" "")
 
        insinto /etc/zsh
        doins "${T}"/zprofile
@@ -177,7 +177,8 @@ src_install() {
 
        if use doc ; then
                pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-               dohtml -r Doc/*
+               docinto html
+               dodoc Doc/*.html
                insinto /usr/share/doc/${PF}
                doins Doc/zsh.{dvi,pdf}
                popd >/dev/null