gentoo auto-resync : 02:09:2022 - 10:16:01

6 files changed, 141 insertions, 4 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 630a6a79ebc7..6f61eeada376 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 6025d1006aa4..a076804cfcf9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,10 @@ DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3
 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
 DIST poppler-22.08.0.tar.xz 1840700 BLAKE2B 7e27eb1e41afb83633288d2d923a58e94590780f6f558e403928582de11c742781a12df11dcd7d9aadbfcbdae2662c83ae23f683552fba9e1984d3a0c4577f53 SHA512 bbff6d51eaafe58891357069c83e43ea25b4077755fa715a17b38660cd3cd546fa21d2e17a272d9b375f7e440e6e3661e84a20f18d445e0f28d06971abc04666
 DIST poppler-22.08.0.tar.xz.sig 833 BLAKE2B 8f6476068a78a0d145b2c43826ad3a73175a5506aaaecd14f837deb21b7a247154ba41e87877e35f249229871f006930c5849649a4310820020dc4cd7284497d SHA512 3c5350e5b9ddd872c4cf61e7463897298fbd4233be45241d6720e0debb6a0577dd45d663ba863bcc6ebb457197ade1093d518a363f3d277e382947c75a897ebb
+DIST poppler-22.09.0.tar.xz 1842704 BLAKE2B 7104dc18582611901e55dbaa84d9ae87121773370b677719c470c9804fd0a74164e72b4f39c5113531736e37327b59abb2d47b9dba58acf127180fed0cd3021c SHA512 bd288b042ad6fa31584d733b941b7ba72d9e68407fda5596827d559be0f46cf27dd8e0b1b7e0d58c997e29b18c5f086486f900965229c61e034e31d8ac474613
+DIST poppler-22.09.0.tar.xz.sig 833 BLAKE2B bda372fa8d8d3d7ebe4263f9f81212d69e09b50e787a853390191c1bfcc38fd65f8e524f3810b6d3d25820ba5b2fe3d337c9e661c0747a73d64cbcdfb06b8205 SHA512 678e374c184e403b85cfbdc954b80fa4132f37d34eb60854f7708d7963b98f4e57997ec9a9aa8e17090ee696ff5821c3479857ef3f93a69e32c3f25744c84e43
 EBUILD poppler-22.07.0.ebuild 3648 BLAKE2B d8a3eaa2e381a1a7e047e0cd475f18a00234e602a0c2e2d4e8fe30a95499dff0ef0770ba83a6b2fc0e533419625a47753ff757bf109e540b32dc7c65cb07a9ea SHA512 0059fc5a203855c2139bb56fc379b4f8d4679a81049e253344ddde27d6b0b978ef5a3e0263e0b6c3a93f6cc600284a2f2c433e004931e9a2ce5500fe8b319371
 EBUILD poppler-22.08.0.ebuild 3656 BLAKE2B 6026baa71b89b2e8150a2e2f9024da315555e0f3f367355654c00dce0c7de90ffdf34fb442f9006d16dce68e4057b314161597470ab007916c2e891ea80b5d33 SHA512 a44f7052d8d26b9feda589f33fe27a27b983de561cfbbfe02b126551282ac6594a59fc25e2515aaf941573d5c7099f55c63272c61051cfa2824d249ef63fb457
