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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild
index f27024c8297fdf6310f7b23277ae27c4a613bffb..9934ad402fa557d96e727f6c5019d6798542e418 100644 (file)
--- 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 872ded8f4d0e2f029c1a2cd24ceca24e0cf2e120..a2559d99b50cd65f8710dc83de9dbb876e8b09d1 100644 (file)
--- 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
 }