gentoo auto-resync : 07:09:2023 - 22:29:07

6 files changed, 159 insertions, 4 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a1f2a7c922ef..843869305340 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 39472fef3ce5..6adb957bf5de 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -6,7 +6,7 @@ DIST pandoc-3.1.6.2-linux-amd64.tar.gz 31164360 BLAKE2B cdd787a2c6b2bac3a9a1a3d6
 DIST pandoc-3.1.6.2-linux-arm64.tar.gz 33827200 BLAKE2B 710829bbef6764a3a373a75d29dc39b843de225bf71d25da2875cb4e85dc4baa30be5879e0af5d3d8810efb92bad95f2595d04c6cb0135fb96c600bf7031f352 SHA512 d4bf649d8a055ed3df52e19caf2424dc7e57d48182e9784bba2f9c7d6ebdd08b329c36fb26a28e6362bb5b24a39ea71f2604a64af471ce6245f464cafb6657cd
 DIST pandoc-3.1.7-linux-amd64.tar.gz 31182797 BLAKE2B 5d474dd9dadd37b561c70deb8a944a51bf30917dbbdd5778c8b0d543af08ff2621b033825b7128021020fd0c6b5c35163a42c301e75fdf4c68621deb900dc90f SHA512 72a84ee2ad5e3052d46150ac67b7fa7fc5e9ccb11ee86b9a819707dd319ac38b2a31fe069df4b2f548d239b7989bae660250e1666c7f90d83d8027587d8b5e08
 DIST pandoc-3.1.7-linux-arm64.tar.gz 33851504 BLAKE2B 3ef6121e1c51b0ce1cdca4b8665085072d1143f6ceb985ce2baff9e2bd9bcd2d797c231154a4960d8ddd578bc13311b20e505a2513e90a69b7dd37c0d298cafe SHA512 cbfff5666be1dcc62046d108754daaaef93c91f1d3e3eb28ee1e5f564e6b200919582448e0eca5cafa7db092bda82091b0a152c331b8b642e27191f393816835
-EBUILD pandoc-bin-3.1.6.1.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
+EBUILD pandoc-bin-3.1.6.1.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631
 EBUILD pandoc-bin-3.1.6.2.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 EBUILD pandoc-bin-3.1.6.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631
 EBUILD pandoc-bin-3.1.7.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.6.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.6.1.ebuild
index f5289c741e6a..254155b50637 100644
--- a/app-text/pandoc-bin/pandoc-bin-3.1.6.1.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.6.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 arm64"
 IUSE="+pandoc-symlink"
 
 RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 03e99910d165..981a9b9ee87e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,7 +3,10 @@ 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-23.08.0.tar.xz 1883408 BLAKE2B a35e44cc590e34991b27e53caf650dedf4d4aa4f9f82ed5d8a57b0ca6bb863c96fe0e9b9c9021b9722db48896d236c9e057bcbf45e9609eb237bf00481e91428 SHA512 4f4e3fab9c7de5913496862ce7158a4d79e252c36e4c461980a2ac77689897d02ab292965ea12fb02ea7720e34f98331251b914c0ea8be66842fee0d76779ba6
 DIST poppler-23.08.0.tar.xz.sig 833 BLAKE2B afab91ff9f799cc6c5864275bebf580098449ca070fa5eca47ff54007e94eef4a33f3762390a509d21471af81f9d731951bdbc1ff4adc162763bf54e7dd84408 SHA512 896905f056265388872de552aac94c64abc29f82062ecb2a5137288e4594ca87cb7372807bfe4c30fbc08a3d3922ce84bbbe7260a35e19d438f6bc88d230429f
+DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c
+DIST poppler-23.09.0.tar.xz.sig 195 BLAKE2B 540229bef6c04adf874984f84415a1f89949ea7fc22e86f72cbbafb5a9dfa99e62087237542084bc4ae6e66205ad596b84f68b9cc818bc4f070325c17c2393d7 SHA512 5bdda1b83a3f73a9be203b6ebf359a4e19137bbbc705413fd5e55539d65ca4a6f2b05e055eabe4dcdf8d38387a272bcb7bd64c9aef83c3d12f8a43cdab7b8cc1
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.08.0.ebuild 4310 BLAKE2B 3432859fb7c477736f0aa6b3309620a0802e8ff720bed72968c5a8c1e57b72e0e8bc80ebd350398944b730610a30aa22a1f5c25992a2ef21f314768b07ee4581 SHA512 fd3829b708941707afac4d610e708c0aae2f2adb5694a222d6c9fac7e45708d612795d6ee7b3645e6327baad30b2939faabd0bf65d712a47db405b8c6df879de
-EBUILD poppler-9999.ebuild 4318 BLAKE2B 21054f878ab46581b341a7f84d3b68a96d9ed1299d97efb6d6c9a8ca2a029433ce91a59231c2f441126eb2e41c943c1b6aa673ed522d5b5c537222e0ebf8ccf9 SHA512 ad437fa5ebf5e94a0d43c891bc2b201161f9f99028862c4ce5c087b59cba0d5d4f54b116ca993c8fe203f67cdf5cee233d7b143b3ce9d29eab870299a75b336d
+EBUILD poppler-23.09.0.ebuild 4318 BLAKE2B b337fccbf643b5e4fff7cd423cb7e88bf043ecfd360205a03c13676812f421d1da22b7be869344ee7253b609490e81e63708c9a13fdd661aeeef2f9229c7a45b SHA512 4b39eb4eb004ace9bc2db0754a03f2490b29e22ccea61f691e625861d3cbdc306ac8534fdebaa8895885d751d0cdeef4afe5f8eb4d57700f7e626d4e331e4c06
+EBUILD poppler-9999.ebuild 4318 BLAKE2B b337fccbf643b5e4fff7cd423cb7e88bf043ecfd360205a03c13676812f421d1da22b7be869344ee7253b609490e81e63708c9a13fdd661aeeef2f9229c7a45b SHA512 4b39eb4eb004ace9bc2db0754a03f2490b29e22ccea61f691e625861d3cbdc306ac8534fdebaa8895885d751d0cdeef4afe5f8eb4d57700f7e626d4e331e4c06
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-23.09.0.ebuild b/app-text/poppler/poppler-23.09.0.ebuild
new file mode 100644
index 000000000000..1db2523f013b
--- /dev/null
+++ b/app-text/poppler/poppler-23.09.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2005-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic 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
+
+	TEST_COMMIT="e3cdc82782941a8d7b8112f83b4a81b3d334601a"
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+	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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/131"   # 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 gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+	)
+	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.71 )
+	test? ( qt5? (
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	) )
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )"
+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_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+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
+	append-lfs-flags # bug #898506
+
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+		-DBUILD_CPP_TESTS=$(usex test)
+		-DBUILD_MANUAL_TESTS=$(usex test)
+		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-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_Gpgmepp=$(usex gpgme)
+		-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 5dfdb51b9a97..1db2523f013b 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/130"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/131"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"