-EBUILD poppler-9999.ebuild 3656 BLAKE2B 6026baa71b89b2e8150a2e2f9024da315555e0f3f367355654c00dce0c7de90ffdf34fb442f9006d16dce68e4057b314161597470ab007916c2e891ea80b5d33 SHA512 a44f7052d8d26b9feda589f33fe27a27b983de561cfbbfe02b126551282ac6594a59fc25e2515aaf941573d5c7099f55c63272c61051cfa2824d249ef63fb457
+EBUILD poppler-22.09.0.ebuild 3656 BLAKE2B 8c14faaf9c7f78352d0508953ae0d1fe2cfc9c3695c2a40706ae7bb9241738a8bf766d5b0f8ba9fc2eb27f87cd04825fd0d23b65cdd99d30e7f307b1a57b72fb SHA512 7563541cfdbabeaa3b073d081ab2b62a566ebdc87e76df8043c5ca75113c638649d7294781c93943f4df1d2e97fcb915163b582b95b0484e433f7c8246d8d889
+EBUILD poppler-9999.ebuild 3656 BLAKE2B 8c14faaf9c7f78352d0508953ae0d1fe2cfc9c3695c2a40706ae7bb9241738a8bf766d5b0f8ba9fc2eb27f87cd04825fd0d23b65cdd99d30e7f307b1a57b72fb SHA512 7563541cfdbabeaa3b073d081ab2b62a566ebdc87e76df8043c5ca75113c638649d7294781c93943f4df1d2e97fcb915163b582b95b0484e433f7c8246d8d889
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.09.0.ebuild b/app-text/poppler/poppler-22.09.0.ebuild
new file mode 100644
index 000000000000..81157c1a12a0
--- /dev/null
+++ b/app-text/poppler/poppler-22.09.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/124"   # 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 02a66a8252b4..81157c1a12a0 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/123"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/124"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index c186c975491f..e5e2f82ef5a3 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,6 +1,6 @@
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
 DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
 EBUILD unpaper-6.1-r1.ebuild 823 BLAKE2B 318fda0b47ddcc8eaab88966f880bf358821e4df02a1bc0addf983e5be9c133dcdf70d0721c032d3775a8955f6febea884cb978921994fe7095d2f180c1558a5 SHA512 1a4052031ce06b27c637dc516a49d09808d10022fb972ae6c554339a89ab2aa2af5b8e4a1ff7db4454b844a08e0a5c8c9837bc37ff6018b270f63accc6d93564
-EBUILD unpaper-7.0.0.ebuild 692 BLAKE2B 04e6815d89126048c6b41bb98eb31260b827932311261d2c6992f7362c648d0a581c0487c0d37da4c722f174b989c548ac86ef0b2c4d98891be3332e128fca3e SHA512 a270959652502c83502a5c4aa004b78017378c1d5d2f93d4d14b46016dac4a50c44978c495d09750f1ca4072e5842f37d12fb2c2daf248c460f462f046079604
+EBUILD unpaper-7.0.0.ebuild 690 BLAKE2B 21f3ae6adbf00755b75de6dfe2a0bf47146defaff718f3eecc358460ba6c2b8f1f7edc21bacc91a10f7eb76615112c53b4b7a510d223d66badfc4254ff42d616 SHA512 885345a9c7fe3ee4aa3da42e051b57f57deeb50334c108cf807fb0e2cc56f7cf6b3acd27c43231cfce0e42c92fc37ef0f842e7457e34a3ca17a2632de98dd229
 EBUILD unpaper-9999.ebuild 692 BLAKE2B 04e6815d89126048c6b41bb98eb31260b827932311261d2c6992f7362c648d0a581c0487c0d37da4c722f174b989c548ac86ef0b2c4d98891be3332e128fca3e SHA512 a270959652502c83502a5c4aa004b78017378c1d5d2f93d4d14b46016dac4a50c44978c495d09750f1ca4072e5842f37d12fb2c2daf248c460f462f046079604
 MISC metadata.xml 309 BLAKE2B 56e5f343e13cbb687775cfafea22f6f9bcd783aa8a1f6291f61a640ef9cfbf9940d888769e86d7be39e420c3eab54a8e2c90cc705357bf7761adad620f1dda7b SHA512 cad7f3c104c6b07142c90c0f61d72ca1eb20063e63927850ee4519b245bf2239a5f1c2e24a979d4b66f65f061b4f3a8750e9c367387677d51bff70bc067eb58b
diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
index a26b83763386..77d0a4fbc40a 100644
--- a/app-text/unpaper/unpaper-7.0.0.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"