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 E2861139085 for ; Tue, 3 Jan 2017 10:25:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18A6F21C028; Tue, 3 Jan 2017 10:25:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E89CF21C028 for ; Tue, 3 Jan 2017 10:25:25 +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 8B38034102B for ; Tue, 3 Jan 2017 10:25:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C44A24EC for ; Tue, 3 Jan 2017 10:25:23 +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: <1483439102.ecbf57250a9e67afce63516df4497c2fb9f6fcec.gienah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/z3/z3-4.4.1.ebuild sci-mathematics/z3/z3-4.5.0.ebuild X-VCS-Directories: sci-mathematics/z3/ X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright X-VCS-Revision: ecbf57250a9e67afce63516df4497c2fb9f6fcec X-VCS-Branch: master Date: Tue, 3 Jan 2017 10:25:23 +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: 4639d9ca-dc02-4920-8058-981f7a844b73 X-Archives-Hash: f00c49a3d0378ff7ebbd90204a035b48 commit: ecbf57250a9e67afce63516df4497c2fb9f6fcec Author: Mark Wright gentoo org> AuthorDate: Tue Jan 3 10:24:32 2017 +0000 Commit: Mark Wright gentoo 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() {