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: Fri, 29 Nov 2019 09:55:14
Message-Id: 1575021306.a3ae27cca09761aa7fe4c8d1f1c9a4113a4d9272.polynomial-c@gentoo
1 commit: a3ae27cca09761aa7fe4c8d1f1c9a4113a4d9272
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 29 09:54:51 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 29 09:55:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ae27cc
7
8 app-text/poppler: Removed old
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.19
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-text/poppler/Manifest | 2 -
14 app-text/poppler/poppler-0.80.0.ebuild | 126 ---------------------------------
15 app-text/poppler/poppler-0.81.0.ebuild | 122 -------------------------------
16 3 files changed, 250 deletions(-)
17
18 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
19 index e5c6dbe0e6c..13e16601467 100644
20 --- a/app-text/poppler/Manifest
21 +++ b/app-text/poppler/Manifest
22 @@ -1,5 +1,3 @@
23 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
24 -DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
25 -DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b
26 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
27 DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
28
29 diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
30 deleted file mode 100644
31 index c2f563333cc..00000000000
32 --- a/app-text/poppler/poppler-0.80.0.ebuild
33 +++ /dev/null
34 @@ -1,126 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit cmake-utils flag-o-matic 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/90" # 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.78.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-utils_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 - # we need to up the C++ version, bug #622526, #643278
118 - append-cxxflags -std=c++11
119 -}
120 -
121 -src_configure() {
122 - xdg_environment_reset
123 - local mycmakeargs=(
124 - -DBUILD_GTK_TESTS=OFF
125 - -DBUILD_QT5_TESTS=OFF
126 - -DBUILD_CPP_TESTS=OFF
127 - -DENABLE_SPLASH=ON
128 - -DENABLE_ZLIB=ON
129 - -DENABLE_ZLIB_UNCOMPRESS=OFF
130 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
131 - -DSPLASH_CMYK=OFF
132 - -DUSE_FLOAT=OFF
133 - -DWITH_Cairo=$(usex cairo)
134 - -DENABLE_LIBCURL=$(usex curl)
135 - -DENABLE_CPP=$(usex cxx)
136 - -DWITH_JPEG=$(usex jpeg)
137 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
138 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
139 - -DENABLE_CMS=$(usex lcms lcms2 none)
140 - -DWITH_NSS3=$(usex nss)
141 - -DWITH_PNG=$(usex png)
142 - $(cmake-utils_use_find_package qt5 Qt5Core)
143 - -DWITH_TIFF=$(usex tiff)
144 - -DENABLE_UTILS=$(usex utils)
145 - )
146 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
147 -
148 - cmake-utils_src_configure
149 -}
150 -
151 -src_install() {
152 - cmake-utils_src_install
153 -
154 - # live version doesn't provide html documentation
155 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
156 - # For now install gtk-doc there
157 - insinto /usr/share/gtk-doc/html/poppler
158 - doins -r "${S}"/glib/reference/html/*
159 - fi
160 -}
161
162 diff --git a/app-text/poppler/poppler-0.81.0.ebuild b/app-text/poppler/poppler-0.81.0.ebuild
163 deleted file mode 100644
164 index 86a7cd33bcc..00000000000
165 --- a/app-text/poppler/poppler-0.81.0.ebuild
166 +++ /dev/null
167 @@ -1,122 +0,0 @@
168 -# Copyright 2005-2019 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=7
172 -
173 -inherit cmake-utils toolchain-funcs xdg-utils
174 -
175 -if [[ ${PV} == *9999* ]] ; then
176 - inherit git-r3
177 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
178 - SLOT="0/9999"
179 -else
180 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
181 - 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"
182 - SLOT="0/91" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
183 -fi
184 -
185 -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
186 -HOMEPAGE="https://poppler.freedesktop.org/"
187 -
188 -LICENSE="GPL-2"
189 -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
190 -
191 -# No test data provided
192 -RESTRICT="test"
193 -
194 -BDEPEND="
195 - dev-util/glib-utils
196 - virtual/pkgconfig
197 -"
198 -DEPEND="
199 - media-libs/fontconfig
200 - media-libs/freetype
201 - sys-libs/zlib
202 - cairo? (
203 - dev-libs/glib:2
204 - x11-libs/cairo
205 - introspection? ( dev-libs/gobject-introspection:= )
206 - )
207 - curl? ( net-misc/curl )
208 - jpeg? ( virtual/jpeg:0 )
209 - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
210 - lcms? ( media-libs/lcms:2 )
211 - nss? ( >=dev-libs/nss-3.19:0 )
212 - png? ( media-libs/libpng:0= )
213 - qt5? (
214 - dev-qt/qtcore:5
215 - dev-qt/qtgui:5
216 - dev-qt/qtxml:5
217 - )
218 - tiff? ( media-libs/tiff:0 )
219 -"
220 -RDEPEND="${DEPEND}
221 - cjk? ( app-text/poppler-data )
222 -"
223 -
224 -DOCS=( AUTHORS NEWS README.md README-XPDF )
225 -
226 -PATCHES=(
227 - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
228 - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
229 - "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
230 - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
231 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
232 -)
233 -
234 -src_prepare() {
235 - cmake-utils_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 [[ ${CC} == 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 - -DENABLE_SPLASH=ON
258 - -DENABLE_ZLIB=ON
259 - -DENABLE_ZLIB_UNCOMPRESS=OFF
260 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
261 - -DUSE_FLOAT=OFF
262 - -DWITH_Cairo=$(usex cairo)
263 - -DENABLE_LIBCURL=$(usex curl)
264 - -DENABLE_CPP=$(usex cxx)
265 - -DWITH_JPEG=$(usex jpeg)
266 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
267 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
268 - -DENABLE_CMS=$(usex lcms lcms2 none)
269 - -DWITH_NSS3=$(usex nss)
270 - -DWITH_PNG=$(usex png)
271 - $(cmake-utils_use_find_package qt5 Qt5Core)
272 - -DWITH_TIFF=$(usex tiff)
273 - -DENABLE_UTILS=$(usex utils)
274 - )
275 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
276 -
277 - cmake-utils_src_configure
278 -}
279 -
280 -src_install() {
281 - cmake-utils_src_install
282 -
283 - # live version doesn't provide html documentation
284 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
285 - # For now install gtk-doc there
286 - insinto /usr/share/gtk-doc/html/poppler
287 - doins -r "${S}"/glib/reference/html/*
288 - fi
289 -}