app-text/poppler: Sort and streamline cmakeargs

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 49e0196feea03dd14481bef855842ff509cbb1b2..f27024c8297fdf6310f7b23277ae27c4a613bffb 100644 (file)
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0.ebuild
@@ -93,30 +93,22 @@ src_configure() {
                -DENABLE_ZLIB=ON
                -DENABLE_ZLIB_UNCOMPRESS=OFF
                -DENABLE_XPDF_HEADERS=ON
-               -DENABLE_LIBCURL="$(usex curl)"
-               -DENABLE_CPP="$(usex cxx)"
-               -DENABLE_UTILS="$(usex utils)"
                -DSPLASH_CMYK=OFF
                -DUSE_FIXEDPOINT=OFF
                -DUSE_FLOAT=OFF
-               -DWITH_Cairo="$(usex cairo)"
-               -DWITH_GObjectIntrospection="$(usex introspection)"
-               -DWITH_JPEG="$(usex jpeg)"
-               -DWITH_NSS3="$(usex nss)"
-               -DWITH_PNG="$(usex png)"
+               -DWITH_Cairo=$(usex cairo)
+               -DENABLE_LIBCURL=$(usex curl)
+               -DENABLE_CPP=$(usex cxx)
+               -DWITH_GObjectIntrospection=$(usex introspection)
+               -DWITH_JPEG=$(usex jpeg)
+               -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+               -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+               -DWITH_NSS3=$(usex nss)
+               -DWITH_PNG=$(usex png)
                $(cmake-utils_use_find_package qt5 Qt5Core)
-               -DWITH_TIFF="$(usex tiff)"
+               -DWITH_TIFF=$(usex tiff)
+               -DENABLE_UTILS=$(usex utils)
        )
-       if use jpeg; then
-               mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
-       else
-               mycmakeargs+=(-DENABLE_DCTDECODER=none)
-       fi
-       if use jpeg2k; then
-               mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-       else
-               mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
-       fi
        if use lcms; then
                mycmakeargs+=(-DENABLE_CMS=lcms2)
        else

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 99060e661f2246cc0b2a06e2b3663016e22088d2..872ded8f4d0e2f029c1a2cd24ceca24e0cf2e120 100644 (file)
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -93,30 +93,22 @@ src_configure() {
                -DENABLE_ZLIB=ON
                -DENABLE_ZLIB_UNCOMPRESS=OFF
                -DENABLE_XPDF_HEADERS=ON
-               -DENABLE_LIBCURL="$(usex curl)"
-               -DENABLE_CPP="$(usex cxx)"
-               -DENABLE_UTILS="$(usex utils)"
                -DSPLASH_CMYK=OFF
                -DUSE_FIXEDPOINT=OFF
                -DUSE_FLOAT=OFF
-               -DWITH_Cairo="$(usex cairo)"
-               -DWITH_GObjectIntrospection="$(usex introspection)"
-               -DWITH_JPEG="$(usex jpeg)"
-               -DWITH_NSS3="$(usex nss)"
-               -DWITH_PNG="$(usex png)"
+               -DWITH_Cairo=$(usex cairo)
+               -DENABLE_LIBCURL=$(usex curl)
+               -DENABLE_CPP=$(usex cxx)
+               -DWITH_GObjectIntrospection=$(usex introspection)
+               -DWITH_JPEG=$(usex jpeg)
+               -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+               -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+               -DWITH_NSS3=$(usex nss)
+               -DWITH_PNG=$(usex png)
                $(cmake-utils_use_find_package qt5 Qt5Core)
-               -DWITH_TIFF="$(usex tiff)"
+               -DWITH_TIFF=$(usex tiff)
+               -DENABLE_UTILS=$(usex utils)
        )
-       if use jpeg; then
-               mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
-       else
-               mycmakeargs+=(-DENABLE_DCTDECODER=none)
-       fi
-       if use jpeg2k; then
-               mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-       else
-               mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
-       fi
        if use lcms; then
                mycmakeargs+=(-DENABLE_CMS=lcms2)
        else