[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

["Sam James" <sam@gentoo.org>]

commit:     b08571d6741d6979f8bd38d11347cdde3fded69d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  4 22:02:44 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 22:03:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b08571d6

app-office/libreoffice: fix runtime w/ >=poppler-25.02.0

Pull in the fixes that 3d6f3eec3d12d7875acbd7742ea237e873fc535b did for 24.x.

See also https://forums.gentoo.org/viewtopic-t-1173061.html.

Bug: https://bugs.documentfoundation.org/165433
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libreoffice-25.2.1.2-poppler.patch       |  79 +++
 .../libreoffice/libreoffice-25.2.1.2-r1.ebuild     | 736 +++++++++++++++++++++
 2 files changed, 815 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch b/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch
new file mode 100644
index 000000000000..b7c7cabbedd4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch
@@ -0,0 +1,79 @@
+https://github.com/LibreOffice/core/commit/6a442575b7e802d1a3c4c4c18cd59a66d87a9217
+https://github.com/LibreOffice/core/commit/2e33e9aebf10adfb2663389a5051b32aa1c941e6
+
+From 6a442575b7e802d1a3c4c4c18cd59a66d87a9217 Mon Sep 17 00:00:00 2001
+From: Robin Candau <robincandau@protonmail.com>
+Date: Thu, 27 Feb 2025 10:26:53 +0100
+Subject: [PATCH] tdf#165433 Fix PDF imports with (system) poppler >= 25.02.0
+
+Since poppler 25.02.0, GlobalParams doesn't have a constructor
+that accepts a nullptr anymore,
+see upstream poppler b50390f748b59cb0a64b912636ecf6527bd0d12a commit.
+
+As such, the data directory location defined for SYSTEM_POPPLER
+needs to be updated accordingly (when SYSTEM_POPPLER >= 25.02.0),
+otherwise PDF imports fail with
+"General Error / General input/output error".
+
+Change-Id: I2a60b03a9ae20aab8d36db2a6827f1f3b9618115
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182282
+Tested-by: Jenkins
+Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
+(cherry picked from commit 406afe11711df9fcabbc829fcff00aef2f44c1d9)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182307
+---
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index ebed120708cc2..9b63559be44d9 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -110,7 +110,11 @@ int main(int argc, char **argv)
+ 
+     /* Get data directory location */
+ #ifdef SYSTEM_POPPLER
++#if POPPLER_CHECK_VERSION(25, 0, 2)
++    const std::string datadir = "";
++#else
+     const char* datadir = nullptr;
++#endif
+ #else
+     /* Creates an absolute path to the poppler_data directory, by taking the path
+      * to the xpdfimport executable (provided in argv[0], and concatenating a
+
+From 2e33e9aebf10adfb2663389a5051b32aa1c941e6 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@rene-engelhard.de>
+Date: Fri, 28 Feb 2025 06:52:32 +0100
+Subject: [PATCH] fix poppler < 25.02 builds again
+
+after 406afe11711df9fcabbc829fcff00aef2f44c1d9
+should be #if POPPLER_CHECK_VERSION(25, 2, 0), cf. e.g.
+https://cgit.freedesktop.org/libreoffice/core/tree/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx?id=406afe11711df9fcabbc829fcff00aef2f44c1d9#n1325
+
+Change-Id: I2b891eaab55a303d74e92335bb15b520af4805bd
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182344
+Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
+Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
+Reviewed-by: Robin Candau <antiz@archlinux.org>
+Tested-by: Jenkins
+(cherry picked from commit 344b71a1d1598465d7ebf6768aa68ad1db38d506)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182359
+---
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index 9b63559be44d..1cb85e244fbe 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -110,7 +110,7 @@ int main(int argc, char **argv)
+ 
+     /* Get data directory location */
+ #ifdef SYSTEM_POPPLER
+-#if POPPLER_CHECK_VERSION(25, 0, 2)
++#if POPPLER_CHECK_VERSION(25, 2, 0)
+     const std::string datadir = "";
+ #else
+     const char* datadir = nullptr;
+

diff --git a/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild b/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild
new file mode 100644
index 000000000000..775e15050127
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# not packaged in Gentoo
+	"${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+	"${ADDONS_URI}/dtoa-20180411.tgz"
+	# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+	"${ADDONS_URI}/frozen-1.2.0.tar.gz"
+	# not packaged in Gentoo, https://skia.org/
+	"${ADDONS_URI}/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"
+	# not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+	"${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+
+	"base? (
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	# Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+	"java? (
+		${ADDONS_URI}/Java-WebSocket-1.6.0.tar.gz
+		${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+	)"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds
+googledrive gstreamer +gtk3 gtk4 kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( java )
+	bluetooth? ( dbus )
+	kde? ( qt6 )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/argon2:=
+	app-crypt/gpgme:=[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.21
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.6.2:0=
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.18.0:0/0.18
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.35:=[nss]
+	>=games-engines/box2d-2.4.1:0
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1:2
+	>=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libwebp:=
+	media-libs/libzmf
+	media-libs/openjpeg:=
+	media-libs/tiff:=
+	>=media-libs/zxing-cpp-2.3.0:=
+	net-misc/curl
+	sci-mathematics/lpsolve:=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		>=gnome-base/dconf-0.40.0
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk3? (
+		app-accessibility/at-spi2-core:2
+		dev-libs/glib:2
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	gtk4? (
+		app-accessibility/at-spi2-core:2
+		dev-libs/glib:2
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		gui-libs/gtk:4[X]
+		x11-libs/pango
+	)
+	kde? (
+		kde-frameworks/kconfig:6
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/kio:6
+		kde-frameworks/kwindowsystem:6
+	)
+	ldap? ( net-nds/openldap:= )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	!mariadb? ( dev-db/mysql-connector-c:= )
+	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	qt6? ( dev-qt/qtbase:6[gui,opengl,widgets] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/2.1
+	media-libs/glm
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant:0
+		>=virtual/jdk-17
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/libreoffice
+	acct-user/libreoffice
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+	java? ( >=virtual/jre-11 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+	dev-util/intltool
+	sys-apps/which
+	app-alternatives/yacc
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+	clang? ( || (
+		(	llvm-core/clang:19
+			llvm-core/llvm:19
+			=llvm-core/lld-19*	)
+		(	llvm-core/clang:18
+			llvm-core/llvm:18
+			=llvm-core/lld-18*	)
+		(	llvm-core/clang:17
+			llvm-core/llvm:17
+			=llvm-core/lld-17*	)
+		(	llvm-core/clang:16
+			llvm-core/llvm:16
+			=llvm-core/lld-16*	)
+		(	llvm-core/clang:15
+			llvm-core/llvm:15
+			=llvm-core/lld-15*	)
+	) )
+	odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
+	"${FILESDIR}/${PN}-25.2-cflags.patch"
+
+	# TODO: upstream
+	"${FILESDIR}/${PN}-25.2-unused-qt6network.patch"
+	# add qt6 backend as possible fallback for gtk-based desktop environments:
+	# https://bugs.gentoo.org/950170
+	"${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch"
+
+	# backport
+	"${FILESDIR}/${PN}-25.2.1.2-poppler.patch"
+)
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+
+	# These test failures are largely added blindly in 25.2.1.1 to
+	# give us a baseline and then chip away at, rather than disregarding
+	# tests entirely.
+	#
+	# Various test skips from Fedora
+	#
+	# "Failing on multiple arches"
+	# "https://bugzilla.redhat.com/show_bug.cgi?id=2334719
+	# started to fail in 25.2.0.0"
+	sed -i -e '/CppunitTest_svgio/d' svgio/Module_svgio.mk || die
+	sed -i \
+		-e '/CppunitTest_sw_layoutwriter3/d' \
+		-e '/CppunitTest_sw_layoutwriter4/d' \
+		sw/Module_sw.mk || die
+	# "testStatusBarPageNumber it is said to "fail from time to time"...
+	# started to fail in 25.2.0.0"
+	# Skip tests failing with latest app-text/poppler (25.02.0?)
+	sed -i -e '/CppunitTest_sw_tiledrendering2/d' sw/Module_sw.mk || die
+	sed -i -e '/CppunitTest_sc_pdf_export/d' sc/Module_sc.mk || die
+	sed -i -e '/CppunitTest_sdext_pdfimport/d' sdext/Module_sdext.mk || die
+	sed -i -e '/CppunitTest_sfx2_view/d' sfx2/Module_sfx2.mk || die
+	sed -i -e '/CppunitTest_sw_pdf_test/d' sw/Module_sw.mk || die
+	#
+	# Fails w/ 25.2.1.1 on amd64
+	sed -i -e '/CppunitTest_sd_layout_tests/d' sd/Module_sd.mk || die
+	sed -i -e '/CppunitTest_vcl_text/d' vcl/Module_vcl.mk || die
+	sed -i -e '/CppunitTest_svx_unit/d' svx/Module_svx.mk || die
+	sed -i \
+		-e '/CppunitTest_chart2_import/d' \
+		-e '/CppunitTest_chart2_export2/d' \
+		chart2/Module_chart2.mk || die
+	sed -i \
+		-e '/CppunitTest_sc_array_functions_test/d' \
+		-e '/CppunitTest_sc_jumbosheets_test/d' \
+		-e '/CppunitTest_sc_subsequent_export_test4/d' \
+		-e '/CppunitTest_sc_subsequent_filters_test3/d' \
+		-e '/CppunitTest_sc_ucalc_formula/d' \
+		-e '/CppunitTest_sc_uicalc2/d' \
+		-e '/CppunitTest_sc_vba_macro_test/d' \
+		sc/Module_sc.mk || die
+	sed -i \
+		-e '/CppunitTest_sw_ooxmlexport/d' \
+		-e '/CppunitTest_sw_ooxmlimport/d' \
+		-e '/CppunitTest_sw_ww8export/d' \
+		-e '/CppunitTest_sw_core_layout/d' \
+		-e '/CppunitTest_sw_core_objectpositioning/d' \
+		-e '/CppunitTest_sw_core_text/d' \
+		-e '/CppunitTest_sw_layoutwriter/d' \
+		-e '/CppunitTest_sw_uiwriter/d' \
+		sw/Module_sw.mk || die
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# Show flags set at the beginning
+	einfo "Preset CFLAGS:    ${CFLAGS}"
+	einfo "Preset LDFLAGS:   ${LDFLAGS}"
+
+	# Workaround for bug #915067
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		LDFLAGS+=" -fuse-ld=lld"
+
+		# Not implemented by Clang, bug #903889
+		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+	else
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+
+		# Apparently the Clang flags get used even for GCC builds sometimes.
+		# bug #838115
+		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+	fi
+
+	# ODR violations (not just in skia/vulkan): bug #916435
+	# Runtime crashes with Clang: bug #907905
+	filter-lto
+
+	if use custom-cflags ; then
+		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+		elog "the build succeeds. Good luck!"
+	else
+		strip-flags
+	fi
+
+	export LO_CLANG_CC=${CC}
+	export LO_CLANG_CXX=${CXX}
+
+	# Show flags set at the end
+	einfo "  Used CFLAGS:    ${CFLAGS}"
+	einfo "  Used LDFLAGS:   ${LDFLAGS}"
+
+	# Ensure we use correct toolchain
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use qt6; then
+		export QT6DIR="$(qt6_get_bindir)/.."
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	# --disable-qt6-multimedia: TODO
+	# --disable-cpdb: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs=more
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-atspi-tests # bug 933257
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-cpdb
+		--disable-epm
+		--disable-fetch-external
+		--disable-firebird-sdbc
+		--disable-gtk3-kde5
+		# Covered by our own toolchain defaults
+		--disable-hardening-flags
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-qt5
+		--disable-qt6-multimedia
+		# Don't try to call coredumpctl in the testsuite
+		--without-coredumpctl
+		--without-dotnet
+		--with-extra-buildid="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-openjpeg
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-abseil
+		--without-system-dragonbox
+		--without-system-frozen
+		--without-system-jfreereport
+		--without-system-libfixmath
+		--without-system-sane
+		--without-system-zxcvbn
+		--without-system-java-websocket
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable kde kf6)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable qt6)
+		$(use_enable vulkan skia)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+		$(use_with valgrind)
+	)
+
+	if use eds || use gtk3 || use gtk4 ; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+	fi
+
+	tc-is-lto && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	emake -Onone
+}
+
+src_test() {
+	emake -Onone -k unitcheck
+	emake -Onone -k slowcheck
+}
+
+src_install() {
+	emake -Onone DESTDIR="${D}" distro-pack-install
+
+	# TODO: still relevant for gtk4?
+	# bug #593514
+	if use gtk3; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+
+	# bug 703474
+	insinto /usr/include
+	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
+
+	newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+	newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}