gentoo auto-resync : 05:12:2022 - 03:04:53

4 files changed, 139 insertions, 2 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c6545d7a352d..32f063249b88 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d3ed3f688b17..ec97f42ad90f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,6 +3,9 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 DIST poppler-22.11.0.tar.xz 1845444 BLAKE2B 958eb5e99725e46f3fd79138f4e1197ede9df5be19b6e5b0899b6a8c8b071734b3b41af7681bd857662e7d9c36fde09117418c1db347c5dad9a2fbd07cb1eec9 SHA512 a173681782b4f6c4528140ce73d1f4c0ca89a018eab7197d69f1a76ab3e6115c7c03f82e99a8b3e5729c0f75b82896e59b38762ed460dd29b704ab4a03926e7b
 DIST poppler-22.11.0.tar.xz.sig 833 BLAKE2B 8ebe07b5276272a29b9e7a427c066fb76a84c3ee1b7e259ddffe396c9c7798bb35092c2712e4d2d1f1ca6ec5226cf876717fb6858fe83cca1c39db25e231e1c9 SHA512 dabfbcb6bfde638fce6019a028e0d20951169a21751eb2474e67523800973a65dcb47855c8a908946026e3676cf0b1f782bcdd780fd5da0f035576df54610403
+DIST poppler-22.12.0.tar.xz 1845856 BLAKE2B 73003b19b21ab7ed8ce4de813fcfc4b22dcae19669a107e6618d8784958da55cfa93b2045988e45f7ffae918930560fa9e8afeabb6fae8b2a48ddafdf5d4f4d2 SHA512 5ebfa3920922a94a1ae67aa179c0003df498c018d1c3850568637b966c6cf670ff221b4225e875e1c531d6b7d7e06a63a19b9fbe3ac1f589441aaebf23ca8a09
+DIST poppler-22.12.0.tar.xz.sig 833 BLAKE2B 370e8079f8d703d1c5f674e513dc849fa1747adf440178c25e09b4a075eaa47924ad75821f176d9f692d0167ce08f683bf67b71b8e75c43fe9e1e9addf820d48 SHA512 305ee75a40612018edc44cbdffa126d3033bc900f62636babc8b6638a689e14567830a1d26b5e303ac303cb5e3d9c10bf331493754ab5ef4074fd17521bf06e6
 EBUILD poppler-22.11.0.ebuild 3648 BLAKE2B ccc59afc96303d8484650e8141bf7f7c269b72aa288787b2705ff20cf00df80a436d97426859a0a90af35bd025483393e79654d08dd23160710c72d359009587 SHA512 65944d61906c544906fb17380c87002705c6cf47e29a261763d3b7b6aa9c894f42a67a6ba937d0d9bd5f68991f44687c88b53c2e3ed5c7c41438c4731fcaa2ae
-EBUILD poppler-9999.ebuild 3656 BLAKE2B 2da2cabf00caa4729e0fc70f265694a1ae97e6f1fbbf71f462fc79d89f15aa92fdf964cc45c563e4a00dc426f22bd499e41c99459288226d1bdf5b7137bc353e SHA512 1f77e93ca0ab9c18c2f9692b4a51cc81ecae1168a52562eced65bea5b9e8719c25767640812eb90f7d47419d8c04fc3294e11528b0b1dc4923cc34d1f492b0aa
+EBUILD poppler-22.12.0.ebuild 3656 BLAKE2B bbf9b2f7541b25af4af7df7d11fd16390125612725fa020a59fde603d8d8228239c20e3b2f6c0af048abd527b944437f68121fd9643282a82b459e6c72761016 SHA512 b3a56cf76e24580508fb78c7575fadab8cf716ec881361965c9ba64ce55afef66cdd815144c9383b50d8a6f3e50fe59ae6d9c361c48251248a2d65fd7642b4af
+EBUILD poppler-9999.ebuild 3656 BLAKE2B bbf9b2f7541b25af4af7df7d11fd16390125612725fa020a59fde603d8d8228239c20e3b2f6c0af048abd527b944437f68121fd9643282a82b459e6c72761016 SHA512 b3a56cf76e24580508fb78c7575fadab8cf716ec881361965c9ba64ce55afef66cdd815144c9383b50d8a6f3e50fe59ae6d9c361c48251248a2d65fd7642b4af
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.12.0.ebuild b/app-text/poppler/poppler-22.12.0.ebuild
new file mode 100644
index 000000000000..59d2a7208b3a
--- /dev/null
+++ b/app-text/poppler/poppler-22.12.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/126"   # 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="boost 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
+	>=media-libs/freetype-2.8
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	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="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.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 tc-is-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
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-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 89fdf77aacf0..59d2a7208b3a 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/125"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/126"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"