gentoo auto-resync : 03:02:2024 - 11:44:27

6 files changed, 164 insertions, 4 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0a350c0faf55..f15c6159df05 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 60313d1c9aec..b654a28283c1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,9 +5,12 @@ DIST poppler-23.12.0.tar.xz 1895580 BLAKE2B c63699d4ba62fd739b49cd94fd9510abedf9
 DIST poppler-23.12.0.tar.xz.sig 833 BLAKE2B b8dbbde8d6324fd65e583ad5eda04ae531ab364e3afd925c082ac102e6a00368b5c966a890e1b84089845f866b4afb324383d6d47e3d509356e2a5a857f4cdf9 SHA512 817ac3210a191535b037ebac78ebf4d67d3ac055cc54be2a0614ddaf757f6fa4aa5de4f1aecfd1a26a2290c190e14830a925fd83d102aca7afdd6e8fb1e98281
 DIST poppler-24.01.0.tar.xz 1895736 BLAKE2B 16c87a4338c73fcccfac3ac477807a7f96c8e95e68efff484d9d544da10815972f20d40f71091c6092913d82b205ca0d1bd25acbaba79277e1a1bf19ba397e6d SHA512 ddfd924f6559e482daa6c87b4201f8a318038bdf654f7449e33aec296c393438a3f1c6dc9ede5956c7f1d9ef02e3aaedf3031dff166665fbb0a762587ec00caa
 DIST poppler-24.01.0.tar.xz.sig 833 BLAKE2B 9ddb5d4bfef8cef1352ec2945c24e94b2c9ce75953f64c7065f884babd62b7809238a48eaebfc2dd468a31ebc4cb003783be1413ed8e6a4e36b888c7f78009ca SHA512 319dbad79ddddd168097ff4d37488d00649f75802ccfcffe807b9260ccf057c6dddc6e51e0d1f003337c50b21bf386ff9796a77bc2cb2f0964083cae00c2de0b
+DIST poppler-24.02.0.tar.xz 1897604 BLAKE2B ba97ea0807eab8e27112f66bcdcc695fe71881b873e129ebbaab521ad895815cf782faf9e32efd8530ec7c840546a505ef9a1b195258dafd55ce21fe4e11250e SHA512 95a208d21ac4d2d308a7ab3da43b95092ef78cd55ebe873c97e0d6c12d8b9d5c4614f83087616c35e1ed9d67ca606a5e008a98698bd12a332a8206ed4cf55500
+DIST poppler-24.02.0.tar.xz.sig 833 BLAKE2B 9daed6e9c3ba6f42f7b7e81abcf835658a03c4041a221b1de2e3a8e016eebe7b369174379f8faadb6119cac4502bf58e9f1c548e401d417d8ef5c1a2ab5fb322 SHA512 9bb03899e5fc475097a3422ed5f03b528796dc09d14bef0dabbbb457f9d5b20b48db462cc1478522803bae42c5b25ef46715d3ff6c26f4582f2ecf9c1bf1598e
 DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.12.0.ebuild 4417 BLAKE2B 4068f1033dfad1eec7197867b403acfc234cefabbd4251a87a0c430c0af7a913f4d1eb93240419b6bb2c1e033b47368046cc952357b717005b731c2462d2efa5 SHA512 0c957eca00c9fc801d0284ef57451805b379d669a7e92bdfe7ae49fdd8567453cb34b4eba4b439872ddea8e87187d0de8bd13640a5c3a81555e571089e6270f5
 EBUILD poppler-24.01.0.ebuild 4425 BLAKE2B 16a3409372152844fad309d7780b528445a8965512f1e58229f1d986561fca829b92222b0a2f48f4a32353b1e00d3c640b7c06a7097208f1637c54c5e0eefa80 SHA512 fd2d1219557068b071a2fe599b942e7b235b302b459f464d9da69013b4837a26c8bd57736b1e57a314dec2211a883b3ddfded7c0178c753265aab66e4488d7d2
