gentoo auto-resync : 17:11:2022 - 00:55:45

7 files changed, 62 insertions, 2 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 07d473ef0696..15d7cb7d1ba1 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index d524bc10f72e..5090a44073aa 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,6 @@
+AUX kopete-22.08.3-fix-kf-5.100-version-check.patch 760 BLAKE2B cf212bdd78f300f6857278dc3806c6fc5874818355f73b5ccfe30c6c5d4f749e42de4445a1794f2d19c18aad1414e993b1eb56697309d08b95fb103824cae819 SHA512 cf891d369a6890f46d0ef09233bddde60e809bde6808e681991f7871ac43ec1bb6fd501012b78dc2fa57e29019ed5911070281c537c8b7e861c7a1c54038c0f3
 DIST kopete-22.04.3.tar.xz 9665112 BLAKE2B f50fb872bf8834afc0a19b5241a08ed7206c8d0329b5c3fa61df4de078360c2a1476381b8d179c32751fecc5f1ee4a9cbb5557d08e2e29dc5aed610616af3bca SHA512 efbb9d96a5ae9b9a54e319c424bef4fe4720e6f60e4a28747c29d899ebe511bb32d0925834cdc269730cc75dbdcb910a1107e16a51a9a6a1b1d9d852056dbc44
 DIST kopete-22.08.3.tar.xz 9668280 BLAKE2B f844bbd82e196507c16c568c32994b5d06077075f53a5d2fb99e74f2bcd972eb6350bdb38f597a937fdb6040bd7c232689bf2eef1b903dbccb919f3ed3b63cf6 SHA512 91e9a0e76e5b633e7e0454e7eba6fd163a912ad72675f3a2e049aba1f7cd306e54383894e783d417dde3961e91ec9b96f5b55772b4f29cd9c107acc185ef346c
 EBUILD kopete-22.04.3.ebuild 4376 BLAKE2B 1097588ad410648031ab35fb7be1eb5d737775b8e8f796b48fa450e406a9a63b5b70490b72cdd4c51e17f93d1b253dc486768dffe780787c3a281e05b0e361be SHA512 f46baeebbb7a4904f41365b37b10d0f638b30f0462ef531c00e9b202b32264de9ca20cf92416eff050ae939a5b81cbc7ae529bbef4483579a414be7d854eb8ae
-EBUILD kopete-22.08.3.ebuild 4409 BLAKE2B 4a8855639e4909e70de9c5bf2983fc642a101c128ac992583a715228ab7639558153023ca3b2537f01bc6be3461559efa4c0345b6dbbaad36034bfae31926482 SHA512 3096a7714ff337adb5977f361e2f7e2b99b39d5feff2509a5931731222f78b2fad058430782d81465a9fc5ea28a1bc6a7818a7292c64ce6ecad7e7da274d637a
+EBUILD kopete-22.08.3.ebuild 4474 BLAKE2B de442d5f19c28610e620eb936ec257797b16a4a20a092785d100303f7b28724a88ef65ede83ec12dc7b4a24de2f3246c61b84e841722ddf7c19ad6ac87203c06 SHA512 791b7ef6c943a6347e6940087c851faafec2d7e327206e1fd627665ec689b6d0554123122cc61a51c1aa7c0d060514d8f64f18a0792fa50e6a85d431918a99d1
 MISC metadata.xml 2225 BLAKE2B cf869557d330e74a95d97689986cb79a6b66e6a7c32563f49179c07d58c94743afa147b1276fcea236a3039c9bb2ab0dc8f258b7a8c16e57648c3a6a30ba0120 SHA512 b72b4f8dfb9a5f1ebac243d3fda9d3c45a36abe4b8b0c2fe29132317fd71c35f78fde6a173383c22ed44f620e09202b341e3da023bb71c2028e2b885280d501c
