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

[Andreas Sturmlechner]

commit:     6d2825f63d7c1a7a04bb20366a317b976e08dd95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 15:46:40 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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
 }