1 |
commit: 357c85826836ee9843910f31752aa7b19d3a570a |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 22 11:51:14 2017 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 22 11:51:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357c8582 |
7 |
|
8 |
app-text/poppler: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
app-text/poppler/Manifest | 1 - |
13 |
app-text/poppler/poppler-0.55.0-r1.ebuild | 142 ------------------------------ |
14 |
app-text/poppler/poppler-0.55.0.ebuild | 136 ---------------------------- |
15 |
3 files changed, 279 deletions(-) |
16 |
|
17 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
18 |
index 45993c10e3a..4e899b89caa 100644 |
19 |
--- a/app-text/poppler/Manifest |
20 |
+++ b/app-text/poppler/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8 |
23 |
-DIST poppler-0.55.0.tar.xz 1700440 SHA256 537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 SHA512 ea3008f2945da862236fcc64d320367e04e3c71d4cc5e996e0c50ac49457e5e42eb06af92486fe7f15c04f07a88367f5344f8dc76549c57c4a19e2fbb60f55d6 WHIRLPOOL 9aec88be85548d217f90fedb12530b5a61e2bf8172154146b3003d6ebbe53b6b2af947ec6f07ddde499a6b0863090470d1b379485984e27068e6741ef3bbf101 |
24 |
DIST poppler-0.56.0.tar.xz 1701488 SHA256 869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173 SHA512 74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528 WHIRLPOOL 3b7b4330306f46bc6c1f72205a8cff95f23a82011260a629762ad52bdcbc89e5c071da8aeb48c15ff21e7b38893aa01b3421d9d232938ac8a61745f798271b04 |
25 |
|
26 |
diff --git a/app-text/poppler/poppler-0.55.0-r1.ebuild b/app-text/poppler/poppler-0.55.0-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index d429f13df27..00000000000 |
29 |
--- a/app-text/poppler/poppler-0.55.0-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,142 +0,0 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-inherit cmake-utils toolchain-funcs xdg-utils |
38 |
- |
39 |
-if [[ "${PV}" == "9999" ]] ; then |
40 |
- inherit git-r3 |
41 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
42 |
- SLOT="0/9999" |
43 |
-else |
44 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
45 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
46 |
- SLOT="0/67" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
47 |
-fi |
48 |
- |
49 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
50 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
54 |
- |
55 |
-# No test data provided |
56 |
-RESTRICT="test" |
57 |
- |
58 |
-COMMON_DEPEND=" |
59 |
- >=media-libs/fontconfig-2.6.0 |
60 |
- >=media-libs/freetype-2.3.9 |
61 |
- sys-libs/zlib |
62 |
- cairo? ( |
63 |
- dev-libs/glib:2 |
64 |
- >=x11-libs/cairo-1.10.0 |
65 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) |
66 |
- ) |
67 |
- curl? ( net-misc/curl ) |
68 |
- jpeg? ( virtual/jpeg:0 ) |
69 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
70 |
- lcms? ( media-libs/lcms:2 ) |
71 |
- nss? ( >=dev-libs/nss-3.19:0 ) |
72 |
- png? ( media-libs/libpng:0= ) |
73 |
- qt4? ( |
74 |
- dev-qt/qtcore:4 |
75 |
- dev-qt/qtgui:4 |
76 |
- ) |
77 |
- qt5? ( |
78 |
- dev-qt/qtcore:5 |
79 |
- dev-qt/qtgui:5 |
80 |
- dev-qt/qtxml:5 |
81 |
- ) |
82 |
- tiff? ( media-libs/tiff:0 ) |
83 |
-" |
84 |
-DEPEND="${COMMON_DEPEND} |
85 |
- virtual/pkgconfig |
86 |
-" |
87 |
-RDEPEND="${COMMON_DEPEND} |
88 |
- cjk? ( >=app-text/poppler-data-0.4.7 ) |
89 |
-" |
90 |
- |
91 |
-DOCS=(AUTHORS NEWS README README-XPDF TODO) |
92 |
- |
93 |
-PATCHES=( |
94 |
- "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" |
95 |
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
96 |
- "${FILESDIR}/${PN}-0.53.0-respect-cflags.patch" |
97 |
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
98 |
- "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
99 |
- "${FILESDIR}/${PN}-0.55.0-CVE-2017-7511.patch" |
100 |
-) |
101 |
- |
102 |
-src_prepare() { |
103 |
- cmake-utils_src_prepare |
104 |
- |
105 |
- # Clang doesn't grok this flag, the configure nicely tests that, but |
106 |
- # cmake just uses it, so remove it if we use clang |
107 |
- if [[ ${CC} == clang ]] ; then |
108 |
- sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
109 |
- fi |
110 |
- |
111 |
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
112 |
- sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
113 |
- -i CMakeLists.txt || die |
114 |
- else |
115 |
- einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
116 |
- fi |
117 |
-} |
118 |
- |
119 |
-src_configure() { |
120 |
- xdg_environment_reset |
121 |
- local mycmakeargs=( |
122 |
- -DBUILD_GTK_TESTS=OFF |
123 |
- -DBUILD_QT4_TESTS=OFF |
124 |
- -DBUILD_QT5_TESTS=OFF |
125 |
- -DBUILD_CPP_TESTS=OFF |
126 |
- -DENABLE_SPLASH=ON |
127 |
- -DENABLE_ZLIB=ON |
128 |
- -DENABLE_ZLIB_UNCOMPRESS=OFF |
129 |
- -DENABLE_XPDF_HEADERS=ON |
130 |
- -DENABLE_LIBCURL="$(usex curl)" |
131 |
- -DENABLE_CPP="$(usex cxx)" |
132 |
- -DENABLE_UTILS="$(usex utils)" |
133 |
- -DSPLASH_CMYK=OFF |
134 |
- -DUSE_FIXEDPOINT=OFF |
135 |
- -DUSE_FLOAT=OFF |
136 |
- -DWITH_Cairo="$(usex cairo)" |
137 |
- -DWITH_GObjectIntrospection="$(usex introspection)" |
138 |
- -DWITH_JPEG="$(usex jpeg)" |
139 |
- -DWITH_NSS3="$(usex nss)" |
140 |
- -DWITH_PNG="$(usex png)" |
141 |
- -DWITH_Qt4="$(usex qt4)" |
142 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
143 |
- -DWITH_TIFF="$(usex tiff)" |
144 |
- ) |
145 |
- if use jpeg; then |
146 |
- mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
147 |
- else |
148 |
- mycmakeargs+=(-DENABLE_DCTDECODER=none) |
149 |
- fi |
150 |
- if use jpeg2k; then |
151 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
152 |
- else |
153 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
154 |
- fi |
155 |
- if use lcms; then |
156 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
157 |
- else |
158 |
- mycmakeargs+=(-DENABLE_CMS=) |
159 |
- fi |
160 |
- |
161 |
- cmake-utils_src_configure |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- cmake-utils_src_install |
166 |
- |
167 |
- # live version doesn't provide html documentation |
168 |
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
169 |
- # For now install gtk-doc there |
170 |
- insinto /usr/share/gtk-doc/html/poppler |
171 |
- doins -r "${S}"/glib/reference/html/* |
172 |
- fi |
173 |
-} |
174 |
|
175 |
diff --git a/app-text/poppler/poppler-0.55.0.ebuild b/app-text/poppler/poppler-0.55.0.ebuild |
176 |
deleted file mode 100644 |
177 |
index 289730d1abc..00000000000 |
178 |
--- a/app-text/poppler/poppler-0.55.0.ebuild |
179 |
+++ /dev/null |
180 |
@@ -1,136 +0,0 @@ |
181 |
-# Copyright 1999-2017 Gentoo Foundation |
182 |
-# Distributed under the terms of the GNU General Public License v2 |
183 |
- |
184 |
-EAPI=6 |
185 |
- |
186 |
-inherit cmake-utils toolchain-funcs xdg-utils |
187 |
- |
188 |
-if [[ "${PV}" == "9999" ]] ; then |
189 |
- inherit git-r3 |
190 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
191 |
- SLOT="0/9999" |
192 |
-else |
193 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
194 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
195 |
- SLOT="0/67" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
196 |
-fi |
197 |
- |
198 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
199 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
200 |
- |
201 |
-LICENSE="GPL-2" |
202 |
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
203 |
- |
204 |
-# No test data provided |
205 |
-RESTRICT="test" |
206 |
- |
207 |
-COMMON_DEPEND=" |
208 |
- >=media-libs/fontconfig-2.6.0 |
209 |
- >=media-libs/freetype-2.3.9 |
210 |
- sys-libs/zlib |
211 |
- cairo? ( |
212 |
- dev-libs/glib:2 |
213 |
- >=x11-libs/cairo-1.10.0 |
214 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) |
215 |
- ) |
216 |
- curl? ( net-misc/curl ) |
217 |
- jpeg? ( virtual/jpeg:0 ) |
218 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
219 |
- lcms? ( media-libs/lcms:2 ) |
220 |
- nss? ( >=dev-libs/nss-3.19:0 ) |
221 |
- png? ( media-libs/libpng:0= ) |
222 |
- qt4? ( |
223 |
- dev-qt/qtcore:4 |
224 |
- dev-qt/qtgui:4 |
225 |
- ) |
226 |
- qt5? ( |
227 |
- dev-qt/qtcore:5 |
228 |
- dev-qt/qtgui:5 |
229 |
- dev-qt/qtxml:5 |
230 |
- ) |
231 |
- tiff? ( media-libs/tiff:0 ) |
232 |
-" |
233 |
-DEPEND="${COMMON_DEPEND} |
234 |
- virtual/pkgconfig |
235 |
-" |
236 |
-RDEPEND="${COMMON_DEPEND} |
237 |
- cjk? ( >=app-text/poppler-data-0.4.7 ) |
238 |
-" |
239 |
- |
240 |
-DOCS=(AUTHORS NEWS README README-XPDF TODO) |
241 |
- |
242 |
-PATCHES=( |
243 |
- "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" |
244 |
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
245 |
- "${FILESDIR}/${PN}-0.53.0-respect-cflags.patch" |
246 |
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
247 |
- "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
248 |
-) |
249 |
- |
250 |
-src_prepare() { |
251 |
- cmake-utils_src_prepare |
252 |
- |
253 |
- # Clang doesn't grok this flag, the configure nicely tests that, but |
254 |
- # cmake just uses it, so remove it if we use clang |
255 |
- if [[ ${CC} == clang ]] ; then |
256 |
- sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
257 |
- fi |
258 |
- |
259 |
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
260 |
- sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
261 |
- -i CMakeLists.txt || die |
262 |
- else |
263 |
- einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
264 |
- fi |
265 |
-} |
266 |
- |
267 |
-src_configure() { |
268 |
- xdg_environment_reset |
269 |
- local mycmakeargs=( |
270 |
- -DBUILD_GTK_TESTS=OFF |
271 |
- -DBUILD_QT4_TESTS=OFF |
272 |
- -DBUILD_QT5_TESTS=OFF |
273 |
- -DBUILD_CPP_TESTS=OFF |
274 |
- -DENABLE_SPLASH=ON |
275 |
- -DENABLE_ZLIB=ON |
276 |
- -DENABLE_ZLIB_UNCOMPRESS=OFF |
277 |
- -DENABLE_XPDF_HEADERS=ON |
278 |
- -DENABLE_LIBCURL="$(usex curl)" |
279 |
- -DENABLE_CPP="$(usex cxx)" |
280 |
- -DENABLE_UTILS="$(usex utils)" |
281 |
- -DSPLASH_CMYK=OFF |
282 |
- -DUSE_FIXEDPOINT=OFF |
283 |
- -DUSE_FLOAT=OFF |
284 |
- -DWITH_Cairo="$(usex cairo)" |
285 |
- -DWITH_GObjectIntrospection="$(usex introspection)" |
286 |
- -DWITH_JPEG="$(usex jpeg)" |
287 |
- -DWITH_NSS3="$(usex nss)" |
288 |
- -DWITH_PNG="$(usex png)" |
289 |
- -DWITH_Qt4="$(usex qt4)" |
290 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
291 |
- -DWITH_TIFF="$(usex tiff)" |
292 |
- ) |
293 |
- if use jpeg2k; then |
294 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
295 |
- else |
296 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=) |
297 |
- fi |
298 |
- if use lcms; then |
299 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
300 |
- else |
301 |
- mycmakeargs+=(-DENABLE_CMS=) |
302 |
- fi |
303 |
- |
304 |
- cmake-utils_src_configure |
305 |
-} |
306 |
- |
307 |
-src_install() { |
308 |
- cmake-utils_src_install |
309 |
- |
310 |
- # live version doesn't provide html documentation |
311 |
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
312 |
- # For now install gtk-doc there |
313 |
- insinto /usr/share/gtk-doc/html/poppler |
314 |
- doins -r "${S}"/glib/reference/html/* |
315 |
- fi |
316 |
-} |