gentoo auto-resync : 05:08:2022 - 08:07:19

3 files changed, 143 insertions, 0 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 07c207adc659..e01c2a7685c7 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,3 +1,5 @@
+AUX messagelib-22.04.3-cmake-3.24.0.patch 2956 BLAKE2B c8a829a2c179c3afa361b5e22ffe9071c9f6a619e4156fd30b971e7cca0c53c0c8b603a6443323c0e8ef6d81965a66b93b87dfed2f5d0c52dd6ced0098130cac SHA512 4a26f21e7f987dd1d085f177e0404a995a1e7409fc98545f7ab03e9d550a4401d39ef133230d84f611bbba2f3a1654cce014f89ecc663c7c8289a2a9f2b491e7
 DIST messagelib-22.04.3.tar.xz 10828024 BLAKE2B ab3f47c10057ed8d322945f60cf4dc08e8beb2384d9596e8dff18da8761f6ff722c6a29d4c9de90b74b287e4362c680783d6a72b2be76dc7e8c4f468ad9a9948 SHA512 6996463798e3429c4ac8c1293be4b4acf80e5901baf718df51b079ad699f91f7e8f7e1bc1be58681046e5553b6544c2422167ea23c1c1589f08aeafd372ea977
+EBUILD messagelib-22.04.3-r1.ebuild 2262 BLAKE2B 705e87958d278d39e8c51341d5237d91fe7e121935631b5a6d2f2ebecaff8eefc0e9aa180a4784f7ee29fdec9e0ca5dcd0fa9cd3571f6492702c6d023932fbb8 SHA512 9e7ec712a6f9cb636b4f4485d4dc70b2a1c6f7f50136c438f5adbce9ce9d4b751bdb567a90b5de95413daf401580d1f08dbcb54bf46995f1ace831b66ae1d9f6
 EBUILD messagelib-22.04.3.ebuild 2207 BLAKE2B eaa444253e5c4b54a3ef2e2d427f1851a7555dbaa2beb5c7e8195ccdb433cc249b903cb1a7c678d8858abc91454e623fb696379b50147bd3b1bae0f6c6726e4a SHA512 329959c4dbc0ae68af417f2ee9b2a8fb5467608ebdb397a0da9cce3f382a2282a2c0393176c5187dba79198818483f9d108b1223f49c01e1ce0fe99b4196624c
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch b/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch
new file mode 100644
index 000000000000..98406d9950c8
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch
@@ -0,0 +1,64 @@
+https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3412c178e53077fb6224ff80
+https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c203be1c899dffb25575985db
+
+From 6eaef36d42bdb05f3412c178e53077fb6224ff80 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 25 May 2022 08:50:26 +0200
+Subject: [PATCH] Use WebEngineWidgets as WebEngine is not define in qt6
+
+--- a/webengineviewer/KF5WebEngineViewerConfig.cmake.in
++++ b/webengineviewer/KF5WebEngineViewerConfig.cmake.in
+@@ -1,4 +1,4 @@
+ @PACKAGE_INIT@
+ include(CMakeFindDependencyMacro)
+-find_dependency(Qt@QT_MAJOR_VERSION@WebEngine "@QT_REQUIRED_VERSION@")
++find_dependency(Qt@QT_MAJOR_VERSION@WebEngineWidgets "@QT_REQUIRED_VERSION@")
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5WebEngineViewerTargets.cmake")
+GitLab
+From 3edc93673f94604c203be1c899dffb25575985db Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Sun, 17 Jul 2022 00:07:56 +0200
+Subject: [PATCH] Add missing find_dependency calls
+
+There are probably more used in the public link interface, but these
+were enough to fix building dependents with cmake 3.24.0-rc3, which
+seems to be stricter than 3.23.x.
+--- a/messagecomposer/KF5MessageComposerConfig.cmake.in
++++ b/messagecomposer/KF5MessageComposerConfig.cmake.in
+@@ -2,6 +2,7 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
+ find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5TemplateParser "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@")
+ find_dependency(KF5Akonadi "@AKONADI_VERSION@")
+ find_dependency(KF5IdentityManagement "@IDENTITYMANAGEMENT_LIB_VERSION@")
+--- a/messagecore/KF5MessageCoreConfig.cmake.in
++++ b/messagecore/KF5MessageCoreConfig.cmake.in
+@@ -1,4 +1,5 @@
+ @PACKAGE_INIT@
+ include(CMakeFindDependencyMacro)
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
++find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5MessageCoreTargets.cmake")
+--- a/messageviewer/KF5MessageViewerConfig.cmake.in
++++ b/messageviewer/KF5MessageViewerConfig.cmake.in
+@@ -3,6 +3,7 @@ include(CMakeFindDependencyMacro)
+ find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@")
+ find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5WebEngineViewer "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5Akonadi "@AKONADI_VERSION@")
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
+ find_dependency(KF5Contacts "@KF5_MIN_VERSION@")
+--- a/templateparser/KF5TemplateParserConfig.cmake.in
++++ b/templateparser/KF5TemplateParserConfig.cmake.in
+@@ -1,3 +1,7 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
++
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5TemplateParserTargets.cmake")
+GitLab
diff --git a/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild b/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild
new file mode 100644
index 000000000000..5c2b480688fc
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.92.0
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+# bug 579630
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0-r1:=[cxx,qt5]
+	>=app-crypt/qca-2.3.0:2
+	>=dev-libs/grantlee-5.2.0:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${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/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-3.24.0.patch
+)