gentoo resync : 10.11.2017

6 files changed, 239 insertions, 5 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f2eb7f86686b..c88dfec59802 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -12,17 +12,21 @@ AUX poppler-0.59.0-qt5-dependencies.patch 944 SHA256 4fb00d04ca2df0eb6aa20f0704e
 AUX poppler-0.59.0-respect-cflags.patch 2749 SHA256 7cd2f99440c6dd29d2a1395d298e5d17b8c252209328e49cfabccf2287b4f1b4 SHA512 5078957d4b73a8f6bf1f9e4ccf46acabdb3b52cf58b3717dfda23518047648ad371e1aa60b371a72314a2171ec21ed4e0e2162c43876b512d8ca07eafda1702c WHIRLPOOL 78344be54fcfc37f517d0f2ddbe9471be4fc6773776cbb282ca79d669aa5ad9aec8353e78b431ae5e8d8eaaf0f3b22a025112142665aed0515d3ee5390c2a1df
 AUX poppler-0.60.1-qt5-dependencies.patch 934 SHA256 2230542bd9154b2905a2c3f274e55c9817502ceaa14f30a0cd57806137f5d887 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c WHIRLPOOL dd1ea8dac84c2aef744a412d37146dfd0a39952ab55ea1be5eaf608b49d82e366974335e5ca38ecb3236574e9081c9b189ca7581f26c236fbbcf352529cfd16f
 AUX poppler-0.60.1-respect-cflags.patch 2956 SHA256 0c32d963dd61af1a3c88f0f50268bc08b285638f08cb91df45a6a75452156e1c SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43 WHIRLPOOL b90741ed5ec1916f7b7be9a3a5420b103298a2310bd2866f6ed58fafcbce22cef60e692a1187eb56f2093ebf681108dabafd3125c164dd2f5b27af30ce9d8b43
+AUX poppler-0.61.0-qt5_pc_in_typo.patch 679 SHA256 2f5a30bde7962052cae2606fc454955e8e2f99711922d83ed019cd245baaa7c2 SHA512 44846890c66082b6d8ba2bb6a501f29a2a67d399aee4e83f87be62ec40d87f511dc193bf603022ffc387e34f057c5fb21dcabaa9a2d49026f97fb3cf5b03ee15 WHIRLPOOL 4710a91183f0909ac08a309c48ff90e80969e2d1a37b018543cc027269004c814bd7f5310c9611d100b952e6303113a4f457d8128b99a0c8697c73861b393583
+AUX poppler-0.61.0-respect-cflags.patch 3012 SHA256 4bc423b407b5f94764619c2011313970f06221b7fa48313c660235ce58dbcd92 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d WHIRLPOOL dc20cc06fbddf5085a1b429afc79dd53aebcdec54e6b0152b4e1722dad05692455b191edc9e6d0f4950de864385ac5d46ae60d4a787b4a79453691ff77c97df8
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
 DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
+DIST poppler-0.61.0.tar.xz 1432952 SHA256 53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 WHIRLPOOL 56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f
 EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3859 SHA256 5de3a27563f487f02d5afa311d8b5e3e06e28792bd3493a254f846804ad2625c SHA512 2ea74b06f47370358281b76ab2327b5ed09c1b63927d37317c2dbdc23492c53e2a110efd4833f1c0ab6a35948723c73b73be1f0574a4f455b7081e01e4950b01 WHIRLPOOL a93840b496b669a62e92f9bd982e37120f8e433251801e2335bc23320294b29c231a78f338185de992f2ec25b27fe73edd84bbbf86a71b22336a512d69daba44
+EBUILD poppler-0.57.0.ebuild 3858 SHA256 cfd1022b1f78c0249c5cc0ccd8603b73a8d60105ab0d386b2eb1927f3ea88390 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe WHIRLPOOL b1753b898f43d012041040f312a7c50e066501456ec1fd5443a0c073ca79bff8643f0482bff346a4fe2c07103cf474945c7b7bd32d47c6c2ef541ee1616e08f1
 EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
 EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
 EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
