commit: 0234504c95cca7d155f5681936ac97af0922f299 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sat May 10 13:35:10 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat May 10 13:35:10 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0234504c
[app-text/poppler] Sync with kde overlay * cleanup header * move to git-r3 eclass * drop old blocker * add qt5 USE flag Package-Manager: portage-2.2.10 --- .../files/poppler-0.26.0-qt5-dependencies.patch | 31 ++++++++++++++++++++++ app-text/poppler/metadata.xml | 3 --- app-text/poppler/poppler-9999.ebuild | 24 ++++++++++------- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch new file mode 100644 index 0000000..bf1effd --- /dev/null +++ b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch @@ -0,0 +1,31 @@ +From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <[email protected]> +Date: Sat, 10 May 2014 15:00:48 +0200 +Subject: [PATCH] [Qt5] Drop unused dependencies + +--- + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbafc4e..073f39b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,12 +106,10 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_ + find_package(Qt5Core) + find_package(Qt5Gui) + find_package(Qt5Xml) +- find_package(Qt5Widgets) +- find_package(Qt5Test) +- if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) ++ if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND) + set(QT5_FOUND true) + else () +- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") ++ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") + set(QT5_FOUND false) + endif() + else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) +-- +1.9.2 + 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..53e061b 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,19 +1,19 @@ # 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 -inherit cmake-utils toolchain-funcs git-2 +inherit cmake-utils toolchain-funcs git-r3 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="http://poppler.freedesktop.org/"; -EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler" +EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" LICENSE="GPL-2" KEYWORDS="" -SLOT="0/43" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils" +SLOT="0/46" +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils" # No test data provided RESTRICT="test" @@ -36,22 +36,24 @@ COMMON_DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) tiff? ( media-libs/tiff:0 ) " 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 ) " DOCS=(AUTHORS NEWS README README-XPDF TODO) +PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" ) + src_configure() { # this is needed for multilib, see bug 459394 local ft_libdir ft_includedir @@ -63,6 +65,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 +79,7 @@ src_configure() { $(cmake-utils_use_with jpeg) $(cmake-utils_use_with png) $(cmake-utils_use_with qt4) + $(cmake-utils_use_find_package qt5 Qt5Core) $(cmake-utils_use_with tiff) ) if use lcms; then
