gentoo resync : 12.05.2022

5 files changed, 46 insertions, 71 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 14d08b4a55ae..8c82d2d1c172 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,6 +1,6 @@
-AUX kaddressbook-21.08.3-unused-deps.patch 2408 BLAKE2B ccb912a26284137ac8831457b31454f620349b2f791abeb5711a5ba856493baa03ddc8a581a5766d0776afdc41a726d26c17db89d8d05d21432ba46ab6751168 SHA512 bac692fb1fc376161077fb2e24f6e0a5e4bcf0cdb49fd8023f81239410259e6fedfd8a02f9f210a1cd6f98ca3ecc08f75da3185f95c89c15c4610eddb5edce45
-DIST kaddressbook-21.08.3.tar.xz 3347684 BLAKE2B 7d6ecfe4ed729c77c1df8345131eb2dd4245e13166b1ae6f839a28da18362d50071ece7fe6400c60eb32691121f5020ad3b4b1fa00e1119c568b51623624c7f3 SHA512 e8052322cb24ca55575e4cea3c2b6d452392d33fe3e21981e6b9fd56d3a717e835250db99d5b845d4cad71978ea74c3bf335c100bbaad02db56e43e8d1de3570
+AUX kaddressbook-22.03.80-unused-dep.patch 1323 BLAKE2B 27099c6329ef044724b095f3f22d889e1ff3216f46dff78fc1f9209e4179f4dab5edafbffa9bc1e0d5d5ec38a8a7c4de837de92d7cb58bebffdc8495a1f7e6ae SHA512 91ddd8b92f10ba3214eec15ba2ba6cfbf6e369e8a7f41649c0c6e4d1955a5aee20101ebff762abbf51147793e47f6fe6d7889c386231894fd49bc964ffea0090
 DIST kaddressbook-21.12.3.tar.xz 3325668 BLAKE2B ea41b7472093d9365de00ebf2b0d94582994bf310eaf4c5ab31bc35fd3fcc47de45f819a40be563a51674287b9135b0f5c795cfa2f55703626648455ca81a378 SHA512 4adb4c780a19afdcd24d8740954e1104e753581053e1c2bbcf521753a71ab86b2140c8fde0695b153d687fc38f7c20ad7e3fb387876107348c42bf78f90ebd33
