gentoo resync : 12.03.2021

4 files changed, 128 insertions, 4 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e9071625655d..22bb8dc4e474 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,7 +7,9 @@ AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
 DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
+DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa
 EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
-EBUILD poppler-21.02.0.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
-EBUILD poppler-9999.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
+EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B c586ed066559ded8afac18d7d85cb24d34164b42503f8c87a5c6c791f4faee990237abed528432b02a5f66bf6feac598807177b498a1c1ca53e740481ad6d183 SHA512 c0514348aa20d7f80b13a3f7343548b7c0dd0f3e1f4f4f777f8df1779c30df70bfe642d14293e31af07ca80e7590f5ad32a890692ddab80dc9dc40d7416c41e2
+EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
+EBUILD poppler-9999.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
index e6d3d0fbfba5..d24ddd8550fb 100644
--- a/app-text/poppler/poppler-21.02.0.ebuild
+++ b/app-text/poppler/poppler-21.02.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
new file mode 100644
index 000000000000..8c97e95774bf
--- /dev/null
+++ b/app-text/poppler/poppler-21.03.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/108"   # 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"
+
+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
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	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= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_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 -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-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_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_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 e6d3d0fbfba5..8c97e95774bf 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/108"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"