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: Sun, 31 May 2020 21:19:42
Message-Id: 1590959966.06869013761278c7198c31ebd97e40f6072fc8cb.asturm@gentoo
1 commit: 06869013761278c7198c31ebd97e40f6072fc8cb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 21:19:14 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 21:19:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06869013
7
8 app-text/poppler: Drop 0.85.0 and 0.87.0
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-text/poppler/Manifest | 2 -
14 app-text/poppler/poppler-0.85.0.ebuild | 123 ---------------------------------
15 app-text/poppler/poppler-0.87.0.ebuild | 123 ---------------------------------
16 3 files changed, 248 deletions(-)
17
18 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
19 index 55e3e5b4545..c4520017c23 100644
20 --- a/app-text/poppler/Manifest
21 +++ b/app-text/poppler/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
24 -DIST poppler-0.87.0.tar.xz 1595088 BLAKE2B 7bce4426b057ae8702399f0f3581ee844df89b01151dff9212e1d2c525847eba7614697ef02cc7278930b5e266e15f62d3b7c5d989951d44c62ee3f8fb9b2835 SHA512 4bdc432c75106b3f37643bfd57c66aba659864fdc3c4d9ffa5089ceaa33ad3bd10d2c4abfb09a4f7b9d7d137e31eb559b440d7df53f35f60d70eaef05f987630
25 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
26 DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
27
28 diff --git a/app-text/poppler/poppler-0.85.0.ebuild b/app-text/poppler/poppler-0.85.0.ebuild
29 deleted file mode 100644
30 index 28074680e78..00000000000
31 --- a/app-text/poppler/poppler-0.85.0.ebuild
32 +++ /dev/null
33 @@ -1,123 +0,0 @@
34 -# Copyright 2005-2020 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 - SLOT="0/95" # 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="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 -
90 -DOCS=( AUTHORS NEWS README.md README-XPDF )
91 -
92 -PATCHES=(
93 - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
94 - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
95 - "${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
96 - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
97 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
98 -)
99 -
100 -src_prepare() {
101 - cmake_src_prepare
102 -
103 - # Clang doesn't grok this flag, the configure nicely tests that, but
104 - # cmake just uses it, so remove it if we use clang
105 - if [[ ${CC} == clang ]] ; then
106 - sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
107 - fi
108 -
109 - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
110 - sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
111 - -i CMakeLists.txt || die
112 - else
113 - einfo "policy(SET CMP0002 OLD) - workaround can be removed"
114 - fi
115 -}
116 -
117 -src_configure() {
118 - xdg_environment_reset
119 - local mycmakeargs=(
120 - -DBUILD_GTK_TESTS=OFF
121 - -DBUILD_QT5_TESTS=OFF
122 - -DBUILD_CPP_TESTS=OFF
123 - -DRUN_GPERF_IF_PRESENT=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.87.0.ebuild b/app-text/poppler/poppler-0.87.0.ebuild
159 deleted file mode 100644
160 index da61f3d0f0f..00000000000
161 --- a/app-text/poppler/poppler-0.87.0.ebuild
162 +++ /dev/null
163 @@ -1,123 +0,0 @@
164 -# Copyright 2005-2020 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
178 - SLOT="0/98" # 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 - -DRUN_GPERF_IF_PRESENT=OFF
254 - -DENABLE_SPLASH=ON
255 - -DENABLE_ZLIB=ON
256 - -DENABLE_ZLIB_UNCOMPRESS=OFF
257 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
258 - -DUSE_FLOAT=OFF
259 - -DWITH_Cairo=$(usex cairo)
260 - -DENABLE_LIBCURL=$(usex curl)
261 - -DENABLE_CPP=$(usex cxx)
262 - -DWITH_JPEG=$(usex jpeg)
263 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
264 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
265 - -DENABLE_CMS=$(usex lcms lcms2 none)
266 - -DWITH_NSS3=$(usex nss)
267 - -DWITH_PNG=$(usex png)
268 - $(cmake_use_find_package qt5 Qt5Core)
269 - -DWITH_TIFF=$(usex tiff)
270 - -DENABLE_UTILS=$(usex utils)
271 - )
272 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
273 -
274 - cmake_src_configure
275 -}
276 -
277 -src_install() {
278 - cmake_src_install
279 -
280 - # live version doesn't provide html documentation
281 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
282 - # For now install gtk-doc there
283 - insinto /usr/share/gtk-doc/html/poppler
284 - doins -r "${S}"/glib/reference/html/*
285 - fi
286 -}