From 8b4349b75818953123e2d4b80963181a9640c8e3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 11 Mar 2024 12:45:52 +0000
Subject: gentoo auto-resync : 11:03:2024 - 12:45:51

---
 app-office/calligra/Manifest                 |   2 +-
 app-office/calligra/calligra-3.2.1-r8.ebuild | 195 --------------------------
 app-office/calligra/calligra-3.2.1-r9.ebuild | 198 +++++++++++++++++++++++++++
 3 files changed, 199 insertions(+), 196 deletions(-)
 delete mode 100644 app-office/calligra/calligra-3.2.1-r8.ebuild
 create mode 100644 app-office/calligra/calligra-3.2.1-r9.ebuild

(limited to 'app-office/calligra')

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 959c78592d01..c27dd9adc542 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -2,5 +2,5 @@ AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146
 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-r8.ebuild 5947 BLAKE2B 4e457c14b13860660e64044a06c15bc741f1ee1fdcb3beda3bf6d3e0e3405a3224340639e86b88264295c2030f44e764c1bcf962bac8bac50777ff540cf847eb SHA512 4921fa8ed73322e6169974da81eadcab65ab1563c6247c09739c28c5b474faa8343a7812c888e2c374d7bc0c5bcb49e96308d56c47a7ca806a8be36e0b0f286c
+EBUILD calligra-3.2.1-r9.ebuild 5990 BLAKE2B 7dd5864184a3246c72da06b964358846700f31bf42f7c3abedaf5976ba53e0859a2de906c639dfe6d3af88e31671b8e29f950e0c686423d18fa135ab15bc90ca SHA512 3b8792f4c1ab4e71ac4c2ea49e177a292928bb57ab95a54fecce3a96c7a6ad7c0b375c6b6140b75ef4b2cf8e81a9a29731ebe93a26772cb73058fe198c3df9f9
 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild
deleted file mode 100644
index 32df8e62e124..000000000000
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2023 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 )
-	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? ( 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
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	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-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild
new file mode 100644
index 000000000000..fb8f5a53b31b
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r9.ebuild
@@ -0,0 +1,198 @@
+# 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
+)
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	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
+}
-- 
cgit v1.2.3