Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Fri, 05 Jan 2018 00:35:12
Message-Id: 1515112468.e0b5411244394e95a1019d4562059336e054ed82.asturm@gentoo
1 commit: e0b5411244394e95a1019d4562059336e054ed82
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 22:36:20 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=e0b54112
7
8 app-text/poppler: Fix configure with USE=-lcms
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-text/poppler/poppler-0.62.0.ebuild | 6 +-----
13 app-text/poppler/poppler-9999.ebuild | 6 +-----
14 2 files changed, 2 insertions(+), 10 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 f27024c8297..9934ad402fa 100644
18 --- a/app-text/poppler/poppler-0.62.0.ebuild
19 +++ b/app-text/poppler/poppler-0.62.0.ebuild
20 @@ -103,17 +103,13 @@ src_configure() {
21 -DWITH_JPEG=$(usex jpeg)
22 -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
23 -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
24 + -DENABLE_CMS=$(usex lcms lcms2 none)
25 -DWITH_NSS3=$(usex nss)
26 -DWITH_PNG=$(usex png)
27 $(cmake-utils_use_find_package qt5 Qt5Core)
28 -DWITH_TIFF=$(usex tiff)
29 -DENABLE_UTILS=$(usex utils)
30 )
31 - if use lcms; then
32 - mycmakeargs+=(-DENABLE_CMS=lcms2)
33 - else
34 - mycmakeargs+=(-DENABLE_CMS=)
35 - fi
36
37 cmake-utils_src_configure
38 }
39
40 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
41 index 872ded8f4d0..a2559d99b50 100644
42 --- a/app-text/poppler/poppler-9999.ebuild
43 +++ b/app-text/poppler/poppler-9999.ebuild
44 @@ -103,17 +103,13 @@ src_configure() {
45 -DWITH_JPEG=$(usex jpeg)
46 -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
47 -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
48 + -DENABLE_CMS=$(usex lcms lcms2 none)
49 -DWITH_NSS3=$(usex nss)
50 -DWITH_PNG=$(usex png)
51 $(cmake-utils_use_find_package qt5 Qt5Core)
52 -DWITH_TIFF=$(usex tiff)
53 -DENABLE_UTILS=$(usex utils)
54 )
55 - if use lcms; then
56 - mycmakeargs+=(-DENABLE_CMS=lcms2)
57 - else
58 - mycmakeargs+=(-DENABLE_CMS=)
59 - fi
60
61 cmake-utils_src_configure
62 }