diff options
| author |   Mark Wright <gienah@gentoo.org> | 2017-01-03 21:24:32 +1100 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2017-01-03 21:25:02 +1100 |
| commit | ecbf57250a9e67afce63516df4497c2fb9f6fcec (patch) | |
| tree | 626214a3aa3db23eb06128d636054e867d42949e | |
| parent | x11-libs/motif: Do not add -g to the user's CFLAGS. (diff) | |
| download | gentoo-ecbf5725.tar.gz gentoo-ecbf5725.tar.bz2 gentoo-ecbf5725.zip | |
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
| -rw-r--r-- | sci-mathematics/z3/z3-4.4.1.ebuild | 2 | ||||
| -rw-r--r-- | 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 168ae61bb882..aacd12c91ef2 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 b8f03354bdc2..98a18ca067e2 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() { |