-EBUILD poppler-9999.ebuild 4425 BLAKE2B 16a3409372152844fad309d7780b528445a8965512f1e58229f1d986561fca829b92222b0a2f48f4a32353b1e00d3c640b7c06a7097208f1637c54c5e0eefa80 SHA512 fd2d1219557068b071a2fe599b942e7b235b302b459f464d9da69013b4837a26c8bd57736b1e57a314dec2211a883b3ddfded7c0178c753265aab66e4488d7d2
+EBUILD poppler-24.02.0.ebuild 4425 BLAKE2B a7e8cc6a608dd16ba3e9cf555c1948a7f81edda3901d5b757d22f797559f17fb186f5b332de4f4d0834d1f15a1d33c7050420da18041e0add04ba3b32120e2ff SHA512 dee77cab2ba9e6d8aad830247760ff0838c7d724e5fe7f8f471f896e5a2f8c7666ff2b1c8d52f936c138069471247923b248b8b05f2a63a2ef3707a591a4b79a
+EBUILD poppler-9999.ebuild 4425 BLAKE2B a7e8cc6a608dd16ba3e9cf555c1948a7f81edda3901d5b757d22f797559f17fb186f5b332de4f4d0834d1f15a1d33c7050420da18041e0add04ba3b32120e2ff SHA512 dee77cab2ba9e6d8aad830247760ff0838c7d724e5fe7f8f471f896e5a2f8c7666ff2b1c8d52f936c138069471247923b248b8b05f2a63a2ef3707a591a4b79a
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.02.0.ebuild b/app-text/poppler/poppler-24.02.0.ebuild
new file mode 100644
index 000000000000..820eeeed8598
--- /dev/null
+++ b/app-text/poppler/poppler-24.02.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 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=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+	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/134"   # 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 qt6 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
+	)
+	qt6? ( dev-qt/qtbase:6[gui,xml] )
+	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
+		)
+		qt6? ( dev-qt/qtbase:6[widgets] )
+	)
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.10.0-qt-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_QT6_TESTS=$(usex test $(usex qt6))
+		-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)
+		-DENABLE_GPGME=$(usex gpgme)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	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 89d10798980c..820eeeed8598 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/133"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/134"   # 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/rman/Manifest b/app-text/rman/Manifest
index 8cce91827d6b..78f24fc2c2df 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -4,5 +4,5 @@ AUX rman-3.2-incompatible-pointer-types.patch 788 BLAKE2B 00cee69b9979220858cce6
 AUX rman-3.2-ldflags.patch 339 BLAKE2B fa4e72627e79841e2650025d9772953834907a41f06e3a18d8a0bcae83cf104724cf29023d128ec272656d4ba9696b05243466372299f20b796ee8d3cd495fdd SHA512 ed9350878621a90aea9467afcf0fe1110c9b876c236c314e0d7566ee6c5674663c47457f8acac76517b0409f3eccff91dd3e869de1c3d1002a671610fb1e38af
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
 EBUILD rman-3.2-r1.ebuild 739 BLAKE2B 960966472a8b65c2620776ab56f68ea71b29ade9bf2d845bab25b9dfb2c65e78c973e42de3433cb1a122b4812fa749e5430b013bf113039098f12d5c8b0f7dde SHA512 092e29fb731d78769718e57567bb776fcb6b77ecbbb8c052c0779b8f52bbb5ce2a220ea6c9f9b0f59a650e9e7f462c0eab43a32162e1c474c2757d513dd9740a
-EBUILD rman-3.2-r2.ebuild 793 BLAKE2B e9c8bb3623a50d14ce294c5cf86536f5a5387cae4de4672dc91fee02a9a3ded1bb3ea8f13a1a641fa73aacd5648331b88f145beced1233d1eca9d3655eedc2e5 SHA512 14441cdd1c32a40d1391dfb09f639a415bb2446fca3da15da2a89c69942027edd0c0158a28baef83cb34f7efabbdcfdad503ae9cb0b4405a8f968817d18f383f
+EBUILD rman-3.2-r2.ebuild 792 BLAKE2B a5b759f3c608f92f3458f967ce702f4fab87f0e14dd16e119dcadcf727a7b7c4a83c847577be5471ef99b337663ac52d87c875cd155bb8dc1d6cdeb9f50a4c92 SHA512 4e9c2528191622fd6ae323ec4ce502713d70cbaf47ec7d78d2846c720599f09d332020a16c23e77b452b6809e88c46866f67f3ba555b26980602fa6ee444bcc2
 MISC metadata.xml 335 BLAKE2B e1e40513a1eb6dfc9eef963cb0d745afda68a3c9e8a7bf6eb0b91ad45378a7032c9e9fc3163d52c0ded151f31748d8c0365fdf6dde36605f25dffd2ea071f227 SHA512 c388881c5431def3dce4fb6a70357be1b5517a7059d92b1884396836aba708ca965bbee6939380151387a8ef1d5cde21aa7e3b4a7d5c67600547b50646ad72e1
diff --git a/app-text/rman/rman-3.2-r2.ebuild b/app-text/rman/rman-3.2-r2.ebuild
index 3b0aaff20b5f..aa1eb01c9cef 100644
--- a/app-text/rman/rman-3.2-r2.ebuild
+++ b/app-text/rman/rman-3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RESTRICT="test"