1 |
commit: 131df8329e9b993921e5a1dd91988d41e4149d01 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 13 10:22:55 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 13 10:23:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131df832 |
7 |
|
8 |
app-text/poppler: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
app-text/poppler/Manifest | 1 - |
13 |
.../files/poppler-0.61.0-qt5_pc_in_typo.patch | 24 ---- |
14 |
app-text/poppler/poppler-0.61.0-r1.ebuild | 151 --------------------- |
15 |
3 files changed, 176 deletions(-) |
16 |
|
17 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
18 |
index a4eae7e106a..62a15b03bbd 100644 |
19 |
--- a/app-text/poppler/Manifest |
20 |
+++ b/app-text/poppler/Manifest |
21 |
@@ -3,5 +3,4 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a2 |
22 |
DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837 |
23 |
DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2 |
24 |
DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7 |
25 |
-DIST poppler-0.61.0.tar.xz 1432952 SHA256 53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 WHIRLPOOL 56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f |
26 |
DIST poppler-0.61.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df |
27 |
|
28 |
diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch |
29 |
deleted file mode 100644 |
30 |
index 906989aa8ba..00000000000 |
31 |
--- a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch |
32 |
+++ /dev/null |
33 |
@@ -1,24 +0,0 @@ |
34 |
-From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001 |
35 |
-From: Lars Wendler <polynomial-c@g.o> |
36 |
-Date: Tue, 7 Nov 2017 15:41:30 +0100 |
37 |
-Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry. |
38 |
- |
39 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
40 |
---- |
41 |
- poppler-qt5.pc.cmake | 2 +- |
42 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
43 |
- |
44 |
-diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake |
45 |
-index aaa1aa77..7e8c5c8f 100644 |
46 |
---- a/poppler-qt5.pc.cmake |
47 |
-+++ b/poppler-qt5.pc.cmake |
48 |
-@@ -1,5 +1,5 @@ |
49 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
50 |
--libdir=CMAKE_INSTALL_LIBDIR@ |
51 |
-+libdir=@CMAKE_INSTALL_LIBDIR@ |
52 |
- includedir=@CMAKE_INSTALL_INCLUDEDIR@ |
53 |
- |
54 |
- Name: poppler-qt5 |
55 |
--- |
56 |
-2.15.0 |
57 |
- |
58 |
|
59 |
diff --git a/app-text/poppler/poppler-0.61.0-r1.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild |
60 |
deleted file mode 100644 |
61 |
index e1fa049c01c..00000000000 |
62 |
--- a/app-text/poppler/poppler-0.61.0-r1.ebuild |
63 |
+++ /dev/null |
64 |
@@ -1,151 +0,0 @@ |
65 |
-# Copyright 1999-2017 Gentoo Foundation |
66 |
-# Distributed under the terms of the GNU General Public License v2 |
67 |
- |
68 |
-EAPI=6 |
69 |
- |
70 |
-inherit cmake-utils toolchain-funcs xdg-utils |
71 |
- |
72 |
-if [[ "${PV}" == "9999" ]] ; then |
73 |
- inherit git-r3 |
74 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
75 |
- SLOT="0/9999" |
76 |
-else |
77 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
78 |
- 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" |
79 |
- SLOT="0/72" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
80 |
-fi |
81 |
- |
82 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
83 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
84 |
- |
85 |
-LICENSE="GPL-2" |
86 |
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
87 |
- |
88 |
-# No test data provided |
89 |
-RESTRICT="test" |
90 |
- |
91 |
-COMMON_DEPEND=" |
92 |
- >=media-libs/fontconfig-2.6.0 |
93 |
- >=media-libs/freetype-2.3.9 |
94 |
- sys-libs/zlib |
95 |
- cairo? ( |
96 |
- dev-libs/glib:2 |
97 |
- >=x11-libs/cairo-1.10.0 |
98 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) |
99 |
- ) |
100 |
- curl? ( net-misc/curl ) |
101 |
- jpeg? ( virtual/jpeg:0 ) |
102 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
103 |
- lcms? ( media-libs/lcms:2 ) |
104 |
- nss? ( >=dev-libs/nss-3.19:0 ) |
105 |
- png? ( media-libs/libpng:0= ) |
106 |
- qt4? ( |
107 |
- dev-qt/qtcore:4 |
108 |
- dev-qt/qtgui:4 |
109 |
- ) |
110 |
- qt5? ( |
111 |
- dev-qt/qtcore:5 |
112 |
- dev-qt/qtgui:5 |
113 |
- dev-qt/qtxml:5 |
114 |
- ) |
115 |
- tiff? ( media-libs/tiff:0 ) |
116 |
-" |
117 |
-DEPEND="${COMMON_DEPEND} |
118 |
- virtual/pkgconfig |
119 |
-" |
120 |
-RDEPEND="${COMMON_DEPEND} |
121 |
- cjk? ( >=app-text/poppler-data-0.4.7 ) |
122 |
-" |
123 |
- |
124 |
-DOCS=(AUTHORS NEWS README README-XPDF) |
125 |
- |
126 |
-PATCHES=( |
127 |
- "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" |
128 |
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
129 |
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" |
130 |
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
131 |
- "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
132 |
- "${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.patch" |
133 |
-) |
134 |
- |
135 |
-src_prepare() { |
136 |
- cmake-utils_src_prepare |
137 |
- |
138 |
- # Clang doesn't grok this flag, the configure nicely tests that, but |
139 |
- # cmake just uses it, so remove it if we use clang |
140 |
- if [[ ${CC} == clang ]] ; then |
141 |
- sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
142 |
- fi |
143 |
- |
144 |
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
145 |
- sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
146 |
- -i CMakeLists.txt || die |
147 |
- else |
148 |
- einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
149 |
- fi |
150 |
- |
151 |
- if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
152 |
- # we need to up the C++ version, bug #622526 |
153 |
- export CXX="$(tc-getCXX) -std=c++11" |
154 |
- fi |
155 |
-} |
156 |
- |
157 |
-src_configure() { |
158 |
- xdg_environment_reset |
159 |
- local mycmakeargs=( |
160 |
- -DBUILD_GTK_TESTS=OFF |
161 |
- -DBUILD_QT4_TESTS=OFF |
162 |
- -DBUILD_QT5_TESTS=OFF |
163 |
- -DBUILD_CPP_TESTS=OFF |
164 |
- -DCMAKE_INSTALL_DATADIR="/usr/share" |
165 |
- -DCMAKE_INSTALL_INCLUDEDIR="/usr/include" |
166 |
- -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)" |
167 |
- -DCMAKE_INSTALL_MANDIR="/usr/share/man" |
168 |
- -DENABLE_SPLASH=ON |
169 |
- -DENABLE_ZLIB=ON |
170 |
- -DENABLE_ZLIB_UNCOMPRESS=OFF |
171 |
- -DENABLE_XPDF_HEADERS=ON |
172 |
- -DENABLE_LIBCURL="$(usex curl)" |
173 |
- -DENABLE_CPP="$(usex cxx)" |
174 |
- -DENABLE_UTILS="$(usex utils)" |
175 |
- -DSPLASH_CMYK=OFF |
176 |
- -DUSE_FIXEDPOINT=OFF |
177 |
- -DUSE_FLOAT=OFF |
178 |
- -DWITH_Cairo="$(usex cairo)" |
179 |
- -DWITH_GObjectIntrospection="$(usex introspection)" |
180 |
- -DWITH_JPEG="$(usex jpeg)" |
181 |
- -DWITH_NSS3="$(usex nss)" |
182 |
- -DWITH_PNG="$(usex png)" |
183 |
- -DWITH_Qt4="$(usex qt4)" |
184 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
185 |
- -DWITH_TIFF="$(usex tiff)" |
186 |
- ) |
187 |
- if use jpeg; then |
188 |
- mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
189 |
- else |
190 |
- mycmakeargs+=(-DENABLE_DCTDECODER=none) |
191 |
- fi |
192 |
- if use jpeg2k; then |
193 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
194 |
- else |
195 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
196 |
- fi |
197 |
- if use lcms; then |
198 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
199 |
- else |
200 |
- mycmakeargs+=(-DENABLE_CMS=) |
201 |
- fi |
202 |
- |
203 |
- cmake-utils_src_configure |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- cmake-utils_src_install |
208 |
- |
209 |
- # live version doesn't provide html documentation |
210 |
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
211 |
- # For now install gtk-doc there |
212 |
- insinto /usr/share/gtk-doc/html/poppler |
213 |
- doins -r "${S}"/glib/reference/html/* |
214 |
- fi |
215 |
-} |