gentoo auto-resync : 10:09:2024 - 12:30:41

8 files changed, 158 insertions, 381 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 7250174e68a6..aaf7197faca5 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,8 +1,4 @@
-AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f
-AUX calligra-3.2.1-okularpart.patch 2641 BLAKE2B 50018ab2b855dc88226b2a23b2eeac858882cbfeb9feca0d50202d951e23c315c4d4a2e225efc697584655dfb6421aeda4c7c48b3c279d7a4b60986acf2e8bdf SHA512 5c7de9bb020d750cb1565c49b9aabf41b622563823a7d3b3c923d00de495fc19357bd53d3a6fb87baf16c3a7cc41a05ccaab2cc6e425e53940aa5f2617dfc0f4
-AUX calligra-3.2.1-poppler-24.05.0.patch 2656 BLAKE2B 489d01bde30c24c80970f6073aa58fa785bfd86186aea45cb1a06e1f8907be0a2ef35e44f90eb14b315b5d55800639b52cf9f53748aca972ca0a4c328c2c455e SHA512 ae4a1c5654453827c65a2e49acbe23904db66f1179b76db47bd96106c56aa008440908ce712c6926a0fa99f33c89bd23d995df95f463075608b15295e2c3c6e2
-AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad099a9d2f258eb8b1fb73f3a891b7cf2e2822c9f50126aa0aaf21188845b95e37c1fdfa00efb33ec49a8b3b824b148d9df29f1e30e299cebd SHA512 e346c71767a07686d18f64849822f54efd5f70f72e871d8537e46b22a646c2d225800632d01b6cde6afa86bae57b1e329991a1d906648c9328f58f4e3ec3c7ea
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
-DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.2.1-r9.ebuild 6142 BLAKE2B 4ba441db86de6ef7cb1f3acce65f7969e53dd031a8cfa94277b83f1f5006e81042f399098456e4b27199d1652dddbef10972805350e98ba67d4e04e765931ee4 SHA512 4d17b3e68d755970323e3d99b3e11adc0676434ff1c51c5952220412a35ff3406a10dc32324e3a582e2b3fa7e0b70d92163cef0263b9acb3d53d6693158a2580
-MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
+DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78
+EBUILD calligra-4.0.1.ebuild 4412 BLAKE2B 8d674795aee91adee63c147ab2c5cb7120df5d6ecaf12c8209a2167948380dce3633e25d7441d5a529ee27e19b9f065402a4da09301a1293c571d037ce3b211f SHA512 82208e79971a96aa60d9e6ab0cc79281eedb7106a8330379508bc6f59ae2e284dc655fb57afab3fcc76d979e416f69c79d18b7951a5c5dfd34b80b8d14cb010e
+MISC metadata.xml 1183 BLAKE2B e5638f8f33c220b6c44a10a8ffb8bee7bcb9b1a387a0d69bdaca8778f9700baf6090ae997d4b13acc1702a98b0aaa8ac1aae479125c5386cdc42585ea079738f SHA512 7284037a405494efe0a270a19c39ee45843ccd13ebd44ce633c40cb43ac53fa93795317a4716a7e225ed4106a5518b5167200dfc8219836cb17ac2dfe84e8ba9
diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild
deleted file mode 100644
index 0503c3fba007..000000000000
--- a/app-office/calligra/calligra-3.2.1-r9.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_REMOVE_MODULES_LIST=( FindGSL )
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit check-reqs ecm flag-o-matic kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	PATCHSET="${P}-patchset-1"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
-	okular +pdf phonon spacenav +truetype X
-	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-RESTRICT="test"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-	gsl? ( sci-libs/gsl:= )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? ( media-libs/lcms:2 )
-	okular? ( || (
-		media-gfx/okularpart:5
-		kde-apps/okular:5
-	) )
-	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	lcms? ( dev-libs/imath:3 )
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	gemini? (
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224
-	"${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
-	"${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
-	"${FILESDIR}"/${P}-clang-16-configure.patch
-	"${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if has_version "media-gfx/okularpart:5"; then
-		eapply "${FILESDIR}/${P}-okularpart.patch"
-	fi
-
-	ecm_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use okular && myproducts+=( OKULAR )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package charts KChart)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini Libgit2)
-		$(cmake_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-office/calligra/calligra-4.0.1.ebuild b/app-office/calligra/calligra-4.0.1.ebuild
new file mode 100644
index 000000000000..f27d1244b2d1
--- /dev/null
+++ b/app-office/calligra/calligra-4.0.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+PATCHSET="${PN}-3.2.1-patchset-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
+	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	sys-libs/zlib
+	virtual/libiconv
+	charts? ( dev-libs/kdiagram:6 )
+	crypt? ( dev-libs/openssl:= )
+	fontconfig? ( media-libs/fontconfig )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? ( media-libs/lcms:2 )
+	okular? ( kde-apps/okular:6 )
+	pdf? ( app-text/poppler:=[qt6] )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] )
+	truetype? ( media-libs/freetype:2 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	lcms? ( dev-libs/imath:3 )
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package charts KChart6)
+		$(cmake_use_find_package crypt OpenSSL)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake_use_find_package phonon Phonon4Qt6)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular6=$(usex okular)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-DWITH_Freetype=$(usex truetype)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
deleted file mode 100644
index c723eca0b75f..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://invent.kde.org/office/calligra/-/merge_requests/81
-https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586
-
-From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 19 Apr 2023 10:34:25 +0200
-Subject: [PATCH] Avoid implicit declaration of atoi in CMake check
-
-Future compilers will not support implicit function declarations by
-default, so include <stdlib.h> for a declaration of atoi.
---- a/cmake/TestModernZlib.c
-+++ b/cmake/TestModernZlib.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include <string.h>
- #include <zlib.h>
- 
--- 
-GitLab
diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
deleted file mode 100644
index 75a3b0d05416..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-okularpart.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 15 Mar 2024 12:39:45 +0100
-Subject: [PATCH] Switch okular headers to okular5
-
-Otherwise it will be using okular6's.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +-
- extras/okularodpgenerator/OkularOdpGenerator.h   | 6 +++---
- extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +-
- extras/okularodtgenerator/OkularOdtGenerator.h   | 6 +++---
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp
-index 823d039b3b0..a4614f38f6b 100644
---- a/extras/okularodpgenerator/OkularOdpGenerator.cpp
-+++ b/extras/okularodpgenerator/OkularOdpGenerator.cpp
-@@ -33,7 +33,7 @@
- #include <KoDocumentInfo.h>
- #include <KoGlobal.h>
- 
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
- 
- #include <KLocalizedString>
- 
-diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h
-index 9107c52c52b..5564ec7f881 100644
---- a/extras/okularodpgenerator/OkularOdpGenerator.h
-+++ b/extras/okularodpgenerator/OkularOdpGenerator.h
-@@ -22,9 +22,9 @@
- 
- #include "kookulargenerator_odp_export.h"
- 
--#include <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
- 
- class KoPADocument;
- 
-diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp
-index 9ba114d6080..bccfb11a068 100644
---- a/extras/okularodtgenerator/OkularOdtGenerator.cpp
-+++ b/extras/okularodtgenerator/OkularOdtGenerator.cpp
-@@ -41,7 +41,7 @@
- #include <KoTextLayoutRootArea.h>
- #include <KoCharAreaInfo.h>
- 
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
- 
- 
- OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList &args )
-diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h
-index d3e9692b385..994a81aae2c 100644
---- a/extras/okularodtgenerator/OkularOdtGenerator.h
-+++ b/extras/okularodtgenerator/OkularOdtGenerator.h
-@@ -22,9 +22,9 @@
- 
- #include "kookulargenerator_odt_export.h"
- 
--#include <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
- 
- class KWDocument;
- 
--- 
-2.44.0
-
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
deleted file mode 100644
index 2ef45d675e3b..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt
---- calligra-3.2.1-orig/CMakeLists.txt	2024-06-05 13:06:55.730007129 +0200
-+++ calligra-3.2.1-dwok/CMakeLists.txt	2024-06-05 13:08:00.587082911 +0200
-@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD)
- endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
- 
--set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01
-+set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04
- 
- ############
- #############
-diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h
---- calligra-3.2.1-orig/libs/pigment/lut.h	2024-06-05 13:06:55.922010313 +0200
-+++ calligra-3.2.1-dwok/libs/pigment/lut.h	2024-06-05 13:09:24.460474108 +0200
-@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32;
-   template<>                                                                      \
-   class LutKey<_INT_TYPE_> {                                               \
-     public:                                                                       \
--      LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \
-+      LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max)             \
-       {                                                                           \
-       }                                                                           \
-     public:                                                                       \
-@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3
-   template<>                                                                      \
-   class FullLutKey<_INT_TYPE_> {                                                  \
-     public:                                                                       \
--      FullLutKey<_INT_TYPE_>()                                                    \
-+      FullLutKey()                                                                \
-       {                                                                           \
-       }                                                                           \
-     public:                                                                       \
-@@ -233,7 +233,7 @@ class LutKey<float> {
-       float f;
-     };
-   public:
--    LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision)
-+    LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision)
-     {
-       // Those values where computed using the test_linear and setting the shift and then using
-       // the standard deviation.
diff --git a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
deleted file mode 100644
index 07e31a0ed77d..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Thu, 29 Apr 2021 13:02:39 +0100
-Subject: [PATCH] Fix GSL find module
-
-This increases the CMake requirement to 3.2 so we can use the GSL find
-module that ships with CMake since then. The custom find module
-apparently doesn't work right on Windows, so...
----
- sheets/plugins/solver/CMakeLists.txt |  4 +-
- 1 filee changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt
-index 41bc4a77ae9..ecd4bd8d218 100644
---- a/sheets/plugins/solver/CMakeLists.txt
-+++ b/sheets/plugins/solver/CMakeLists.txt
-@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop)
- 
- 
- target_link_libraries( sheetssolver
--        ${GSL_LIBRARIES}
--        ${GSL_CBLAS_LIBRARIES}
-+        GSL::gsl
-+        GSL::gslcblas
-         calligrasheetscommon
- )
- 
--- 
-GitLab
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index b581a8d5393a..e6dded498c02 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -12,15 +12,14 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="cpe">cpe:/a:calligra:calligra</remote-id>
+		<remote-id type="kde-invent">office/calligra</remote-id>
 	</upstream>
 	<use>
-		<flag name="activities">Enable kactivities support</flag>
 		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
-		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>