-EBUILD poppler-9999.ebuild 3875 SHA256 f3239dd95fc6202eb33521819752dca5d9f26802c4098521cb2cd0a6e329b44d SHA512 43de0b5e351cbdb94e52f9a18a5147f6e627f5552d34b6ffd9b4f1693118d0648ef2893ac50ca6147d716decb5afabfbd1b21afbe9add2116ee655bb40bff01c WHIRLPOOL c3efede6367e4de565bdbe5341132b900fb9e9fd8a7a6c7f0541de6119910b4627ec25221285becd87bce23e528baf543a5fdb7455d917761dcfc103887e8298
+EBUILD poppler-0.61.0-r1.ebuild 4081 SHA256 eeade23e885f0340539357eb085add9144ad7bde9287cb65af8d846bbdfcd128 SHA512 afb48ef236f68a5ea0f561819c77359bd9de1345a1bda970e17db79f6c9c6157d63b0b9f2fde0f48f76a9a7e1cc3c59c88090725408f63c6af3219de9ae339c1 WHIRLPOOL 2497c31550c03908fff87cd4e2c8574463f88cf738c66358d7f0ab6e1a39d0138bf82ec69d3332501466c515aec7d08eaeed305ff89a72f65a65d8979c6cbee6
+EBUILD poppler-9999.ebuild 3875 SHA256 8a4be7cd9f2377af8e68d4147d0e6909d592258cf9f80a9939e95711ae35d9cd SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59 WHIRLPOOL 2e8c4a10cfaabe911f63b5818060c0ffc64fc1da457cefe77f33a217f75b9a3722a4829fa86cbc28902ce85554532475b706031e58ae2d304c83a854b1e60ea5
 MISC ChangeLog 12583 SHA256 b10bb0674eaf3fb5709ac71f335e1d0b3010cc6465f52c43d0d9f8d80ba327f4 SHA512 92b92d9ca9d028de27ae96ac2de9f2f38b582742d0f6474315e341dc883488632a106232c4763375b93161885276cb4aa0c833712d96e569d2915881877611cf WHIRLPOOL fd51e52ac26587ade05a2548432a914936db4be111871ca8295930b47ee5e3064ad49cffc932ca6258191281b731f084b80186596e4d95d3fb63fc68587168ae
 MISC ChangeLog-2015 64326 SHA256 2d1c6158c2ddf8e667300324ead9d16a38118479df81bbfd17b754e19027b72f SHA512 beba273afefaaa7163bc58e177d7c52ac3e957037bf1616647021a174ea0cd86fc272c6cb8747b81e597e04ec2378591b37e4ca084f231c5ff20d4c9043fd961 WHIRLPOOL 9a7e71e81554411c48d7b6b60a7702c32c2a180f6dcbefc55777d9fb44f728250d08e08873dbc59653a90dc58da453e9d4789fc9a4fb8949d61971672bcf518c
 MISC metadata.xml 999 SHA256 ffe981c4c31df137ec6f6523138ab48e6d6bb60e84e8940e83211bc9415f05af SHA512 c23399b672d336acafa0e4589e44c66e57fcc71f4a4878f7f18672d9d02bae82e50f543c7462b1bb9ce3b08ee4f835997f1f571bbbb75bfbf820d9b31b60542b WHIRLPOOL a16ec5546bb6dc986e8100f316e91b738b1c97d85a0b0648901260792dd3acdd95b2f3271f46e77c0c6837285d5afdf7d65f80c3406cf9dca2d468e95082b19d
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
index 000000000000..906989aa8ba0
--- /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/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
new file mode 100644
index 000000000000..a75b84b482f5
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
@@ -0,0 +1,55 @@
+--- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
++++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
+@@ -98,8 +98,6 @@
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
+   set(_warn "${_warn} -Wcast-align")
+@@ -124,39 +122,6 @@
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
++ 
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
index 5af4d3454381..a4a64847c65f 100644
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.61.0-r1.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild
new file mode 100644
index 000000000000..e1fa049c01c8
--- /dev/null
+++ b/app-text/poppler/poppler-0.61.0-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		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}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${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() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-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
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 3194d05c38bc..664f5ee424ab 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/71"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -62,7 +62,7 @@ DOCS=(AUTHORS NEWS README README-XPDF)
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.60.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
 )