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: Sat, 06 Nov 2021 13:48:07
Message-Id: 1636206458.4a0aa00ed7948a05ef8a75670dee60f4b93a410f.asturm@gentoo
1 commit: 4a0aa00ed7948a05ef8a75670dee60f4b93a410f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 6 13:47:22 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 6 13:47:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0aa00e
7
8 app-text/poppler: Drop 21.08.0, 21.09.0
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-text/poppler/Manifest | 2 -
14 app-text/poppler/poppler-21.08.0.ebuild | 126 --------------------------------
15 app-text/poppler/poppler-21.09.0.ebuild | 126 --------------------------------
16 3 files changed, 254 deletions(-)
17
18 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
19 index e7b624d08ad..b0746d8e9bf 100644
20 --- a/app-text/poppler/Manifest
21 +++ b/app-text/poppler/Manifest
22 @@ -1,4 +1,2 @@
23 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
24 -DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
25 -DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55
26 DIST poppler-21.10.0.tar.xz 1779668 BLAKE2B f4464b70ba031ed697443803c435a79498184fc9a74381f5ac7c6ee0f856d77d6e270fe0cea70ee9bbc54713ec69d45ea0ffc66e820d80061856d6711d584e04 SHA512 4a125784716ee578f5be39830cc5903c27eeb707d3756c2ff04ef97328ed8d9e35d3873b7731d2144997cb31794674a1bd35461c84d4237335db27c8df43e4f1
27
28 diff --git a/app-text/poppler/poppler-21.08.0.ebuild b/app-text/poppler/poppler-21.08.0.ebuild
29 deleted file mode 100644
30 index be72663ad68..00000000000
31 --- a/app-text/poppler/poppler-21.08.0.ebuild
32 +++ /dev/null
33 @@ -1,126 +0,0 @@
34 -# Copyright 2005-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit cmake toolchain-funcs xdg-utils
40 -
41 -if [[ ${PV} == *9999* ]] ; then
42 - inherit git-r3
43 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
44 - SLOT="0/9999"
45 -else
46 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
47 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 - SLOT="0/112" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
49 -fi
50 -
51 -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
52 -HOMEPAGE="https://poppler.freedesktop.org/"
53 -
54 -LICENSE="GPL-2"
55 -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
56 -
57 -# No test data provided
58 -RESTRICT="test"
59 -
60 -BDEPEND="
61 - dev-util/glib-utils
62 - virtual/pkgconfig
63 -"
64 -DEPEND="
65 - media-libs/fontconfig
66 - media-libs/freetype
67 - sys-libs/zlib
68 - cairo? (
69 - dev-libs/glib:2
70 - x11-libs/cairo
71 - introspection? ( dev-libs/gobject-introspection:= )
72 - )
73 - curl? ( net-misc/curl )
74 - jpeg? ( virtual/jpeg:0 )
75 - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
76 - lcms? ( media-libs/lcms:2 )
77 - nss? ( >=dev-libs/nss-3.19:0 )
78 - png? ( media-libs/libpng:0= )
79 - qt5? (
80 - dev-qt/qtcore:5
81 - dev-qt/qtgui:5
82 - dev-qt/qtxml:5
83 - )
84 - tiff? ( media-libs/tiff:0 )
85 -"
86 -RDEPEND="${DEPEND}
87 - cjk? ( app-text/poppler-data )
88 -"
89 -DEPEND+="
90 - boost? ( dev-libs/boost )
91 -"
92 -
93 -DOCS=( AUTHORS NEWS README.md README-XPDF )
94 -
95 -PATCHES=(
96 - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
97 - "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
98 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
99 -)
100 -
101 -src_prepare() {
102 - cmake_src_prepare
103 -
104 - # Clang doesn't grok this flag, the configure nicely tests that, but
105 - # cmake just uses it, so remove it if we use clang
106 - if [[ ${CC} == clang ]] ; then
107 - sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
108 - fi
109 -
110 - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
111 - sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
112 - -i CMakeLists.txt || die
113 - else
114 - einfo "policy(SET CMP0002 OLD) - workaround can be removed"
115 - fi
116 -}
117 -
118 -src_configure() {
119 - xdg_environment_reset
120 - local mycmakeargs=(
121 - -DBUILD_GTK_TESTS=OFF
122 - -DBUILD_QT5_TESTS=OFF
123 - -DBUILD_CPP_TESTS=OFF
124 - -DBUILD_MANUAL_TESTS=OFF
125 - -DRUN_GPERF_IF_PRESENT=OFF
126 - -DENABLE_BOOST="$(usex boost)"
127 - -DENABLE_ZLIB=ON
128 - -DENABLE_ZLIB_UNCOMPRESS=OFF
129 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
130 - -DUSE_FLOAT=OFF
131 - -DWITH_Cairo=$(usex cairo)
132 - -DENABLE_LIBCURL=$(usex curl)
133 - -DENABLE_CPP=$(usex cxx)
134 - -DWITH_JPEG=$(usex jpeg)
135 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
136 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
137 - -DENABLE_CMS=$(usex lcms lcms2 none)
138 - -DWITH_NSS3=$(usex nss)
139 - -DWITH_PNG=$(usex png)
140 - $(cmake_use_find_package qt5 Qt5Core)
141 - -DWITH_TIFF=$(usex tiff)
142 - -DENABLE_UTILS=$(usex utils)
143 - -DENABLE_QT6=OFF
144 - )
145 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
146 -
147 - cmake_src_configure
148 -}
149 -
150 -src_install() {
151 - cmake_src_install
152 -
153 - # live version doesn't provide html documentation
154 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
155 - # For now install gtk-doc there
156 - insinto /usr/share/gtk-doc/html/poppler
157 - doins -r "${S}"/glib/reference/html/*
158 - fi
159 -}
160
161 diff --git a/app-text/poppler/poppler-21.09.0.ebuild b/app-text/poppler/poppler-21.09.0.ebuild
162 deleted file mode 100644
163 index 20065b9bb13..00000000000
164 --- a/app-text/poppler/poppler-21.09.0.ebuild
165 +++ /dev/null
166 @@ -1,126 +0,0 @@
167 -# Copyright 2005-2021 Gentoo Authors
168 -# Distributed under the terms of the GNU General Public License v2
169 -
170 -EAPI=7
171 -
172 -inherit cmake toolchain-funcs xdg-utils
173 -
174 -if [[ ${PV} == *9999* ]] ; then
175 - inherit git-r3
176 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
177 - SLOT="0/9999"
178 -else
179 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
180 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
181 - SLOT="0/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
182 -fi
183 -
184 -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
185 -HOMEPAGE="https://poppler.freedesktop.org/"
186 -
187 -LICENSE="GPL-2"
188 -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
189 -
190 -# No test data provided
191 -RESTRICT="test"
192 -
193 -DEPEND="
194 - media-libs/fontconfig
195 - media-libs/freetype
196 - sys-libs/zlib
197 - cairo? (
198 - dev-libs/glib:2
199 - x11-libs/cairo
200 - introspection? ( dev-libs/gobject-introspection:= )
201 - )
202 - curl? ( net-misc/curl )
203 - jpeg? ( virtual/jpeg:0 )
204 - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
205 - lcms? ( media-libs/lcms:2 )
206 - nss? ( >=dev-libs/nss-3.19:0 )
207 - png? ( media-libs/libpng:0= )
208 - qt5? (
209 - dev-qt/qtcore:5
210 - dev-qt/qtgui:5
211 - dev-qt/qtxml:5
212 - )
213 - tiff? ( media-libs/tiff:0 )
214 -"
215 -RDEPEND="${DEPEND}
216 - cjk? ( app-text/poppler-data )
217 -"
218 -DEPEND+="
219 - boost? ( dev-libs/boost )
220 -"
221 -BDEPEND="
222 - dev-util/glib-utils
223 - virtual/pkgconfig
224 -"
225 -
226 -DOCS=( AUTHORS NEWS README.md README-XPDF )
227 -
228 -PATCHES=(
229 - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
230 - "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
231 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
232 -)
233 -
234 -src_prepare() {
235 - cmake_src_prepare
236 -
237 - # Clang doesn't grok this flag, the configure nicely tests that, but
238 - # cmake just uses it, so remove it if we use clang
239 - if tc-is-clang ; then
240 - sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
241 - fi
242 -
243 - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
244 - sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
245 - -i CMakeLists.txt || die
246 - else
247 - einfo "policy(SET CMP0002 OLD) - workaround can be removed"
248 - fi
249 -}
250 -
251 -src_configure() {
252 - xdg_environment_reset
253 - local mycmakeargs=(
254 - -DBUILD_GTK_TESTS=OFF
255 - -DBUILD_QT5_TESTS=OFF
256 - -DBUILD_CPP_TESTS=OFF
257 - -DBUILD_MANUAL_TESTS=OFF
258 - -DRUN_GPERF_IF_PRESENT=OFF
259 - -DENABLE_BOOST="$(usex boost)"
260 - -DENABLE_ZLIB=ON
261 - -DENABLE_ZLIB_UNCOMPRESS=OFF
262 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
263 - -DUSE_FLOAT=OFF
264 - -DWITH_Cairo=$(usex cairo)
265 - -DENABLE_LIBCURL=$(usex curl)
266 - -DENABLE_CPP=$(usex cxx)
267 - -DWITH_JPEG=$(usex jpeg)
268 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
269 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
270 - -DENABLE_CMS=$(usex lcms lcms2 none)
271 - -DWITH_NSS3=$(usex nss)
272 - -DWITH_PNG=$(usex png)
273 - $(cmake_use_find_package qt5 Qt5Core)
274 - -DWITH_TIFF=$(usex tiff)
275 - -DENABLE_UTILS=$(usex utils)
276 - -DENABLE_QT6=OFF
277 - )
278 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
279 -
280 - cmake_src_configure
281 -}
282 -
283 -src_install() {
284 - cmake_src_install
285 -
286 - # live version doesn't provide html documentation
287 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
288 - # For now install gtk-doc there
289 - insinto /usr/share/gtk-doc/html/poppler
290 - doins -r "${S}"/glib/reference/html/*
291 - fi
292 -}