From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C226138330 for ; Thu, 15 Sep 2016 05:03:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95C3AE0B27; Thu, 15 Sep 2016 05:03:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B5EDE0B27 for ; Thu, 15 Sep 2016 05:03:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C2573408B8 for ; Thu, 15 Sep 2016 05:03:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F283247E for ; Thu, 15 Sep 2016 05:03:38 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1473915811.93846eacac31080fd5180ddf0d7e35413c7c6428.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/zsh/zsh-5.2-r1.ebuild app-shells/zsh/zsh-9999.ebuild X-VCS-Directories: app-shells/zsh/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 93846eacac31080fd5180ddf0d7e35413c7c6428 X-VCS-Branch: master Date: Thu, 15 Sep 2016 05:03:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 45f316f9-8682-4a4d-a82e-60fb1a786973 X-Archives-Hash: 1989f6a2852ee753508515b00068d7e8 commit: 93846eacac31080fd5180ddf0d7e35413c7c6428 Author: Tim Harder gentoo org> AuthorDate: Thu Sep 15 04:58:00 2016 +0000 Commit: Tim Harder gentoo 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