[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/

[Andreas Sturmlechner]

commit:     e0b5411244394e95a1019d4562059336e054ed82
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 22:36:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 00:34:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b54112

app-text/poppler: Fix configure with USE=-lcms

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/poppler/poppler-0.62.0.ebuild | 6 +-----
 app-text/poppler/poppler-9999.ebuild   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app-text/poppler/poppler-0.62.0.ebuild 
b/app-text/poppler/poppler-0.62.0.ebuild
index f27024c8297..9934ad402fa 100644
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0.ebuild
@@ -103,17 +103,13 @@ src_configure() {
                -DWITH_JPEG=$(usex jpeg)
                -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
                -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+               -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
                $(cmake-utils_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
-       if use lcms; then
-               mycmakeargs+=(-DENABLE_CMS=lcms2)
-       else
-               mycmakeargs+=(-DENABLE_CMS=)
-       fi
 
        cmake-utils_src_configure
 }

diff --git a/app-text/poppler/poppler-9999.ebuild 
b/app-text/poppler/poppler-9999.ebuild
index 872ded8f4d0..a2559d99b50 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -103,17 +103,13 @@ src_configure() {
                -DWITH_JPEG=$(usex jpeg)
                -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
                -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+               -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
                $(cmake-utils_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
-       if use lcms; then
-               mycmakeargs+=(-DENABLE_CMS=lcms2)
-       else
-               mycmakeargs+=(-DENABLE_CMS=)
-       fi
 
        cmake-utils_src_configure
 }