Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Mon, 04 Dec 2017 14:29:13
Message-Id: 1512397742.423618067781aafe12bff50a6d1bdf2d9da52eb7.polynomial-c@gentoo
1 commit: 423618067781aafe12bff50a6d1bdf2d9da52eb7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 4 14:29:02 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 4 14:29:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42361806
7
8 app-text/poppler: Sync live ebuild.
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 app-text/poppler/poppler-9999.ebuild | 11 ++---------
13 1 file changed, 2 insertions(+), 9 deletions(-)
14
15 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
16 index 664f5ee424a..3b1c4cfa08a 100644
17 --- a/app-text/poppler/poppler-9999.ebuild
18 +++ b/app-text/poppler/poppler-9999.ebuild
19 @@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
20 HOMEPAGE="https://poppler.freedesktop.org/"
21
22 LICENSE="GPL-2"
23 -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
24 +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
25
26 # No test data provided
27 RESTRICT="test"
28 @@ -39,10 +39,6 @@ COMMON_DEPEND="
29 lcms? ( media-libs/lcms:2 )
30 nss? ( >=dev-libs/nss-3.19:0 )
31 png? ( media-libs/libpng:0= )
32 - qt4? (
33 - dev-qt/qtcore:4
34 - dev-qt/qtgui:4
35 - )
36 qt5? (
37 dev-qt/qtcore:5
38 dev-qt/qtgui:5
39 @@ -63,8 +59,7 @@ PATCHES=(
40 "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
41 "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
42 "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
43 - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
44 - "${FILESDIR}/${PN}-0.40-FindQt4.patch"
45 + "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
46 )
47
48 src_prepare() {
49 @@ -93,7 +88,6 @@ src_configure() {
50 xdg_environment_reset
51 local mycmakeargs=(
52 -DBUILD_GTK_TESTS=OFF
53 - -DBUILD_QT4_TESTS=OFF
54 -DBUILD_QT5_TESTS=OFF
55 -DBUILD_CPP_TESTS=OFF
56 -DENABLE_SPLASH=ON
57 @@ -111,7 +105,6 @@ src_configure() {
58 -DWITH_JPEG="$(usex jpeg)"
59 -DWITH_NSS3="$(usex nss)"
60 -DWITH_PNG="$(usex png)"
61 - -DWITH_Qt4="$(usex qt4)"
62 $(cmake-utils_use_find_package qt5 Qt5Core)
63 -DWITH_TIFF="$(usex tiff)"
64 )