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: Fri, 04 Sep 2020 13:45:26
Message-Id: 1599227116.d303e7b93077ce67f87b70144f2d3decd04a730d.asturm@gentoo
1 commit: d303e7b93077ce67f87b70144f2d3decd04a730d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 4 13:35:56 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 13:45:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d303e7b9
7
8 app-text/poppler: Drop 0.89.0 and 20.08.0
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-text/poppler/Manifest | 2 -
14 app-text/poppler/poppler-0.89.0.ebuild | 123 -------------------------------
15 app-text/poppler/poppler-20.08.0.ebuild | 124 --------------------------------
16 3 files changed, 249 deletions(-)
17
18 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
19 index e445314b0ca..3b29834e61e 100644
20 --- a/app-text/poppler/Manifest
21 +++ b/app-text/poppler/Manifest
22 @@ -1,5 +1,3 @@
23 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
24 -DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
25 DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
26 -DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
27 DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
28
29 diff --git a/app-text/poppler/poppler-0.89.0.ebuild b/app-text/poppler/poppler-0.89.0.ebuild
30 deleted file mode 100644
31 index ce0b3727985..00000000000
32 --- a/app-text/poppler/poppler-0.89.0.ebuild
33 +++ /dev/null
34 @@ -1,123 +0,0 @@
35 -# Copyright 2005-2020 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
49 - SLOT="0/100" # 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 - -DRUN_GPERF_IF_PRESENT=OFF
125 - -DENABLE_SPLASH=ON
126 - -DENABLE_ZLIB=ON
127 - -DENABLE_ZLIB_UNCOMPRESS=OFF
128 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
129 - -DUSE_FLOAT=OFF
130 - -DWITH_Cairo=$(usex cairo)
131 - -DENABLE_LIBCURL=$(usex curl)
132 - -DENABLE_CPP=$(usex cxx)
133 - -DWITH_JPEG=$(usex jpeg)
134 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
135 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
136 - -DENABLE_CMS=$(usex lcms lcms2 none)
137 - -DWITH_NSS3=$(usex nss)
138 - -DWITH_PNG=$(usex png)
139 - $(cmake_use_find_package qt5 Qt5Core)
140 - -DWITH_TIFF=$(usex tiff)
141 - -DENABLE_UTILS=$(usex utils)
142 - )
143 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
144 -
145 - cmake_src_configure
146 -}
147 -
148 -src_install() {
149 - cmake_src_install
150 -
151 - # live version doesn't provide html documentation
152 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
153 - # For now install gtk-doc there
154 - insinto /usr/share/gtk-doc/html/poppler
155 - doins -r "${S}"/glib/reference/html/*
156 - fi
157 -}
158
159 diff --git a/app-text/poppler/poppler-20.08.0.ebuild b/app-text/poppler/poppler-20.08.0.ebuild
160 deleted file mode 100644
161 index 39d7375ed1b..00000000000
162 --- a/app-text/poppler/poppler-20.08.0.ebuild
163 +++ /dev/null
164 @@ -1,124 +0,0 @@
165 -# Copyright 2005-2020 Gentoo Authors
166 -# Distributed under the terms of the GNU General Public License v2
167 -
168 -EAPI=7
169 -
170 -inherit cmake toolchain-funcs xdg-utils
171 -
172 -if [[ ${PV} == *9999* ]] ; then
173 - inherit git-r3
174 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
175 - SLOT="0/9999"
176 -else
177 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
178 - 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"
179 - SLOT="0/102" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
180 -fi
181 -
182 -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
183 -HOMEPAGE="https://poppler.freedesktop.org/"
184 -
185 -LICENSE="GPL-2"
186 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
187 -
188 -# No test data provided
189 -RESTRICT="test"
190 -
191 -BDEPEND="
192 - dev-util/glib-utils
193 - virtual/pkgconfig
194 -"
195 -DEPEND="
196 - media-libs/fontconfig
197 - media-libs/freetype
198 - sys-libs/zlib
199 - cairo? (
200 - dev-libs/glib:2
201 - x11-libs/cairo
202 - introspection? ( dev-libs/gobject-introspection:= )
203 - )
204 - curl? ( net-misc/curl )
205 - jpeg? ( virtual/jpeg:0 )
206 - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
207 - lcms? ( media-libs/lcms:2 )
208 - nss? ( >=dev-libs/nss-3.19:0 )
209 - png? ( media-libs/libpng:0= )
210 - qt5? (
211 - dev-qt/qtcore:5
212 - dev-qt/qtgui:5
213 - dev-qt/qtxml:5
214 - )
215 - tiff? ( media-libs/tiff:0 )
216 -"
217 -RDEPEND="${DEPEND}
218 - cjk? ( app-text/poppler-data )
219 -"
220 -
221 -DOCS=( AUTHORS NEWS README.md README-XPDF )
222 -
223 -PATCHES=(
224 - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
225 - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
226 - "${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
227 - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
228 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
229 -)
230 -
231 -src_prepare() {
232 - cmake_src_prepare
233 -
234 - # Clang doesn't grok this flag, the configure nicely tests that, but
235 - # cmake just uses it, so remove it if we use clang
236 - if [[ ${CC} == clang ]] ; then
237 - sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
238 - fi
239 -
240 - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
241 - sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
242 - -i CMakeLists.txt || die
243 - else
244 - einfo "policy(SET CMP0002 OLD) - workaround can be removed"
245 - fi
246 -}
247 -
248 -src_configure() {
249 - xdg_environment_reset
250 - local mycmakeargs=(
251 - -DBUILD_GTK_TESTS=OFF
252 - -DBUILD_QT5_TESTS=OFF
253 - -DBUILD_CPP_TESTS=OFF
254 - -DRUN_GPERF_IF_PRESENT=OFF
255 - -DENABLE_SPLASH=ON
256 - -DENABLE_ZLIB=ON
257 - -DENABLE_ZLIB_UNCOMPRESS=OFF
258 - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
259 - -DUSE_FLOAT=OFF
260 - -DWITH_Cairo=$(usex cairo)
261 - -DENABLE_LIBCURL=$(usex curl)
262 - -DENABLE_CPP=$(usex cxx)
263 - -DWITH_JPEG=$(usex jpeg)
264 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
265 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
266 - -DENABLE_CMS=$(usex lcms lcms2 none)
267 - -DWITH_NSS3=$(usex nss)
268 - -DWITH_PNG=$(usex png)
269 - $(cmake_use_find_package qt5 Qt5Core)
270 - -DWITH_TIFF=$(usex tiff)
271 - -DENABLE_UTILS=$(usex utils)
272 - -DENABLE_QT6=OFF
273 - )
274 - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
275 -
276 - cmake_src_configure
277 -}
278 -
279 -src_install() {
280 - cmake_src_install
281 -
282 - # live version doesn't provide html documentation
283 - if use cairo && use doc && [[ ${PV} != *9999* ]]; then
284 - # For now install gtk-doc there
285 - insinto /usr/share/gtk-doc/html/poppler
286 - doins -r "${S}"/glib/reference/html/*
287 - fi
288 -}