[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

["Mark Wright" <gienah@gentoo.org>]

commit:     3869c30043d3a0eb4c9bb11709346ee012fcc0c4
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 14:43:40 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> 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"