1 |
commit: fc6bb5742bb6769fd3a6b7dbfead2f3490830d9d |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 30 10:39:37 2016 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 30 10:43:24 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6bb574 |
7 |
|
8 |
app-text/poppler: Remove old |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-text/poppler/Manifest | 2 - |
13 |
app-text/poppler/poppler-0.38.0.ebuild | 122 -------------------------------- |
14 |
app-text/poppler/poppler-0.41.0.ebuild | 124 --------------------------------- |
15 |
3 files changed, 248 deletions(-) |
16 |
|
17 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
18 |
index 6cb9ef3..09e9e6f 100644 |
19 |
--- a/app-text/poppler/Manifest |
20 |
+++ b/app-text/poppler/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22 |
23 |
-DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5 |
24 |
-DIST poppler-0.41.0.tar.xz 1655448 SHA256 420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b SHA512 b2b99ac056efaae26f0bffc20756f17524011b7718a554ff48901422e7ab8caa4f879b800eacce1af5ae468346fa0beb569a4378f028a7d7cf0c9cc45f0d2402 WHIRLPOOL 565bc504b5b02ac612b267bb5d5746dc9d90b2c7f8959e2fecc58bdcc4c588f8f234d4bc9cc8086846c23643fa0abc8dba352c8a083056b95d58056281a5bc7a |
25 |
DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736 |
26 |
|
27 |
diff --git a/app-text/poppler/poppler-0.38.0.ebuild b/app-text/poppler/poppler-0.38.0.ebuild |
28 |
deleted file mode 100644 |
29 |
index 835f787..0000000 |
30 |
--- a/app-text/poppler/poppler-0.38.0.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,122 +0,0 @@ |
33 |
-# Copyright 1999-2015 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Id$ |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-inherit cmake-utils toolchain-funcs |
40 |
- |
41 |
-if [[ "${PV}" == "9999" ]] ; then |
42 |
- inherit git-r3 |
43 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
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 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
- SLOT="0/57" # 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 png qt4 qt5 tiff +utils" |
56 |
- |
57 |
-# No test data provided |
58 |
-RESTRICT="test" |
59 |
- |
60 |
-COMMON_DEPEND=" |
61 |
- >=media-libs/fontconfig-2.6.0 |
62 |
- >=media-libs/freetype-2.3.9 |
63 |
- sys-libs/zlib |
64 |
- cairo? ( |
65 |
- dev-libs/glib:2 |
66 |
- >=x11-libs/cairo-1.10.0 |
67 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) |
68 |
- ) |
69 |
- curl? ( net-misc/curl ) |
70 |
- jpeg? ( virtual/jpeg:0 ) |
71 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
72 |
- lcms? ( media-libs/lcms:2 ) |
73 |
- png? ( media-libs/libpng:0= ) |
74 |
- qt4? ( |
75 |
- dev-qt/qtcore:4 |
76 |
- dev-qt/qtgui:4 |
77 |
- ) |
78 |
- qt5? ( |
79 |
- dev-qt/qtcore:5 |
80 |
- dev-qt/qtgui:5 |
81 |
- dev-qt/qtxml:5 |
82 |
- ) |
83 |
- tiff? ( media-libs/tiff:0 ) |
84 |
-" |
85 |
-DEPEND="${COMMON_DEPEND} |
86 |
- virtual/pkgconfig |
87 |
-" |
88 |
-RDEPEND="${COMMON_DEPEND} |
89 |
- cjk? ( >=app-text/poppler-data-0.4.4 ) |
90 |
-" |
91 |
- |
92 |
-DOCS=(AUTHORS NEWS README README-XPDF TODO) |
93 |
- |
94 |
-PATCHES=( |
95 |
- "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" |
96 |
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
97 |
- "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" |
98 |
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
108 |
- fi |
109 |
-} |
110 |
- |
111 |
-src_configure() { |
112 |
- local mycmakeargs=( |
113 |
- -DBUILD_GTK_TESTS=OFF |
114 |
- -DBUILD_QT4_TESTS=OFF |
115 |
- -DBUILD_QT5_TESTS=OFF |
116 |
- -DBUILD_CPP_TESTS=OFF |
117 |
- -DENABLE_SPLASH=ON |
118 |
- -DENABLE_ZLIB=ON |
119 |
- -DENABLE_XPDF_HEADERS=ON |
120 |
- $(cmake-utils_use_enable curl LIBCURL) |
121 |
- $(cmake-utils_use_enable cxx CPP) |
122 |
- $(cmake-utils_use_enable utils) |
123 |
- $(cmake-utils_use_with cairo) |
124 |
- $(cmake-utils_use_with introspection GObjectIntrospection) |
125 |
- $(cmake-utils_use_with jpeg) |
126 |
- $(cmake-utils_use_with png) |
127 |
- $(cmake-utils_use_with qt4) |
128 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
129 |
- $(cmake-utils_use_with tiff) |
130 |
- ) |
131 |
- if use jpeg2k; then |
132 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
133 |
- else |
134 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=) |
135 |
- fi |
136 |
- if use lcms; then |
137 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
138 |
- else |
139 |
- mycmakeargs+=(-DENABLE_CMS=) |
140 |
- fi |
141 |
- |
142 |
- cmake-utils_src_configure |
143 |
-} |
144 |
- |
145 |
-src_install() { |
146 |
- cmake-utils_src_install |
147 |
- |
148 |
- # live version doesn't provide html documentation |
149 |
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
150 |
- # For now install gtk-doc there |
151 |
- insinto /usr/share/gtk-doc/html/poppler |
152 |
- doins -r "${S}"/glib/reference/html/* |
153 |
- fi |
154 |
-} |
155 |
|
156 |
diff --git a/app-text/poppler/poppler-0.41.0.ebuild b/app-text/poppler/poppler-0.41.0.ebuild |
157 |
deleted file mode 100644 |
158 |
index 4cf7407..0000000 |
159 |
--- a/app-text/poppler/poppler-0.41.0.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,124 +0,0 @@ |
162 |
-# Copyright 1999-2016 Gentoo Foundation |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
-# $Id$ |
165 |
- |
166 |
-EAPI=5 |
167 |
- |
168 |
-inherit cmake-utils toolchain-funcs xdg-utils |
169 |
- |
170 |
-if [[ "${PV}" == "9999" ]] ; then |
171 |
- inherit git-r3 |
172 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
173 |
- SLOT="0/9999" |
174 |
-else |
175 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
176 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
177 |
- SLOT="0/58" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
178 |
-fi |
179 |
- |
180 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
181 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
182 |
- |
183 |
-LICENSE="GPL-2" |
184 |
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils" |
185 |
- |
186 |
-# No test data provided |
187 |
-RESTRICT="test" |
188 |
- |
189 |
-COMMON_DEPEND=" |
190 |
- >=media-libs/fontconfig-2.6.0 |
191 |
- >=media-libs/freetype-2.3.9 |
192 |
- sys-libs/zlib |
193 |
- cairo? ( |
194 |
- dev-libs/glib:2 |
195 |
- >=x11-libs/cairo-1.10.0 |
196 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) |
197 |
- ) |
198 |
- curl? ( net-misc/curl ) |
199 |
- jpeg? ( virtual/jpeg:0 ) |
200 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
201 |
- lcms? ( media-libs/lcms:2 ) |
202 |
- png? ( media-libs/libpng:0= ) |
203 |
- qt4? ( |
204 |
- dev-qt/qtcore:4 |
205 |
- dev-qt/qtgui:4 |
206 |
- ) |
207 |
- qt5? ( |
208 |
- dev-qt/qtcore:5 |
209 |
- dev-qt/qtgui:5 |
210 |
- dev-qt/qtxml:5 |
211 |
- ) |
212 |
- tiff? ( media-libs/tiff:0 ) |
213 |
-" |
214 |
-DEPEND="${COMMON_DEPEND} |
215 |
- virtual/pkgconfig |
216 |
-" |
217 |
-RDEPEND="${COMMON_DEPEND} |
218 |
- cjk? ( >=app-text/poppler-data-0.4.4 ) |
219 |
-" |
220 |
- |
221 |
-DOCS=(AUTHORS NEWS README README-XPDF TODO) |
222 |
- |
223 |
-PATCHES=( |
224 |
- "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" |
225 |
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
226 |
- "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" |
227 |
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
228 |
- "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
229 |
-) |
230 |
- |
231 |
-src_prepare() { |
232 |
- cmake-utils_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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
238 |
- fi |
239 |
-} |
240 |
- |
241 |
-src_configure() { |
242 |
- xdg_environment_reset |
243 |
- local mycmakeargs=( |
244 |
- -DBUILD_GTK_TESTS=OFF |
245 |
- -DBUILD_QT4_TESTS=OFF |
246 |
- -DBUILD_QT5_TESTS=OFF |
247 |
- -DBUILD_CPP_TESTS=OFF |
248 |
- -DENABLE_SPLASH=ON |
249 |
- -DENABLE_ZLIB=ON |
250 |
- -DENABLE_XPDF_HEADERS=ON |
251 |
- $(cmake-utils_use_enable curl LIBCURL) |
252 |
- $(cmake-utils_use_enable cxx CPP) |
253 |
- $(cmake-utils_use_enable utils) |
254 |
- $(cmake-utils_use_with cairo) |
255 |
- $(cmake-utils_use_with introspection GObjectIntrospection) |
256 |
- $(cmake-utils_use_with jpeg) |
257 |
- $(cmake-utils_use_with png) |
258 |
- $(cmake-utils_use_with qt4) |
259 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
260 |
- $(cmake-utils_use_with tiff) |
261 |
- ) |
262 |
- if use jpeg2k; then |
263 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
264 |
- else |
265 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=) |
266 |
- fi |
267 |
- if use lcms; then |
268 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
269 |
- else |
270 |
- mycmakeargs+=(-DENABLE_CMS=) |
271 |
- fi |
272 |
- |
273 |
- cmake-utils_src_configure |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- cmake-utils_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 |
-} |