gentoo resync 31.01.2019

6 files changed, 40 insertions, 181 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c4dc95634538..1042d88f7a8d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,16 +2,13 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
-AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde
-AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
+AUX poppler-0.68.0-bool.patch 1208 BLAKE2B b0baebfe06e4e140ee5918b521a792e87b57153f043c55ef1149af1a2c9c87302c9f7acaa19a21da1b3fc9f2399af68add637381da0d95db83105c11335d6b4d SHA512 85b7359bb4c3ac332afe0be1a0fd51d6249491b1fd97615604eb4d116d621a866b5c1b9febde52b54eb76c50706da8d43040a475a3ce5a0590be2904fa599e13
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
-DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
 DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
 DIST poppler-0.73.0.tar.xz 1507068 BLAKE2B d88a7595d0d8b779d623b56d8dc25c753f2cfc6f015092ec9d254a2b2d701d0e760a069324a15d3a03c65c9c85c3398ad142d7f8cc259e5455f53b4d391596d3 SHA512 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a
-EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
-EBUILD poppler-0.68.0.ebuild 3481 BLAKE2B d5f6d958d65bc86c9c80d6850cba3bf472ebc0249169c6a7af0e1f66faeeee7cf634e82d0096a0cef3bd82ebd51138d658092f5569bc65637ed88f85de73161e SHA512 d49dbe9a37d399097cfba2e4c96dedd8df5a6d162e687f1d50406e59cd93f5420a1b0122869e233d197161834d8fda54ca2ec044b76efcc46b6dd89f1c6795d4
+EBUILD poppler-0.68.0.ebuild 3519 BLAKE2B f32a7ea6a326f046e0295c381a625ae32e17b140b6055bc5a7a1cf651337c36537d65c40fce39fc379339c1d737a929e92f96056d0f338eef35fc6da817af067 SHA512 81e0874f4f4beb316ba8b24eee1252fbd486d96b44ccf150372cdcd46d7c97a54f116bae7544022f4ca3da0e9c3a00147806eaf18c22396b85f5f25356e699ca
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
 EBUILD poppler-0.73.0.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
deleted file mode 100644
index 6808e91601dc..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-glibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
-From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
-Date: Fri, 15 Dec 2017 16:56:20 +0200
-Subject: Honor configuration for building glibc copy of strtok_r
-
-config.h didn't get included and HAVE_STRTOK_R was never defined.
-Now getting via glibc.h.
----
- goo/glibc_strtok_r.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
-index e779bf5..e323bc2 100644
---- a/goo/glibc_strtok_r.cc
-+++ b/goo/glibc_strtok_r.cc
-@@ -50,12 +50,15 @@
- // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com>
- // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com>
- //
- // To see a description of the changes please see the Changelog file that
- // came with your tarball or type make ChangeLog if you are building from git
- //
- //========================================================================
- 
-+#include "glibc.h"
-+
- #ifndef HAVE_STRTOK_R
- 
- #include <string.h>
--- 
-cgit v1.1
-
diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
deleted file mode 100644
index 789090cc9b22..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Sadly the CMake side of openjpeg slotting in Gentoo is broken.
-To reliably find openjpeg:2 we need to use pkg-config.
-
---- poppler-0.62.0/CMakeLists.txt
-+++ poppler-0.62.0/CMakeLists.txt
-@@ -193,7 +193,7 @@
- endif()
- set(WITH_OPENJPEG FALSE)
- if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
--  find_package(LIBOPENJPEG2)
-+  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
-   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
-   if(NOT LIBOPENJPEG2_FOUND)
-     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch
new file mode 100644
index 000000000000..a2d8ba7bd402
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.68.0-bool.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/670252
+
+From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001
+From: Ed Porras <ed@motologic.com>
+Date: Sun, 26 Aug 2018 20:24:23 +0200
+Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib
+
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+---
+ goo/JpegWriter.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
+index 16c97afe..26fa77a7 100644
+--- a/goo/JpegWriter.cc
++++ b/goo/JpegWriter.cc
+@@ -11,6 +11,7 @@
+ // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
+ // Copyright (C) 2017, 2018 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2018 Martin Packman <gzlist@googlemail.com>
++// Copyright (C) 2018 Ed Porras <ed@motologic.com>
+ //
+ //========================================================================
+ 
+@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
+   }
+ 
+   // Set whether to compute optimal Huffman coding tables
+-  priv->cinfo.optimize_coding = priv->optimize;
++  priv->cinfo.optimize_coding = static_cast<boolean>(priv->optimize);
+ 
+   // Get ready for data
+   jpeg_start_compress(&priv->cinfo, TRUE);
+-- 
+2.20.1
+
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
deleted file mode 100644
index 568a800956bf..000000000000
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/73"   # 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 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= )
-	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.62.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-glibc.patch" # bug 643858
-)
-
-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
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_GObjectIntrospection=$(usex introspection)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-
-	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-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 2c3f948431bb..e2839fc0c540 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/79"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${PN}-0.68.0-bool.patch"
 )
 
 src_prepare() {