Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Sat, 12 Jun 2021 17:07:31
Message-Id: 1623517637.20b5d06291dacca192f08b6b901050c834c9e2b0.polynomial-c@gentoo
1 commit: 20b5d06291dacca192f08b6b901050c834c9e2b0
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 12 17:07:17 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 12 17:07:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b5d062
7
8 app-text/poppler: Make splash backend build optional
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 app-text/poppler/metadata.xml | 1 +
13 app-text/poppler/poppler-21.06.1.ebuild | 10 ++++++----
14 app-text/poppler/poppler-9999.ebuild | 10 ++++++----
15 3 files changed, 13 insertions(+), 8 deletions(-)
16
17 diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
18 index 6f044d376b2..91f9161a0e0 100644
19 --- a/app-text/poppler/metadata.xml
20 +++ b/app-text/poppler/metadata.xml
21 @@ -22,6 +22,7 @@
22 </upstream>
23 <use>
24 <flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
25 + <flag name="splash">Build the Splash graphics backend (requires <pkg>dev-libs/boost</pkg>)</flag>
26 <flag name="utils">Install command-line PDF converters and various utilities.</flag>
27 </use>
28 <slots>
29
30 diff --git a/app-text/poppler/poppler-21.06.1.ebuild b/app-text/poppler/poppler-21.06.1.ebuild
31 index d635ec8b9d3..048302fba12 100644
32 --- a/app-text/poppler/poppler-21.06.1.ebuild
33 +++ b/app-text/poppler/poppler-21.06.1.ebuild
34 @@ -19,13 +19,12 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
35 HOMEPAGE="https://poppler.freedesktop.org/"
36
37 LICENSE="GPL-2"
38 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
39 +IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
40
41 # No test data provided
42 RESTRICT="test"
43
44 BDEPEND="
45 - dev-libs/boost
46 dev-util/glib-utils
47 virtual/pkgconfig
48 "
49 @@ -54,6 +53,9 @@ DEPEND="
50 RDEPEND="${DEPEND}
51 cjk? ( app-text/poppler-data )
52 "
53 +DEPEND+="
54 + splash? ( dev-libs/boost )
55 +"
56
57 DOCS=( AUTHORS NEWS README.md README-XPDF )
58
59 @@ -89,8 +91,8 @@ src_configure() {
60 -DBUILD_MANUAL_TESTS=OFF
61 -DRUN_GPERF_IF_PRESENT=OFF
62 # Required for SPLASH
63 - -DENABLE_BOOST=ON
64 - -DENABLE_SPLASH=ON
65 + -DENABLE_BOOST="$(usex splash)"
66 + -DENABLE_SPLASH="$(usex splash)"
67 -DENABLE_ZLIB=ON
68 -DENABLE_ZLIB_UNCOMPRESS=OFF
69 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
70
71 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
72 index d635ec8b9d3..048302fba12 100644
73 --- a/app-text/poppler/poppler-9999.ebuild
74 +++ b/app-text/poppler/poppler-9999.ebuild
75 @@ -19,13 +19,12 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
76 HOMEPAGE="https://poppler.freedesktop.org/"
77
78 LICENSE="GPL-2"
79 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
80 +IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
81
82 # No test data provided
83 RESTRICT="test"
84
85 BDEPEND="
86 - dev-libs/boost
87 dev-util/glib-utils
88 virtual/pkgconfig
89 "
90 @@ -54,6 +53,9 @@ DEPEND="
91 RDEPEND="${DEPEND}
92 cjk? ( app-text/poppler-data )
93 "
94 +DEPEND+="
95 + splash? ( dev-libs/boost )
96 +"
97
98 DOCS=( AUTHORS NEWS README.md README-XPDF )
99
100 @@ -89,8 +91,8 @@ src_configure() {
101 -DBUILD_MANUAL_TESTS=OFF
102 -DRUN_GPERF_IF_PRESENT=OFF
103 # Required for SPLASH
104 - -DENABLE_BOOST=ON
105 - -DENABLE_SPLASH=ON
106 + -DENABLE_BOOST="$(usex splash)"
107 + -DENABLE_SPLASH="$(usex splash)"
108 -DENABLE_ZLIB=ON
109 -DENABLE_ZLIB_UNCOMPRESS=OFF
110 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON