| 1 |
commit: 6008afde68a19fabba8a3e91d6631bc013f36c70 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 22:23:51 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 00:34:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6008afde |
| 7 |
|
| 8 |
app-text/poppler: Sort and streamline cmakeargs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-text/poppler/poppler-0.62.0.ebuild | 30 +++++++++++------------------- |
| 13 |
app-text/poppler/poppler-9999.ebuild | 32 ++++++++++++-------------------- |
| 14 |
2 files changed, 23 insertions(+), 39 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild |
| 17 |
index 49e0196feea..f27024c8297 100644 |
| 18 |
--- a/app-text/poppler/poppler-0.62.0.ebuild |
| 19 |
+++ b/app-text/poppler/poppler-0.62.0.ebuild |
| 20 |
@@ -93,30 +93,22 @@ src_configure() { |
| 21 |
-DENABLE_ZLIB=ON |
| 22 |
-DENABLE_ZLIB_UNCOMPRESS=OFF |
| 23 |
-DENABLE_XPDF_HEADERS=ON |
| 24 |
- -DENABLE_LIBCURL="$(usex curl)" |
| 25 |
- -DENABLE_CPP="$(usex cxx)" |
| 26 |
- -DENABLE_UTILS="$(usex utils)" |
| 27 |
-DSPLASH_CMYK=OFF |
| 28 |
-DUSE_FIXEDPOINT=OFF |
| 29 |
-DUSE_FLOAT=OFF |
| 30 |
- -DWITH_Cairo="$(usex cairo)" |
| 31 |
- -DWITH_GObjectIntrospection="$(usex introspection)" |
| 32 |
- -DWITH_JPEG="$(usex jpeg)" |
| 33 |
- -DWITH_NSS3="$(usex nss)" |
| 34 |
- -DWITH_PNG="$(usex png)" |
| 35 |
+ -DWITH_Cairo=$(usex cairo) |
| 36 |
+ -DENABLE_LIBCURL=$(usex curl) |
| 37 |
+ -DENABLE_CPP=$(usex cxx) |
| 38 |
+ -DWITH_GObjectIntrospection=$(usex introspection) |
| 39 |
+ -DWITH_JPEG=$(usex jpeg) |
| 40 |
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) |
| 41 |
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) |
| 42 |
+ -DWITH_NSS3=$(usex nss) |
| 43 |
+ -DWITH_PNG=$(usex png) |
| 44 |
$(cmake-utils_use_find_package qt5 Qt5Core) |
| 45 |
- -DWITH_TIFF="$(usex tiff)" |
| 46 |
+ -DWITH_TIFF=$(usex tiff) |
| 47 |
+ -DENABLE_UTILS=$(usex utils) |
| 48 |
) |
| 49 |
- if use jpeg; then |
| 50 |
- mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
| 51 |
- else |
| 52 |
- mycmakeargs+=(-DENABLE_DCTDECODER=none) |
| 53 |
- fi |
| 54 |
- if use jpeg2k; then |
| 55 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
| 56 |
- else |
| 57 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
| 58 |
- fi |
| 59 |
if use lcms; then |
| 60 |
mycmakeargs+=(-DENABLE_CMS=lcms2) |
| 61 |
else |
| 62 |
|
| 63 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
| 64 |
index 99060e661f2..872ded8f4d0 100644 |
| 65 |
--- a/app-text/poppler/poppler-9999.ebuild |
| 66 |
+++ b/app-text/poppler/poppler-9999.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2017 Gentoo Foundation |
| 69 |
+# Copyright 1999-2018 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
EAPI=6 |
| 73 |
@@ -93,30 +93,22 @@ src_configure() { |
| 74 |
-DENABLE_ZLIB=ON |
| 75 |
-DENABLE_ZLIB_UNCOMPRESS=OFF |
| 76 |
-DENABLE_XPDF_HEADERS=ON |
| 77 |
- -DENABLE_LIBCURL="$(usex curl)" |
| 78 |
- -DENABLE_CPP="$(usex cxx)" |
| 79 |
- -DENABLE_UTILS="$(usex utils)" |
| 80 |
-DSPLASH_CMYK=OFF |
| 81 |
-DUSE_FIXEDPOINT=OFF |
| 82 |
-DUSE_FLOAT=OFF |
| 83 |
- -DWITH_Cairo="$(usex cairo)" |
| 84 |
- -DWITH_GObjectIntrospection="$(usex introspection)" |
| 85 |
- -DWITH_JPEG="$(usex jpeg)" |
| 86 |
- -DWITH_NSS3="$(usex nss)" |
| 87 |
- -DWITH_PNG="$(usex png)" |
| 88 |
+ -DWITH_Cairo=$(usex cairo) |
| 89 |
+ -DENABLE_LIBCURL=$(usex curl) |
| 90 |
+ -DENABLE_CPP=$(usex cxx) |
| 91 |
+ -DWITH_GObjectIntrospection=$(usex introspection) |
| 92 |
+ -DWITH_JPEG=$(usex jpeg) |
| 93 |
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) |
| 94 |
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) |
| 95 |
+ -DWITH_NSS3=$(usex nss) |
| 96 |
+ -DWITH_PNG=$(usex png) |
| 97 |
$(cmake-utils_use_find_package qt5 Qt5Core) |
| 98 |
- -DWITH_TIFF="$(usex tiff)" |
| 99 |
+ -DWITH_TIFF=$(usex tiff) |
| 100 |
+ -DENABLE_UTILS=$(usex utils) |
| 101 |
) |
| 102 |
- if use jpeg; then |
| 103 |
- mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
| 104 |
- else |
| 105 |
- mycmakeargs+=(-DENABLE_DCTDECODER=none) |
| 106 |
- fi |
| 107 |
- if use jpeg2k; then |
| 108 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
| 109 |
- else |
| 110 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
| 111 |
- fi |
| 112 |
if use lcms; then |
| 113 |
mycmakeargs+=(-DENABLE_CMS=lcms2) |
| 114 |
else |
Archives