gentoo resync : 12.05.2022

5 files changed, 83 insertions, 9 deletions

diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index c4d978c89442..c20039b903df 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,7 @@
-DIST kcalutils-21.08.3.tar.xz 338016 BLAKE2B 6a8700cb3c29ccb808479d7664a053bcf8eaccab4e902fc0529a40feeef6874ae31165c31ffef84e37310f7eb0b02c08e0e2a1a8b2a29c262cda7a843341e88e SHA512 8f006faff5101ca776f6531250fd232674514d81febc9931741fd87b49a05d3f5b3f997a97551e5c57ad14d38e66697010a3e6751c9cde5ed8bae46460912878
+AUX kcalutils-22.04.0-kmail-calendar-invites.patch 1110 BLAKE2B 47c00c666e014386c6c96477f7818ddb4b358c1e06f8adfcfdbbfae9cc2915958900c9c298b786180b5f79f891a32367bc8fc03a5c484d30eef6e1a2d2ce2bad SHA512 4b712ee0489e3a5fe6d5e1346d77913a57100db6e3bf6512ae0e7f90f70c70da7886ada3b5db2a0465565deccec4d08baf21e0169b5b28171f77db871a6239ff
 DIST kcalutils-21.12.3.tar.xz 338584 BLAKE2B 406fd710fa1655e2fe71b11dd3a18a25e09ee51b9dea4ae15b6b4caa36818df4332530d7bc589e310a9b126984b5e63ec0298bbc09b22dbef2b25b61940f382b SHA512 1677e7486c0dd8ce4261b8259833ac5f27a5829f881fdf5a893e4c541793c1ab110d4eafe17f5173575800f97078e403b4472f28daacbf526c5a6d16782eeb4c
-EBUILD kcalutils-21.08.3.ebuild 979 BLAKE2B 4e8516f60a74347461afbf947d6240618add6d92fddd0a6fb1777173b680370a857a79973cf69900a94e451f13c4d736bae25742ad49dfb3604087ef9ff0e7ae SHA512 a6db67510ee279a0189e8c4c83578813eeba422b9490f897af91136c2b19a211c39b158953d927cfc9da943a2f0df165f15a8b89dae8c1c23d8a2b91f138c22c
-EBUILD kcalutils-21.12.3.ebuild 998 BLAKE2B 8a4f1163e2139d860cd653f557836a5967b5370e16682a8812d20935c3886eea7f9911e6cca8791121c74b69f7dc7fb18fddf1f811e88b9e94c27d25c5baa75e SHA512 48d980318c01d8b06e12a68d24425ed7bb42a37d88a8372c7bbdbf223449c7fca42d42c4c8f578848297400edffa70d4a3906149bc1635a108efd0ef948efe64
+DIST kcalutils-22.04.0.tar.xz 340596 BLAKE2B c98774db199494c15117e75adf2580a39db474a511cebcafe4dabdad1f3e75638b550ba10201af032a492a6b138cf6fadec704f015ab9f94823a61003120646e SHA512 a4b44261655e900fb84238bd0db6bf44806bbb296f64f821038533d98af567c85235c9a1054be8ab8a88e9de71ba91b8b7cec0d695da162bf314f48b6af8eaea
+EBUILD kcalutils-21.12.3.ebuild 997 BLAKE2B e427b180dc9cad02205916ddaa2872deac0a6cb0f70529d45846ba20fce57ff0f945f8086dfdec64f6720c97f0c0feaa9de85eee5b7a89a37c5754c4c89aa628 SHA512 e8af5eaf64a0d01d958da9a8c8c246de4c9bd7fbfa636e8bbd7531d33e65a1d9be15c6070955f4f2c87d5e0a0cd077503318ad3ed513b64eaf935a277d4c0359
+EBUILD kcalutils-22.04.0-r1.ebuild 1062 BLAKE2B d24207d2c8e8ba5ea8d5a7618b309f10257433e76f6fe036cab8ed205ad31652c0d89d3b7e39e07500faeb0248268cdb0fd3904d7e14989c089a382ab1489c54 SHA512 795328e1fb962e61398a0882222b260fedfb5e0bcf302cb6cd373e305d36e214bbdcda24d0effb76573bbb6d08df1ac857cd0024047a55f942e9ea95e4ebdeac
+EBUILD kcalutils-22.04.0.ebuild 1000 BLAKE2B 032a8c2c68949a4b5b3d6608dd74e8ffd31c748b0be47a243a3879e080fbedb48e5cf5b306a1aa9dc0406772f96673d97d33bf85a963d87dd27980ea27ae6ed6 SHA512 842fc0e68a5c14ad4dd8076097e8e65dbc6457e22fb7c391d2937d8caf03f43a98d42cca37ede51431b49f2d52f187803c2796b38284928fed3960624e463cfe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch b/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch
new file mode 100644
index 000000000000..56ac25b3d451
--- /dev/null
+++ b/kde-apps/kcalutils/files/kcalutils-22.04.0-kmail-calendar-invites.patch
@@ -0,0 +1,29 @@
+https://mail.kde.org/pipermail/distributions/2022-April/001223.html
+https://invent.kde.org/pim/kcalutils/-/commit/494331a28bb722b4ab4c38a2520f305b8f7ad8fa
+
+From 494331a28bb722b4ab4c38a2520f305b8f7ad8fa Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 22 Apr 2022 19:06:36 +0200
+Subject: [PATCH] Fix Bug 452480: Kmail doesn't display calendar invites
+
+BUG:452480
+FIXED-IN: 5.17.1
+--- a/src/grantlee_plugin/CMakeLists.txt
++++ b/src/grantlee_plugin/CMakeLists.txt
+@@ -21,6 +21,12 @@ target_link_libraries(kcalendar_grantlee_plugin
+     KF5CalendarUtils
+ )
+ 
+-install(TARGETS kcalendar_grantlee_plugin
+-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}/KTextTemplate/${KTextTemplate_MAJOR_MINOR_VERSION_STRING}/
+-)
++if (QT_MAJOR_VERSION STREQUAL "5")
++	install(TARGETS kcalendar_grantlee_plugin
++        	LIBRARY DESTINATION ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}/
++	)
++else()
++	install(TARGETS kcalendar_grantlee_plugin
++        	LIBRARY DESTINATION ${LIB_INSTALL_DIR}/KTextTemplate/${KTextTemplate_MAJOR_MINOR_VERSION_STRING}/
++	)
++endif()
+GitLab
diff --git a/kde-apps/kcalutils/kcalutils-21.12.3.ebuild b/kde-apps/kcalutils/kcalutils-21.12.3.ebuild
index 4124afcaa114..913b7e0e2303 100644
--- a/kde-apps/kcalutils/kcalutils-21.12.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild b/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild
new file mode 100644
index 000000000000..25a4d5234e2d
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-22.04.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.92.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bugs 653616, 711666
+
+DEPEND="
+	>=dev-libs/grantlee-5.2.0:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-kmail-calendar-invites.patch
+)
diff --git a/kde-apps/kcalutils/kcalutils-21.08.3.ebuild b/kde-apps/kcalutils/kcalutils-22.04.0.ebuild
index 5d9104b4ce7a..e83bda491cba 100644
--- a/kde-apps/kcalutils/kcalutils-21.08.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-22.04.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,9 +16,11 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+RESTRICT="test" # bugs 653616, 711666
+
 DEPEND="
 	>=dev-libs/grantlee-5.2.0:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -33,5 +36,3 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-RESTRICT="test" # bugs 653616, 711666