From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E32A1382C5 for ; Fri, 5 Jan 2018 00:35:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46A19E0AB0; Fri, 5 Jan 2018 00:35:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 155B0E0AB0 for ; Fri, 5 Jan 2018 00:35:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6499335C4B for ; Fri, 5 Jan 2018 00:35:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1B871A9 for ; Fri, 5 Jan 2018 00:35:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515112468.6008afde68a19fabba8a3e91d6631bc013f36c70.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/poppler-0.62.0.ebuild app-text/poppler/poppler-9999.ebuild X-VCS-Directories: app-text/poppler/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6008afde68a19fabba8a3e91d6631bc013f36c70 X-VCS-Branch: master Date: Fri, 5 Jan 2018 00:35:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5e53e70b-f978-4b31-ba0d-5d1f0d739032 X-Archives-Hash: 666cedfc9802279288c86be7c18e7ca1 commit: 6008afde68a19fabba8a3e91d6631bc013f36c70 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 4 22:23:51 2018 +0000 Commit: Andreas Sturmlechner gentoo 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