diff --git a/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch b/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch
new file mode 100644
index 000000000000..421986ee2b3b
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch
@@ -0,0 +1,25 @@
+From 553fc241b5ec701421cd51ae08eef7cabdeca654 Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell <jr@jriddell.org>
+Date: Fri, 21 Oct 2022 17:39:23 +0000
+Subject: [PATCH] Fix build with KF >= 5.100
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef6090fd0..079d36a2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -161,7 +161,7 @@ add_subdirectory(styles)
+ add_subdirectory(doc)
+ add_subdirectory(tests)
+ 
+-if (${ECM_VERSION} STRGREATER "5.58.0")
++if (${ECM_VERSION} VERSION_GREATER "5.58.0")
+     install( FILES kopete.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} )
+ else()
+     install( FILES kopete.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+-- 
+GitLab
+
diff --git a/kde-apps/kopete/kopete-22.08.3.ebuild b/kde-apps/kopete/kopete-22.08.3.ebuild
index fef666a962e7..475d611b6436 100644
--- a/kde-apps/kopete/kopete-22.08.3.ebuild
+++ b/kde-apps/kopete/kopete-22.08.3.ebuild
@@ -135,6 +135,8 @@ DEPEND="${COMMON_DEPEND}
 # tests hang, last checked for 4.2.96
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${P}-fix-kf-5.100-version-check.patch" )
+
 src_configure() {
 	local x x2
 	# Handle common stuff
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index c229d5d333d2..cf64430199cd 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,8 +1,9 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5
 AUX okular-22.04.0-optional-options.patch 3197 BLAKE2B c9ec04ec790f955d6efa05317a31ec17b81e9cdfc3ca56d8d9bc247133418af53db2c5bd03c51784da20342d5f662c307fa785cbcb6dba306e359f43dd016d4a SHA512 699019061db4ad27348e77ca42d7ec528dbbf48aa0a6194c1a9cf13ae0d914f0dc2c64353a6367e7a0169f62196d635a1084880cd5aa7324a2f1bf4cf0f0343b
+AUX okular-22.08.3-drop-broken-kf-version-check.patch 1116 BLAKE2B 6a136da55db35ac83416d5dffacd22e3f6468fa829eb5a4d31d2c90fde9d7d4cfd11b9d90dc63539565b16311daa4a18a0c2deea3e4988d92638f89569c034b0 SHA512 a9db6f222a2ed64ac82f3c3967340bde40784c0b1e76cdd87d23dce535d1c2b8772a86e65f871739c623f690f363bf394234b8a0adb5b0bbb954206e03e97208
 DIST okular-22.04.3.tar.xz 8219616 BLAKE2B 016e01d3a8495faa0c3c51ac583817ecdedf253ef98b81e99c5ed2e24a6174ef11eab0840b1c51ef80644b080bff4c9b4ef6087a46656bef2a1c81555008623f SHA512 bf4dc64b1230b8e7852307aefdc4658c99d3078af3466c0d760e5cdbd763891f910a7ece21853a350b3102cbe69ea1614958ed59c50c30cc4c866f1037a5d1d5
 DIST okular-22.08.3.tar.xz 8225824 BLAKE2B 1a8a9bd669173a941ef337ecdaeded4fd9df30e2df693afb012f85fda8d06e588385264ca7134dcf39466f0f2730a1ce70c0434e292033b8a67585eb9a386a1f SHA512 c2d8384e6b0eba4a477e5b0bb1e8046ed10b28162fee9e902e0cc1409a982187244e46a51f0e79e5ba292ea57440ac55005984d31148462787a040308571b69a
 EBUILD okular-22.04.3-r1.ebuild 3427 BLAKE2B 129b3b7b4d902093c5a68c90aadba4680f6791a9e7f63f6779f80dca2cc849970acaf0b852e4e8570a66b81b97259852067362e8c275b9d352f203f220acde93 SHA512 ced071782ba90f4a1f61029e3ec3da975d6fee77b5f5eba239de09056d7c74e28da796998d39635db0113a34c89e0aa2230683c6333347e48633da5fb3728515
-EBUILD okular-22.08.3.ebuild 3517 BLAKE2B ed39a74ade789fe3c065fc385e73f2a430cf115a7a94812b9bfb116c3b32098c6f4d5f26f81f544a2d6fcbf29eed719e706b284955d783983e074bab71cbc26a SHA512 a727c254651d76833ee7ece5bcfbd61e9468bccb2f277b931e56384955ff693d3efaf1feb04cbde5279d671643e1a5b602cfdada89c82312033904ab7c8c68f3
+EBUILD okular-22.08.3.ebuild 3572 BLAKE2B c8390c559fe8252d4cec0869fc3b6d40809c9a74b018f25b9c40f33d2b0c39bd9083883104b075380af82fc2693390c5dadbc3f17cc462b3b4ce4d1d29c0ad7c SHA512 84296b3c279b87b89742202e916b6755192c669d55dfb5e8b89f835a89665f296a56d2409dac072f48062dd8f78d0d4b62f339f0d025891d787945f3ee20781f
 MISC metadata.xml 1134 BLAKE2B d2bf9a6b378094bfd999f9e4bc3f1ca40d0c9014e247d2df308ddd413999e7a9ffd2dbca3cecff50f696435b16e8be83a3167ed51e5bac737f1720f4502f02f0 SHA512 8dabf09a40eb2cf7c2e0be18d33020b6ccf777115e7c047bfc4791ad0e23554ac25e6ed8da8528281e067b71567dad3407634562273aedae419759bab4e0d416
diff --git a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
new file mode 100644
index 000000000000..610f36663d27
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
@@ -0,0 +1,30 @@
+From d25eaebc8004aa69b4eca3cacfef2701e728c8ef Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell <jr@jriddell.org>
+Date: Fri, 21 Oct 2022 11:47:53 +0100
+Subject: [PATCH] remove ecm_version check which breaks on 5.100, we already
+ depend on ecm 5.68 anyway so it serves no purpose
+
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98cfd2b17..3817078c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -611,11 +611,7 @@ install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
+ install( FILES okular_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+ install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
+ 
+-if (${ECM_VERSION} STRGREATER "5.58.0")
+-    install(FILES okular.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+-else()
+-    install(FILES okular.categories  DESTINATION ${KDE_INSTALL_CONFDIR})
+-endif()
++install(FILES okular.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+ 
+ ki18n_install(po)
+ if(KF5DocTools_FOUND)
+-- 
+GitLab
+
diff --git a/kde-apps/okular/okular-22.08.3.ebuild b/kde-apps/okular/okular-22.08.3.ebuild
index 9693c79978ad..2bd095913a16 100644
--- a/kde-apps/okular/okular-22.08.3.ebuild
+++ b/kde-apps/okular/okular-22.08.3.ebuild
@@ -70,6 +70,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${P}-drop-broken-kf-version-check.patch"
 )
 
 src_configure() {