6 files changed, 94 insertions, 4 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b990d7e649b5..417e7b007534 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 7c355be6a5a4..0b2d78432eaa 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,5 @@
 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
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.2.1-r2.ebuild 5191 BLAKE2B 7ffebf6398d4be381fc5f1ae4d3ec17677aefbd79afed50b7a4df6f52a6050fdcde21b5b2c5d1dda6d701d987d5ad72123c4df22e4e97c08f3c30fcdf11786f1 SHA512 3c4fa0e95fa380bfaf5fbd8d004e7244198d5aebb2a3943c03da6a084e758682e63e1e4430f92812f30e6facd652803cf162a1498308e3924410d623f59f0b1a
+EBUILD calligra-3.2.1-r2.ebuild 5242 BLAKE2B 2ec98e92fbaab4e666fbeac720eda74bc6dadddaa63227a467e50dd28be482e3ceee854012afcdd40019093a97902db058615d5778ec40cb21f119bd9e882a52 SHA512 dbdff17791845bd0da6a42a556c237d39db459de90fc8993bb37cd09fa8734088c9fdf33adb48534aa41e5a7912fd762d0c2d5594dfa3e5716caa78f878cbde0
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.2.1-r2.ebuild b/app-office/calligra/calligra-3.2.1-r2.ebuild
index 88df884a68a5..7fa46d30c399 100644
--- a/app-office/calligra/calligra-3.2.1-r2.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r2.ebuild
@@ -117,7 +117,10 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
+	"${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
+)
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
diff --git a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch
new file mode 100644
index 000000000000..7e1fd9d41eab
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch
@@ -0,0 +1,86 @@
+From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
+Date: Tue, 8 Jun 2021 05:13:23 +0000
+Subject: [PATCH] Partial update of Commit 62f51070 to make it compileable
+ again
+
+Cmake to 3.16
+Fix Fontconfig's FOUND variable
+Fix Fontconfig's include_dirs variable
+Use Correct Target to link FontConfig and Freetype
+---
+ CMakeLists.txt           | 14 +++++---------
+ libs/text/CMakeLists.txt |  4 ++--
+ 2 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ce210ebe01..71272ffef2d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.16)
+ 
+ project(calligra)
+ 
+@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET})
+ ## Look for ECM, Qt, KF5 ##
+ ###########################
+ ##########################
++set(REQUIRED_KF5_VERSION "5.7.0")
++set(REQUIRED_QT_VERSION "5.3.0")
+ 
+ find_package(ECM 5.19 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage)
+ include(MacroEnsureVersion)
+ include(MacroDesktopToJson)
+ 
+-
+-set(REQUIRED_KF5_VERSION "5.7.0")
+-
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+     COMPONENTS
+     Archive
+@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0")
+     set(CALLIGRA_OLD_PLUGIN_METADATA TRUE)
+ endif()
+ 
+-
+-set(REQUIRED_QT_VERSION "5.3.0")
+-
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
+     COMPONENTS
+     Core
+@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE)
+ 	)
+ endif()
+ 
+-if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
+-    set(FONTCONFIG_INCLUDE_DIR "")
++if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
++    set(Fontconfig_INCLUDE_DIRS "")
+     set(FREETYPE_INCLUDE_DIRS "")
+ else()
+     add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
+diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
+index 16d7e066fa2..429afe79704 100644
+--- a/libs/text/CMakeLists.txt
++++ b/libs/text/CMakeLists.txt
+@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
+ endif()
+ 
+ if( FONTCONFIG_FOUND )
+-    target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
++    target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
+ endif()
+ 
+ if( FREETYPE_FOUND )
+-    target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
++    target_link_libraries(kotext PRIVATE Freetype::Freetype)
+ endif()
+ 
+ 
+-- 
+GitLab
+
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 1d480636fcd4..773819824eda 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,6 +2,6 @@ AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc020870
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
 EBUILD lyx-2.3.5.2-r2.ebuild 3937 BLAKE2B d1b8daa94a0f51563c6bbfe59f4f87a79fd5ae5c0cfef92d2add3881fb82904011b9ef489890a626c5f05d91f1c13538b1314b120812db9ac8d0c589eae39e85 SHA512 f3fbc672b9514925e33d1bbbe0a9a89d9a6e3b6834c5b48b62bed5c5f44aca5bc5fee5e10dacefa9557ee79fb04058196924bd07a6860aea382b8a7c368d0161
-EBUILD lyx-2.3.6.1-r1.ebuild 4219 BLAKE2B 2b18988bea78f12abfff3d64542c0dc10f0ddb353c9b0f46dd5c02a8774e87376db4b0d4a06d06e8efb92d02bf1522927cdcd7d7624dab20590bfea58c091a57 SHA512 efd03785333a319210303ed1bd3bc7a53ee55711e767142f8e67b9debe3e88db7b312b5ae6177f1f748ea2fc594d5220c02a6c5d919955a9bc555e0966a0a431
+EBUILD lyx-2.3.6.1-r1.ebuild 4217 BLAKE2B c0981286993b559f8a64b73ebb2a3c38949bfb56383df26398d5138b2c7ea5bb8d5259c11e8bcdb04ffdfe098a073073f547ceb6d75ef91b52e0938c52f908d7 SHA512 1b6f1ea006899edaefd4e4bf638242f8cd1006b5812bd121f420bbca82c10a3e2f853573f9c48112264346d333fd04c17da2f85ce6e8edc4d21aeb1b38c3abe8
 EBUILD lyx-2.3.6.1.ebuild 3936 BLAKE2B 992c3937c0c7408c57d95447e7120cbbf829192897f050f88373521b68c1d88dc1d8c1cd0b6077e71e936a55cf0e4a289e0ac5b64176bc5095822d3b6fc05997 SHA512 b5cc1834d7b76b8e36f61ff25db3a5132ad6654f8874b2f3593dbda690a067bd855b729a2bf28f66a52303786757e683399097fad68bf7752fbd860f179d1ef9
 MISC metadata.xml 1269 BLAKE2B b400b34cf521d12c4bf93a828b8b4b4cb578abf511a951c680ba8eb25fccd83d17302ae8921155c93e5f4718f818923675c97eb6a4debde6df10d797592e290e SHA512 b46c4aab0ef227d8eb3f38aac8b9f9e99aaaca05f9f7b992e9cfcec90cbf3825521b111b5d0473d78b2742fc5bbbacbc3ea16c3eaf7d4beed2a0d66f88b5f168
diff --git a/app-office/lyx/lyx-2.3.6.1-r1.ebuild b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
index e13ad4da4760..bf44ce0f1283 100644
--- a/app-office/lyx/lyx-2.3.6.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"