-EBUILD kaddressbook-21.08.3-r1.ebuild 1987 BLAKE2B 5a3b8ba660e7ca72138639c51585089486c842cdcd935632199dd880fd58f631241eca716a6c1cb9e8eead69ecb2c45cb173f01b3f4b5d9a7435870d83ecc6ba SHA512 6d147fe58d8b2fb1752855baf959ec194eca24479f3ed5bee62275ef7f0357305ef1a730afe4c3ee4d74466e66f666a15f5870aab37449e3ba4fb21ac171ec8b
-EBUILD kaddressbook-21.12.3.ebuild 1938 BLAKE2B adbe276977f303dc0b9309a8eb63dd9b9409e449f46c94d408d792f20e3d208fc876c5fcb80dd55a29a994659ed0e2bd8c8e1dd58a682cd0a02f08d05d9b37d1 SHA512 6dfaf771065dbbff553b4c277fafba8681e2d9cdb1f564bc23a5179da04c6239c464ba232716b20e44b6ae94054b6be4ac4b13aa04dc93a352d2d211ea70334a
+DIST kaddressbook-22.04.0.tar.xz 3350076 BLAKE2B f3e5f8917547403ee285580e1180d6b65172218b793af7c21bbff0acdf69a6cf555af8ce3e83a25cb5e79ccc9666c66cfbcae7ca1a6b1c4b341773758aa34828 SHA512 115eae8497db88cc723da239be63fb90e19d1a74fd232cc51d98a9709c07228bdcf335821f9a7dc4c3030772f4ec703c4809fb78cf063c5a00259c5db468caec
+EBUILD kaddressbook-21.12.3.ebuild 1937 BLAKE2B a441d5b2b020a1f6552e4e73f64bd5d59783a43e16628217cc58ce5166adfd84695f4692894017907d8cdb9829ddfaa42551ba89408376cfe1b38c8b595f1a11 SHA512 b581870d3c954d54c4b8ff586fa9de60c70fd8ecc7fef02d75aec0b209899a8fe4f9267e49f5015d70321681213a72ca8c7fd8a7c5b789c1d093761f4a70f9c5
+EBUILD kaddressbook-22.04.0.ebuild 2007 BLAKE2B d2768c88df03f54fbac1708e179ea21a73d37db909236dbcee45aa37ebd92821bc653302a0b48c3164f7521199db60138a68aff98444490e9c3fcb8ab99ae499 SHA512 2589b7c9388e1b6ab7867271898e6d2b5314a6ca3813f339cb3e45709cb652e6263e9caa89f9bd5567f350c758a6f8a5718c0669849ccba978c8a594f176388a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
deleted file mode 100644
index 0f13513546b7..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From eb9dad153f199c925ac60c0a33eca6ff0c1f9f44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
-Date: Fri, 8 Oct 2021 17:56:50 +0000
-Subject: [PATCH] Remove unneeded dependencies
-
----
- CMakeLists.txt     | 8 --------
- src/CMakeLists.txt | 4 ----
- 3 files changed, 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5e3e336..aef0ccd9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintS
- set(LIBKDEPIM_LIB_VERSION "5.18.3")
- set(LIBGRANTLEETHEME_LIB_VERSION "5.18.3")
- set(PIMCOMMON_LIB_VERSION "5.18.3")
--set(LIBKLEO_LIB_VERSION "5.18.3")
- set(AKONADI_SEARCH_VERSION "5.18.3")
- set(AKONADI_CONTACT_VERSION "5.18.3")
- 
-@@ -62,7 +61,6 @@ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
--find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
- 
- find_package(KF5DocTools ${KF5_MIN_VERSION})
- set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
-@@ -79,12 +77,6 @@ find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
- find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
- 
--set(GPGMEPP_LIB_VERSION "1.11.1")
--find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
--
--set(QGPGME_LIB_VERSION "1.11.1")
--find_package(QGpgme ${QGPGME_LIB_VERSION} CONFIG REQUIRED)
--
- include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
- 
- find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3e756aab..ac2f5774 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -98,10 +98,6 @@ if (TARGET KUserFeedbackWidgets)
-     target_link_libraries(kaddressbookprivate PRIVATE  KUserFeedbackWidgets)
- endif()
- 
--if(QGpgme_FOUND)
--    target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
--endif()
--
- target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")
- 
- set_target_properties(kaddressbookprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
--- 
-GitLab
-
diff --git a/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
new file mode 100644
index 000000000000..1a988e0c2d76
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
@@ -0,0 +1,36 @@
+From 0b5823a77372924025fb24bf245839393dbe3f70 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 15 Mar 2022 06:57:48 +0100
+Subject: [PATCH] Use KWindowStateSaver directly
+
+---
+ src/mainwidget.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
+index 440f0ff1..1372efa1 100644
+--- a/src/mainwidget.cpp
++++ b/src/mainwidget.cpp
+@@ -76,7 +76,7 @@
+ #include <QTextBrowser>
+ 
+ #include <Akonadi/ItemModifyJob>
+-#include <PimCommon/KPimPrintPreviewDialog>
++#include <KWindowStateSaver>
+ #include <QActionGroup>
+ #include <QDBusConnection>
+ #include <QHBoxLayout>
+@@ -694,7 +694,9 @@ void MainWidget::printPreview()
+     printer.setOutputFormat(QPrinter::PdfFormat);
+     printer.setCollateCopies(true);
+ 
+-    QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(&printer, this);
++    QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(&printer, this);
++    new KWindowStateSaver(previewdlg.data(), "KAddressBookPrintPreviewDialog");
++
+     KABPrinting::PrintingWizard wizard(&printer, mItemView->selectionModel(), this);
+     wizard.setDefaultAddressBook(currentAddressBook());
+     connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [&wizard]() {
+-- 
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-21.12.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.12.3.ebuild
index 93f083dd98b5..007819070700 100644
--- a/kde-apps/kaddressbook/kaddressbook-21.12.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-22.04.0.ebuild
index 95e20ab6da37..19c5d8d092b8 100644
--- a/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -50,13 +50,13 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
 
 src_configure() {
 	local mycmakeargs=(