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

[Mark Wright]

commit:     ecbf57250a9e67afce63516df4497c2fb9f6fcec
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 10:24:32 2017 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 10:25:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbf5725

sci-mathematics/z3: Thanks to Daniel Gulotta for reporting.

Fix 604450 z3-4.5.0 build fails if doxygen is not installed.  Implement better
fix for 604362 install for USE="python -doc", thanks to Toralf Forster for
reporting.

Gentoo-bug: 604450, 604362

Package-Manager: portage-2.3.3

 sci-mathematics/z3/z3-4.4.1.ebuild |  2 +-
 sci-mathematics/z3/z3-4.5.0.ebuild | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/z3/z3-4.4.1.ebuild b/sci-mathematics/z3/z3-4.4.1.ebuild
index 168ae61..aacd12c 100644
--- a/sci-mathematics/z3/z3-4.4.1.ebuild
+++ b/sci-mathematics/z3/z3-4.4.1.ebuild
@@ -110,7 +110,7 @@ src_install() {
 	fi
 
 	local DOCS=( "README" "RELEASE_NOTES" )
-	einstalldocs
+	use doc && einstalldocs
 }
 
 pkg_postinst() {

diff --git a/sci-mathematics/z3/z3-4.5.0.ebuild b/sci-mathematics/z3/z3-4.5.0.ebuild
index b8f0335..98a18ca 100644
--- a/sci-mathematics/z3/z3-4.5.0.ebuild
+++ b/sci-mathematics/z3/z3-4.5.0.ebuild
@@ -22,6 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:0 )"
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.8 )"
 
 S=${WORKDIR}/${PN}-${P}
@@ -85,9 +86,11 @@ src_compile() {
 
 	use java && java-pkg-simple_src_compile
 
-	pushd doc || die
-	${EPYTHON} mk_api_doc.py || die
-	popd || die
+	if use doc; then
+		pushd doc || die
+		${EPYTHON} mk_api_doc.py || die
+		popd || die
+	fi
 }
 
 src_install() {
@@ -121,8 +124,8 @@ src_install() {
 	fi
 
 	local DOCS=( "README.md" "RELEASE_NOTES" )
-	local HTML_DOCS=( "doc/api/html" )
-	einstalldocs
+	local HTML_DOCS=( "doc/api/html/." )
+	use doc && einstalldocs
 }
 
 pkg_postinst() {