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