commit: 9e746f7f8ef3243da6a32de768b6031442d0fe08
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 11:55:46 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 10 11:55:46 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e746f7f
[app-text/poppler] Sync with tree, cleanup header
Package-Manager: portage-2.2.10
---
app-text/poppler/metadata.xml | 3 ---
app-text/poppler/poppler-9999.ebuild | 11 ++++-------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 75a5717..9124e13 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,10 +8,7 @@
<name>Maciej Mrozowski</name>
</maintainer>
<use>
- <flag name='abiword'>Enable support for <pkg>app-office/abiword</pkg>
output. Requires <pkg>dev-libs/libxml2</pkg>.</flag>
- <flag name='exceptions'>Enable exceptions throwing.</flag>
<flag name='introspection'>Enable GObject introspection.</flag>
<flag name='utils'>Install command-line PDF converters and various
utilities.</flag>
- <flag name='xpdf-headers'></flag>
</use>
</pkgmetadata>
diff --git a/app-text/poppler/poppler-9999.ebuild
b/app-text/poppler/poppler-9999.ebuild
index ba2094e..d123bd2 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v
1.2 2013/07/12 20:34:24 dilfridge Exp $
+# $Header: $
EAPI=5
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler"
LICENSE="GPL-2"
KEYWORDS=""
-SLOT="0/43"
+SLOT="0/46"
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4
tiff +utils"
# No test data provided
@@ -42,11 +42,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
- !dev-libs/poppler
- !dev-libs/poppler-glib
- !dev-libs/poppler-qt3
- !dev-libs/poppler-qt4
- !app-text/poppler-utils
cjk? ( >=app-text/poppler-data-0.4.4 )
"
@@ -63,6 +58,7 @@ src_configure() {
mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
@@ -76,6 +72,7 @@ src_configure() {
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with png)
$(cmake-utils_use_with qt4)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
$(cmake-utils_use_with tiff)
)
if use lcms; then
