6 files changed, 247 insertions, 2 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index cd5f8d99fbd7..3b5a11fe9b68 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9d529d2bad42..b8d61c018b21 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,9 +8,12 @@ DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd0218
 DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6
 DIST poppler-23.10.0.tar.xz 1892152 BLAKE2B ce1b42d316e1d55567384fc5374af1a177f95cc045490bc3040b454106681f10959e192d961603443d3df2efe30350f70ab0bd2755ed099c70ab50019c2abdf3 SHA512 b945662746c5fc58df6ec05c637cfa0792702f49f589f1eef69a3aa06823274babd0d604cb8671cabc1341c3bfede1814b5d400fb2a9efe711bf04bd177cea03
 DIST poppler-23.10.0.tar.xz.sig 833 BLAKE2B 74bdf5548afae23cf17037f3810765afd82a8d7f2a908e49144733adaae5f2eff0adce97aaa0945a40a324b293cb5f7f88b996e783390b26f7c360886c6bb41c SHA512 3c02270febea589d72d60e3fd0ffff2cb0be84ffcf5c8c66fd4461e64827614e08d9351176a6880d64558247cd722adc42343a7a5774eb331e55141bfb8f661c
+DIST poppler-23.11.0.tar.xz 1894712 BLAKE2B a5083e30c6d0e5494541f5fb7282390647fedf738bccbc99c246649fdee13166638507f314fd7b069af6aca5829319840883bd8d8f50fd4685c54c7ac6fe3b6b SHA512 0312472ff80c10aaec0c06e6bfd3f74257672c2001301db4d44e28051387ad5ddd8126d45e82c75ff4585cfde8e34a68bcab2d979aa58c904c60dc3efb1b6f3d
+DIST poppler-23.11.0.tar.xz.sig 833 BLAKE2B 50b0de45f56370aa493ba2929d5aaf6355ea8fd1a4fc3dc10e1fe6e58ba688d03d9867736814f6d5c6d452df820e2fb081e250fcda00255f533661022e75d887 SHA512 f3f743ff614b839f270ee1113ed728b0f1d390e2c2e53828b0a42573040b6e6b4edbcec2c6b3b198088474a89a24e3af9ccb8717bf37734222436dd8049a8d6e
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.08.0.ebuild 4300 BLAKE2B 0f5d417e8a9c54c57a11a25dac0fc211c09aa8ff19273cabdda80dcfaef7fcab95326f0889308040788bbbc562ff508e6cda112353fd113dab592afd6e7f9374 SHA512 13eec68266ded3c35fe63a92364339ca97af4a9dfa2403c0c80e06bcb2ba54e3e90e3b6b5a05bed579b363fd387f68da2a5d62c5f5bc204794fb4768f03a362b
 EBUILD poppler-23.09.0.ebuild 4304 BLAKE2B c9f87f6ca910b457e409449e2575567566394412fdb772539668d626b3f10c0270b6b463847625a4f8d737dba4650c8f30415c31745e3e346d994270986eeb9e SHA512 5964e821a7aed09f88827d1bd37b35404b8ca2ac6c5eab5e019958ac13ad30948d25bc50363675c8a8351a3aaeb938424206bad7dea01c1fb2b6d7b31fe286e2
 EBUILD poppler-23.10.0.ebuild 4282 BLAKE2B dee9abb21878f0aec2d64ba8d29ac277ffbe2a87d32c4188746405e2cb7f28033d1a2d98c80db32d30c53e1654fa0a74f22c24965e72574dbd05d3392bfbab8e SHA512 c27abdf3006a59db903c1c9ee259e02f5db8537993cf366fb747a2d06ddbcffb81d685b40cd0280ece1feb9e5d362ccf79f1f9c4da17694517d4f38b9a4e8022
