gentoo resync : 22.12.2021

4 files changed, 311 insertions, 0 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 4bb34ed1d8e1..c66074d10546 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,5 +1,8 @@
 AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
 AUX calligra-3.2.1-cmake-3.16.patch 2484 BLAKE2B 7a3aad5be9c793e027b9dcd2344f86622ddfbe0272ae0ff5ed624cbf030168148704dad5d225a8930ba3c7e5d18cabe9493603ffe16c47511f10deb064c47f08 SHA512 8dd6498dd5b225a630f69da37e5e53f513c9d4bc764e3ddedfb06b6403faca298358340264366972953ca5cc4ec3c2eb59fe76fb7fc0d924653a5c885f2a5e4f
+AUX calligra-3.2.1-imath.patch 971 BLAKE2B 10686e8aa72d7a6953393863123ca42f3cfaa3bad50e3a38876418d564f917a7f9b1009f972330a6e1abe4ef0e2e40ddeb02a62dc05c52ecbb94718beb468e51 SHA512 3ed2f1e92519baec97f110bb07c8a47fad14779c6dcc30ad4fa2bd13b18867258b9bf08a2e99ae732cdc4372dd462b0872abaebb5eef0e093934a70140c46591
+AUX calligra-3.2.1-openexr-3.patch 3188 BLAKE2B 221e8925f86418ef491a2e43c0e2981be4962b2afcb74465a93f3af22ad6cedfd36119006831d89af8b05dfd5b833f3a5ba0f4593559377b5e20d0479c981e22 SHA512 4ad40876e68317fab59dfc7f5672ef850e40edf636dd6ed996a8239850fd4705825e18db86f132d4d0f06540e804c66d86b1954702187f57b90fd811d2c59bf5
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
 EBUILD calligra-3.2.1-r3.ebuild 5252 BLAKE2B 4d281a3ef6890825a4cb19b15f6ba718d73c872084c793438709fc91fe8a50bf439906b2ddbfe42f0497bce6495765da7733452938aebfe11a26635cd76c79ed SHA512 9f7f0da34a639688d73a3a4a1175fce3fab321ea67917869c7009e50a0ad4025647497955006851e8ad555823f1984eef0be0c2267522427be14ebe2b0554327
+EBUILD calligra-3.2.1-r4.ebuild 5322 BLAKE2B 94bbb0e51fd12b140ca1657a4baeab5a88619b59222c8463cf52497161829edeb5234fe253957ff39b0a03d7d4a5509bdb47cca2a2ae00f17956a888e5efda59 SHA512 5a15cf0c27026a70fa797bbeaaaa826ce16999b45a7fa2b79b99836cec635dbf10903312253ee5ae8c7929a2d37fd4a43d0382ec87b6451428ffcdd9fc2cdead
 MISC metadata.xml 1218 BLAKE2B 0989022a6025992ca04069a3f1e77e626df5a37c51bb1f6889e81360a6dd7a11311d319ba874e9dbadcb98ec53e6c1436563ecc6baf047218bd23adc726499b2 SHA512 b8b0e4cc426a2ff43211ef9f5b9d72db6ceefb26f22c49c32805bdfa7716920e54d09e19836e5da7293d9ac264364568119a64ee458f3f51f85dafe4e050f835
diff --git a/app-office/calligra/calligra-3.2.1-r4.ebuild b/app-office/calligra/calligra-3.2.1-r4.ebuild
new file mode 100644
index 000000000000..6ef745321e5d
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 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=5.88.0
+QTMIN=5.15.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}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~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/qtscript-${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/kross-${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-frameworks/kactivities-${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 )
+	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=(
+	"${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
+	"${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
+	"${FILESDIR}"/${P}-{openexr-3,imath}.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
+		-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/files/calligra-3.2.1-imath.patch b/app-office/calligra/files/calligra-3.2.1-imath.patch
new file mode 100644
index 000000000000..62a2daa2f5dc
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-imath.patch
@@ -0,0 +1,30 @@
+From c52eb33f20a66acb648b725e2eee3ed977eae896 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 3 Aug 2021 10:41:09 +0200
+Subject: [PATCH] Only link to Imath when OpenEXR version is >= 3.0
+
+Since OpenEXR 3.0, Imath is in a separate, independently released library. Since that's the only library that Calligra needs, there's no need to link to the full OpenEXR
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cdcc02f0236..91c72882d3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -338,9 +338,9 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
+-if(TARGET OpenEXR::OpenEXR)
+-    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++macro_optional_find_package(Imath 3.0 CONFIG QUIET)
++if(TARGET Imath::Imath)
++    set(OPENEXR_LIBRARIES Imath::Imath)
+ else()
+     macro_optional_find_package(OpenEXR)
+ endif()
+-- 
+GitLab
+
diff --git a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+