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 09BCA1382C5 for ; Mon, 5 Mar 2018 15:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40406E0876; Mon, 5 Mar 2018 15:47:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D5FCE0876 for ; Mon, 5 Mar 2018 15:47:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 684BD335C0C for ; Mon, 5 Mar 2018 15:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3026239 for ; Mon, 5 Mar 2018 15:47:21 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1520264832.6d2825f63d7c1a7a04bb20366a317b976e08dd95.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cgal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/cgal/cgal-4.11.1.ebuild X-VCS-Directories: sci-mathematics/cgal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6d2825f63d7c1a7a04bb20366a317b976e08dd95 X-VCS-Branch: master Date: Mon, 5 Mar 2018 15:47:21 +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: fb9ea828-bc98-49c3-a423-6525bc9186c4 X-Archives-Hash: 82590460cce24259800ec7dcf77e4e48 commit: 6d2825f63d7c1a7a04bb20366a317b976e08dd95 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 5 15:46:40 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 5 15:47:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2825f6 sci-mathematics/cgal: Sort DEPENDs, use HTML_DOCS Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-mathematics/cgal/cgal-4.11.1.ebuild | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sci-mathematics/cgal/cgal-4.11.1.ebuild b/sci-mathematics/cgal/cgal-4.11.1.ebuild index 99dae7d2893..97da0b221e6 100644 --- a/sci-mathematics/cgal/cgal-4.11.1.ebuild +++ b/sci-mathematics/cgal/cgal-4.11.1.ebuild @@ -27,15 +27,15 @@ RDEPEND=" virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) + mpfi? ( sci-libs/mpfi ) + ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl )" + )" DEPEND="${RDEPEND} app-arch/xz-utils virtual/pkgconfig" @@ -63,22 +63,18 @@ src_configure() { -DWITH_ZLIB=ON -DWITH_GMP="$(usex gmp)" -DWITH_GMPXX="$(usex gmp)" - -DWITH_CGAL_Qt5="$(usex qt5)" -DWITH_MPFI="$(usex mpfi)" -DWITH_NTL="$(usex ntl)" + -DWITH_CGAL_Qt5="$(usex qt5)" ) cmake-utils_src_configure } src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. ) cmake-utils_src_install if use examples; then dodoc -r examples demo docompress -x /usr/share/doc/${PF}/{examples,demo} fi - if use doc; then - docinto html/ - dodoc -r "${WORKDIR}"/doc_html/* - docompress -x /usr/share/doc/${PF}/html - fi }