-EBUILD poppler-9999.ebuild 4291 BLAKE2B 65ba5801cf50a9e2394a0b96ddb24a158ab19a4866e288901379fd46d692d077207a5bdd4868a1a164552f6895da70cd22803f54790605fb9097a33f65983c3e SHA512 ac0e15c242fafc3948fa249cdf2526282bfba7c56ed3a34ae8fcf82b4d4fdb42954cf3c7d63f7d63f8e1552ea432a493a9188144508dabbdf07e9287a9059ee7
+EBUILD poppler-23.11.0.ebuild 4291 BLAKE2B 4180bc47dd2fcde638d535122218f701e688a68945cb6f8070c58b7d7c7de1a669bb5f75562be666f190932f87b8741db7c491d1a039978cf588cc7f7cb58fbe SHA512 96d862875963069e1aa793d375c1b327e1b4427c0133085fd2f98d40ab91afc07dc479fd0edca9dbbd68e92f6ee2808c759aac7194794ea78a220130adca1c8b
+EBUILD poppler-9999.ebuild 4291 BLAKE2B 4180bc47dd2fcde638d535122218f701e688a68945cb6f8070c58b7d7c7de1a669bb5f75562be666f190932f87b8741db7c491d1a039978cf588cc7f7cb58fbe SHA512 96d862875963069e1aa793d375c1b327e1b4427c0133085fd2f98d40ab91afc07dc479fd0edca9dbbd68e92f6ee2808c759aac7194794ea78a220130adca1c8b
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-23.11.0.ebuild b/app-text/poppler/poppler-23.11.0.ebuild
new file mode 100644
index 000000000000..aaa749ef674e
--- /dev/null
+++ b/app-text/poppler/poppler-23.11.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=/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/133"   # 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-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_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_LIBTIFF=$(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 0e0ce0bb1d81..aaa749ef674e 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/132"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/133"   # 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/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 82ebc68334fc..051a3e0e0e4a 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,4 +1,7 @@
 DIST zotero-bin-6.0.27-amd64.tar.bz2 69342785 BLAKE2B 0c324253d0f6b4385c54979f6806ee964fe4e349cbd18d5b67d93a68e6b4b0214ac52e29a2a30a3a301f300023fb980dc2386d827cec6d0aca2de08f0fd50d37 SHA512 558154c0458a6d820af62dbedd70dba99150a7e4a612685579c03efffe41338fe9606099ddffcc33ce29141754621b6ef547de470fdbfc8ebcffc179c7f11a40
 DIST zotero-bin-6.0.27-x86.tar.bz2 71001470 BLAKE2B b79488085f4ec646a94b8083c7556a7b8086d7e0f8a76349640f857b1df0ef6ad8856b5b614fdadfef04f3f66eedbe93095e2b49545abd8f62cb32139a7dc9b1 SHA512 7ee3d746d08980638402391f275094be545e7aaf6e5713d9dee4dddd921aace177cd29ee4e2965d39805d5ddcfbb3d68c025fae4a612fa23337104429dec467d
+DIST zotero-bin-6.0.30-amd64.tar.bz2 69463179 BLAKE2B e853e51ca11ef1a0f026819010773753030198f15b67ea1247ea5d8329442118e53d4ab4a213f32fd1fc9f6c4c94ea0f9aaff4fcaec1005c493b64b890b5ca38 SHA512 3ad9757a038b433221c26d3a27b4a5f3ece7e481c021ca936187ea491426b3e7e4a57b17b5ea712d3e453c244e62fa1eecc6de70ac9e1d54847637642f695ddf
+DIST zotero-bin-6.0.30-x86.tar.bz2 71098560 BLAKE2B bc0914c3bddc171207d27b94c35dcc031b85dcd2d177fe63c4415f372366674f1cbc9136721402db3fd4a74954c63ee41b4a77009b2260b8ecbf0bd145a80706 SHA512 2148ef94e1bb64c83b05212f19e3ee230a57c9298f4d05bc09dd34979c4b607fb49831e391aea247a32aae7673278204ef5eefbef9fe26d8a6beed7c98532a72
 EBUILD zotero-bin-6.0.27.ebuild 2123 BLAKE2B 002333800d6de75353c67b627a4c37eec438ed338f85ac2897591521e5fcacf36b195e9374130916ab351ca3e0b81468c54e144771200d68e2aeb0dbf0981d48 SHA512 a722774343d2628f4e008ccb344fef088225585ccc6217e88ce31d21f9e029925dc44c5b7d794df54659b1a0e1a227f944844625da299fa6e1f951ca09816db2
+EBUILD zotero-bin-6.0.30.ebuild 2123 BLAKE2B 002333800d6de75353c67b627a4c37eec438ed338f85ac2897591521e5fcacf36b195e9374130916ab351ca3e0b81468c54e144771200d68e2aeb0dbf0981d48 SHA512 a722774343d2628f4e008ccb344fef088225585ccc6217e88ce31d21f9e029925dc44c5b7d794df54659b1a0e1a227f944844625da299fa6e1f951ca09816db2
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-6.0.30.ebuild b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild
new file mode 100644
index 000000000000..07c557e6c051
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+	amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+	x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-core
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	# disable auto-update
+	sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+	# disable default oo installation questions - manual installation is still possible
+	sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+		extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+	# fix desktop-file
+	sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+	default
+}
+
+src_install() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	dodir opt/zotero
+	cp -a * "${ED}/opt/zotero" || die
+
+	dosym ../../opt/zotero/zotero usr/bin/zotero
+
+	domenu zotero.desktop
+
+	for size in 16 32 48 256; do
+		newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+	done
+}