gentoo resync : 12.01.2019

4 files changed, 41 insertions, 41 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 435847e8f20a..7b4c1151629a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,14 +6,14 @@ AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c
 AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
 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.67.0.tar.xz 1459412 BLAKE2B 1c24908839fc9e3b3b2a1e0c014f7b6a1c6cc622157e161437ece91a86a20db0d5ae67b35783a5a4b712ab4ba0e43f141ca516fde10b5a549b9d36a98c5de25b SHA512 36584c62970ae0ae7807687f9c0523560ae92ac323949be8916a0e8dc6e691633e55cdd76c6026253c337aed8a4b43a7759a3de74c9ec606654f65379fb0f206
 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.67.0.ebuild 3564 BLAKE2B dc1af15e88db8bf07c842a1bbc1d56d4fda73d2ce6a37bcd22c8214d58d3f94503fc41e03eb3585afcae188eb291d5d243117eb2366c101326211f5a124e6925 SHA512 a5231cb7a56b08651b73383aa5fe59213bc8ddfd87eb647b2b8ca39fb5b82daf42a88207eb814825c6c93c3debff6a8df05e61299a9e7644adb18369fb81498c
-EBUILD poppler-0.68.0.ebuild 3485 BLAKE2B d318d8d17eef484adff050585b70b327590c4af2b4b499cf48638f6d1068673a227cb438d391f519a95b6b65d77aede6677c0f62c1764bb5d9dccae36ca6183a SHA512 da82c946c5e66ff08689836d74745ea2a7dc1c9c2fcfb0bee8a7865d387e7aa1676330a951d1a330f7be4c67e8fac1a3bd8b69b4761fc84639c920bbc13831c4
+EBUILD poppler-0.68.0.ebuild 3483 BLAKE2B c236308ba5a46d21a3a3f1b677861a537fd0742186e473586922cfc98ef8b9023ace81d09e74cecdc42ad733ecbdde020069eca8e8ffbfefd3f1216c3e3f45ae SHA512 1f5c09875192b72cc985431f05945fe60739c21c67fe3dc08826568c182cf3d9e71c33c7fc22091b3dba742bfe65a864a5ba3e24d9971734336503e24ae0c6d5
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
-EBUILD poppler-9999.ebuild 3552 BLAKE2B 28aa4602a965d43bd0c26c2a89cf8ba9ccc4925c21b7b626a13dbe0717384dd57142282bcd3838f690765e15b36f15d70a34dd6586421fb3854370d3494c154f SHA512 b548a0c857314bbe8edd2ff26be6cd08e0cbe83f177b31692591abf0324538ac1f75de73f31731ea5a300bd810496bcc528ae46800e7fed1567f6f84332e1d34
+EBUILD poppler-0.73.0.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
+EBUILD poppler-9999.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 9eaec634d344..2089421ff8ea 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
 
diff --git a/app-text/poppler/poppler-0.67.0.ebuild b/app-text/poppler/poppler-0.73.0.ebuild
index 26464a9c1dc4..05c24b50807e 100644
--- a/app-text/poppler/poppler-0.67.0.ebuild
+++ b/app-text/poppler/poppler-0.73.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
-if [[ "${PV}" == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	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/78"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/84"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,18 +24,22 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt
 # No test data provided
 RESTRICT="test"
 
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
 	sys-libs/zlib
 	cairo? (
 		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )
 	png? ( media-libs/libpng:0= )
@@ -46,21 +50,17 @@ COMMON_DEPEND="
 	)
 	tiff? ( media-libs/tiff:0 )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
 "
 
-DOCS=(AUTHORS NEWS README README-XPDF)
+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.71.0-respect-cflags.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"
 )
 
@@ -70,11 +70,11 @@ 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
+		sed -e 's/-fno-check-new//' -i 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)' \
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
 			-i CMakeLists.txt || die
 	else
 		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
@@ -93,7 +93,7 @@ src_configure() {
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
 		-DSPLASH_CMYK=OFF
 		-DUSE_FIXEDPOINT=OFF
 		-DUSE_FLOAT=OFF
@@ -119,7 +119,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+	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/*
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a91d71770d67..05c24b50807e 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
-if [[ "${PV}" == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	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/83"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/84"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,7 +24,11 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt
 # No test data provided
 RESTRICT="test"
 
-COMMON_DEPEND="
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	sys-libs/zlib
@@ -46,11 +50,7 @@ COMMON_DEPEND="
 	)
 	tiff? ( media-libs/tiff:0 )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	cjk? ( app-text/poppler-data )
 "
 
@@ -70,11 +70,11 @@ 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
+		sed -e 's/-fno-check-new//' -i 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)' \
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
 			-i CMakeLists.txt || die
 	else
 		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
@@ -119,7 +119,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+	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/*