app-text/poppler: Revbump to fix broken pkgconfig files.

Bug: https://bugs.gentoo.org/636708
Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
new file mode 100644 (file)
index 0000000..906989a
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
@@ -0,0 +1,24 @@
+From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 7 Nov 2017 15:41:30 +0100
+Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ poppler-qt5.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
+index aaa1aa77..7e8c5c8f 100644
+--- a/poppler-qt5.pc.cmake
++++ b/poppler-qt5.pc.cmake
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: poppler-qt5
+-- 
+2.15.0
+

diff --git a/app-text/poppler/poppler-0.61.0.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild
similarity index 94%
rename from app-text/poppler/poppler-0.61.0.ebuild
rename to app-text/poppler/poppler-0.61.0-r1.ebuild
index 2cfa1ed7abef154a24ff89aa43ca0af7e84e0540..e1fa049c01c803a784657d2423704040598fe6b3 100644 (file)
--- a/app-text/poppler/poppler-0.61.0.ebuild
+++ b/app-text/poppler/poppler-0.61.0-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
        "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
        "${FILESDIR}/${PN}-0.40-FindQt4.patch"
+       "${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.patch"
 )
 
 src_prepare() {
@@ -96,6 +97,10 @@ src_configure() {
                -DBUILD_QT4_TESTS=OFF
                -DBUILD_QT5_TESTS=OFF
                -DBUILD_CPP_TESTS=OFF
+               -DCMAKE_INSTALL_DATADIR="/usr/share"
+               -DCMAKE_INSTALL_INCLUDEDIR="/usr/include"
+               -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
+               -DCMAKE_INSTALL_MANDIR="/usr/share/man"
                -DENABLE_SPLASH=ON
                -DENABLE_ZLIB=ON
                -DENABLE_ZLIB_UNCOMPRESS=OFF