commit: 6008afde68a19fabba8a3e91d6631bc013f36c70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 22:23:51 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=6008afde
app-text/poppler: Sort and streamline cmakeargs
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/poppler/poppler-0.62.0.ebuild | 30 +++++++++++-------------------
app-text/poppler/poppler-9999.ebuild | 32 ++++++++++++--------------------
2 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/app-text/poppler/poppler-0.62.0.ebuild
b/app-text/poppler/poppler-0.62.0.ebuild
index 49e0196feea..f27024c8297 100644
--- 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 99060e661f2..872ded8f4d0 100644
--- 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
