1 |
commit: a76e2e1230d975771648597f9f4420d8f985baf3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 7 22:48:07 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 7 22:54:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76e2e12 |
7 |
|
8 |
app-text/poppler: EAPI-7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-text/poppler/poppler-9999.ebuild | 22 +++++++++++----------- |
14 |
1 file changed, 11 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
17 |
index 009f393d9fd..05c24b50807 100644 |
18 |
--- a/app-text/poppler/poppler-9999.ebuild |
19 |
+++ b/app-text/poppler/poppler-9999.ebuild |
20 |
@@ -1,11 +1,11 @@ |
21 |
# Copyright 1999-2019 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=6 |
25 |
+EAPI=7 |
26 |
|
27 |
inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils |
28 |
|
29 |
-if [[ "${PV}" == "9999" ]] ; then |
30 |
+if [[ ${PV} == *9999* ]] ; then |
31 |
inherit git-r3 |
32 |
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
33 |
SLOT="0/9999" |
34 |
@@ -24,7 +24,11 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt |
35 |
# No test data provided |
36 |
RESTRICT="test" |
37 |
|
38 |
-COMMON_DEPEND=" |
39 |
+BDEPEND=" |
40 |
+ dev-util/glib-utils |
41 |
+ virtual/pkgconfig |
42 |
+" |
43 |
+DEPEND=" |
44 |
media-libs/fontconfig |
45 |
media-libs/freetype |
46 |
sys-libs/zlib |
47 |
@@ -46,11 +50,7 @@ COMMON_DEPEND=" |
48 |
) |
49 |
tiff? ( media-libs/tiff:0 ) |
50 |
" |
51 |
-DEPEND="${COMMON_DEPEND} |
52 |
- dev-util/glib-utils |
53 |
- virtual/pkgconfig |
54 |
-" |
55 |
-RDEPEND="${COMMON_DEPEND} |
56 |
+RDEPEND="${DEPEND} |
57 |
cjk? ( app-text/poppler-data ) |
58 |
" |
59 |
|
60 |
@@ -70,11 +70,11 @@ src_prepare() { |
61 |
# Clang doesn't grok this flag, the configure nicely tests that, but |
62 |
# cmake just uses it, so remove it if we use clang |
63 |
if [[ ${CC} == clang ]] ; then |
64 |
- sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
65 |
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die |
66 |
fi |
67 |
|
68 |
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
69 |
- sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
70 |
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
71 |
-i CMakeLists.txt || die |
72 |
else |
73 |
einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
74 |
@@ -119,7 +119,7 @@ src_install() { |
75 |
cmake-utils_src_install |
76 |
|
77 |
# live version doesn't provide html documentation |
78 |
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
79 |
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then |
80 |
# For now install gtk-doc there |
81 |
insinto /usr/share/gtk-doc/html/poppler |
82 |
doins -r "${S}"/glib/reference/html/* |