[gentoo-commits] proj/kde:master commit in: app-text/poppler/files/, app-text/poppler/

[Johannes Huber]

commit:     a4c563447c01dd0b68509d6641da554565212d4d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 13:05:50 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 10 13:05:50 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a4c56344

[app-text/poppler] Add qt5 USE flag

Package-Manager: portage-2.2.10

---
 .../files/poppler-0.26.0-qt5-dependencies.patch    | 31 ++++++++++++++++++++++
 app-text/poppler/poppler-9999.ebuild               | 11 ++++++--
 2 files changed, 40 insertions(+), 2 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 <j...@gentoo.org>
+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/poppler-9999.ebuild 
b/app-text/poppler/poppler-9999.ebuild
index b3fd066..53e061b 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0/46"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 
tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 
qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -36,6 +36,11 @@ 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}
@@ -47,6 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 
 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
@@ -72,7 +79,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_find_package qt5 Qt5Core)
                $(cmake-utils_use_with tiff)
        )
        if use lcms; then