From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 69BB1138216 for ; Mon, 2 May 2016 22:39:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C10B21C04B; Mon, 2 May 2016 22:39:30 +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 648ED21C04B for ; Mon, 2 May 2016 22:39:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2B770340A03 for ; Mon, 2 May 2016 22:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B26E0329 for ; Mon, 2 May 2016 22:39:25 +0000 (UTC) From: "Mark Wright" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mark Wright" Message-ID: <1462228739.3869c30043d3a0eb4c9bb11709346ee012fcc0c4.gienah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/octave-4.0.0-r1.ebuild sci-mathematics/octave/octave-4.0.1-r1.ebuild sci-mathematics/octave/octave-4.0.2.ebuild X-VCS-Directories: sci-mathematics/octave/ X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright X-VCS-Revision: 3869c30043d3a0eb4c9bb11709346ee012fcc0c4 X-VCS-Branch: master Date: Mon, 2 May 2016 22:39:25 +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: 5b8167a1-137e-4ee0-b10f-3df0d8eb0c94 X-Archives-Hash: f1c29e38c2704aa2fcde4a8dd2b2338c commit: 3869c30043d3a0eb4c9bb11709346ee012fcc0c4 Author: Mark Wright gentoo org> AuthorDate: Mon May 2 14:43:40 2016 +0000 Commit: Mark Wright gentoo org> CommitDate: Mon May 2 22:38:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3869c300 sci-mathematics/octave: Fix bug 566134, thanks to Francisco Vazquez for reporting. Gentoo-bug: 566134 Package-Manager: portage-2.2.28 .../octave/{octave-4.0.2.ebuild => octave-4.0.0-r1.ebuild} | 12 +++++++++--- .../octave/{octave-4.0.2.ebuild => octave-4.0.1-r1.ebuild} | 12 +++++++++--- sci-mathematics/octave/octave-4.0.2.ebuild | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild similarity index 94% copy from sci-mathematics/octave/octave-4.0.2.ebuild copy to sci-mathematics/octave/octave-4.0.0-r1.ebuild index a527708..88a67af 100644 --- a/sci-mathematics/octave/octave-4.0.2.ebuild +++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild @@ -69,8 +69,8 @@ DEPEND="${RDEPEND} doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended - dev-texlive/texlive-metapost - sys-apps/texinfo ) + dev-texlive/texlive-metapost ) + sys-apps/texinfo dev-util/gperf virtual/pkgconfig" @@ -160,7 +160,13 @@ src_compile() { src_install() { autotools-utils_src_install - use doc && dodoc $(find doc -name \*.pdf) + if use doc; then + dodoc $(find doc -name \*.pdf) + else + # bug 566134, macros.texi is installed by make install if use doc + insinto /usr/share/${PN}/${PV}/etc + doins doc/interpreter/macros.texi + fi [[ -e test/fntests.log ]] && dodoc test/fntests.log use java && \ java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar" diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild similarity index 94% copy from sci-mathematics/octave/octave-4.0.2.ebuild copy to sci-mathematics/octave/octave-4.0.1-r1.ebuild index a527708..88a67af 100644 --- a/sci-mathematics/octave/octave-4.0.2.ebuild +++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild @@ -69,8 +69,8 @@ DEPEND="${RDEPEND} doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended - dev-texlive/texlive-metapost - sys-apps/texinfo ) + dev-texlive/texlive-metapost ) + sys-apps/texinfo dev-util/gperf virtual/pkgconfig" @@ -160,7 +160,13 @@ src_compile() { src_install() { autotools-utils_src_install - use doc && dodoc $(find doc -name \*.pdf) + if use doc; then + dodoc $(find doc -name \*.pdf) + else + # bug 566134, macros.texi is installed by make install if use doc + insinto /usr/share/${PN}/${PV}/etc + doins doc/interpreter/macros.texi + fi [[ -e test/fntests.log ]] && dodoc test/fntests.log use java && \ java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar" diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.2.ebuild index a527708..88a67af 100644 --- a/sci-mathematics/octave/octave-4.0.2.ebuild +++ b/sci-mathematics/octave/octave-4.0.2.ebuild @@ -69,8 +69,8 @@ DEPEND="${RDEPEND} doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended - dev-texlive/texlive-metapost - sys-apps/texinfo ) + dev-texlive/texlive-metapost ) + sys-apps/texinfo dev-util/gperf virtual/pkgconfig" @@ -160,7 +160,13 @@ src_compile() { src_install() { autotools-utils_src_install - use doc && dodoc $(find doc -name \*.pdf) + if use doc; then + dodoc $(find doc -name \*.pdf) + else + # bug 566134, macros.texi is installed by make install if use doc + insinto /usr/share/${PN}/${PV}/etc + doins doc/interpreter/macros.texi + fi [[ -e test/fntests.log ]] && dodoc test/fntests.log use java && \ java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"