gentoo auto-resync : 08:09:2022 - 16:38:38

3 files changed, 2 insertions, 69 deletions

diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 3fc4eb4a082c..4461d19540c3 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,6 +1,5 @@
-AUX kleopatra-22.08.0-fix-gpgme-1.18.0.patch 2355 BLAKE2B a36cffeabecb1bfb8e873f9759e7162d652668422b02ab9232ca5256226ea7b079c46126cd0f79a5dd9de230ff1d61c3b9dc3b19d4579dd3203f6b957e8dce19 SHA512 b349f532233b0cf198119af198723cab031807b3f15d2e5fdae9e6bd54bf4dfaca2e4bd30a2cbec5ff9bf3fbd138543418f7ad256e6dc317cf759849c1fd6c7d
 DIST kleopatra-22.04.3.tar.xz 2260100 BLAKE2B 8c276efed94439ae169ce417b0a17324a977c7266ab9566b86bc0ce7597929b70eed0231ed301fd19d8595b25390a63696837974eaed45371933d49d852e825d SHA512 caa9f3ecf24b7a7c0a3ab018451f555b8688d2aa0a58103a84b6c0c9e1804847f22919f90d77e1c159ec221a3bebd915ac4ae17a7e79b0ef2ca78b1779fe7d40
-DIST kleopatra-22.08.0.tar.xz 2377296 BLAKE2B 769099c685f2e819233fd163ad0e586eea8388e6f789ad12cc99d9406d260453974e7fa4fdf9d19b17d8ffae6359613afda6425b35acfe8c189721165089fb89 SHA512 a529fc8d370aef548ce30ee125e25ad61aa698ecdfaa874bf475385a171c271c5337cf3dbba4b2292dd6fdb13ae6f9936f08ec9de8efa5ac130ae064b23436ff
+DIST kleopatra-22.08.1.tar.xz 2377672 BLAKE2B b5a94222ec131ddbc5102d487c34b02c85bc1daa41953325ac5ff7ac2f672160ffc34120fdb4b7a22a828b159fa962a653535ed43036d632dac0bebf913656c8 SHA512 eb3cf392dd8dc874dd5b883b2ff04ef513c4a06d5f3e97f1356d0d7a496866fcfc5136f5fcedc5c34db1285b12c8dfc72d4137cf97c191b6792b265df4083ab9
 EBUILD kleopatra-22.04.3.ebuild 1460 BLAKE2B 657ec2e6e332822fe4f99480d8337422d414c8cb7199f6c34b7b60d1045f382a359d4b8c2710dedbbf554413695faee9d3ba9b38b53f199caf3c2f79eada55ef SHA512 a82bae5cf495a1c1ebe8930f3e3aaf287119827b1289d677426c30f56a56c873fe52f7ff8cc53470fc668e1dd9570e85ee61c910cc7feb5d5ee1461b4e751b30
-EBUILD kleopatra-22.08.0.ebuild 1839 BLAKE2B 5ada3113c16e6e3c27a414d14c12364c559ce525b74bc1b705aa351afd3486d0b35f3cced88d9d26d9ba80896c696bb7866931f9fd9a242b45aa54599f53d0df SHA512 d5a02350cec201f286f8ac1897a20ce24730e106f3964fe927a95c184178a285654f551b4be4407cfbdf1e57601d8a5f795ea667860e6cce3ee3d3a3c246cc5c
+EBUILD kleopatra-22.08.1.ebuild 1783 BLAKE2B 2511fb7bdb8029953e0258e31b0d01811bed0c47faa19134b23885964498821cf60e975406c66750a747deed0487890157da3118324d40f102247e0bce84659a SHA512 6cc7a49577177d555d9d00efc7941412e6f36a90c92f9758d686c19cb4dcdc786623604e5c6ace7090aaf84bc25b5f92be3335c11854c279be20c44ebefa96c1
 MISC metadata.xml 421 BLAKE2B 2d59a8c375d953a93b35184503bffd26005b4ce8e5408ffc0e1f6dd5283d031d2ed2d6bd7036d380391499ce50d4dda3fde3432e6f4f0106145beac01641c87e SHA512 df430c37f0b8c4f78b9490bdaa784bbb676d9f4e103d5a016b3f46492dde84bc7763597864c42e7be1d4c070951f49cfd0dcda10e90cf0fe20d7b212eb07db16
diff --git a/kde-apps/kleopatra/files/kleopatra-22.08.0-fix-gpgme-1.18.0.patch b/kde-apps/kleopatra/files/kleopatra-22.08.0-fix-gpgme-1.18.0.patch
deleted file mode 100644
index bc9dadbcd342..000000000000
--- a/kde-apps/kleopatra/files/kleopatra-22.08.0-fix-gpgme-1.18.0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://invent.kde.org/pim/kleopatra/-/commit/a3684049dd4f0d2d47dcc6605ff31ce753254ef9
-https://bugs.gentoo.org/865903
-https://bugs.kde.org/show_bug.cgi?id=458044
-
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Fri, 19 Aug 2022 13:43:41 +0200
-Subject: [PATCH] Use ReceiveKeysJob for refreshing OpenPGP keys
-
-This refreshes the OpenPGP key from the configured key server.
-
-GnuPG-bug-id: 5903
-
-CHANGELOG: Fix building against QGpgME 1.18.0
-BUG: 458044
-FIXED-IN: 22.08.1
-
-(cherry picked from commit 87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3)
---- a/src/commands/refreshcertificatecommand.cpp
-+++ b/src/commands/refreshcertificatecommand.cpp
-@@ -19,7 +19,7 @@
- #include <QGpgME/Protocol>
- #ifdef QGPGME_SUPPORTS_KEY_REFRESH
- #include <QGpgME/RefreshKeysJob>
--#include <QGpgME/RefreshOpenPGPKeysJob>
-+#include <QGpgME/ReceiveKeysJob>
- #endif
- 
- #include <gpgme++/importresult.h>
-@@ -44,7 +44,7 @@ public:
-     void cancel();
- 
- #ifdef QGPGME_SUPPORTS_KEY_REFRESH
--    std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> startOpenPGPJob();
-+    std::unique_ptr<QGpgME::ReceiveKeysJob> startOpenPGPJob();
-     std::unique_ptr<QGpgME::RefreshKeysJob> startSMIMEJob();
- #endif
-     void onOpenPGPJobResult(const ImportResult &result);
-@@ -136,19 +136,19 @@ void RefreshCertificateCommand::Private::cancel()
- }
- 
- #ifdef QGPGME_SUPPORTS_KEY_REFRESH
--std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob()
-+std::unique_ptr<QGpgME::ReceiveKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob()
- {
--    std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> refreshJob{QGpgME::openpgp()->refreshOpenPGPKeysJob()};
-+    std::unique_ptr<QGpgME::ReceiveKeysJob> refreshJob{QGpgME::openpgp()->receiveKeysJob()};
-     Q_ASSERT(refreshJob);
- 
--    connect(refreshJob.get(), &QGpgME::RefreshOpenPGPKeysJob::result,
-+    connect(refreshJob.get(), &QGpgME::ReceiveKeysJob::result,
-             q, [this](const GpgME::ImportResult &result) {
-                 onOpenPGPJobResult(result);
-             });
-     connect(refreshJob.get(), &QGpgME::Job::progress,
-             q, &Command::progress);
- 
--    const GpgME::Error err = refreshJob->start({key});
-+    const GpgME::Error err = refreshJob->start({QString::fromLatin1(key.primaryFingerprint())});
-     if (err) {
-         showError(err);
-         return {};
-GitLab
diff --git a/kde-apps/kleopatra/kleopatra-22.08.0.ebuild b/kde-apps/kleopatra/kleopatra-22.08.1.ebuild
index 6846e3672eab..9a811c96d9da 100644
--- a/kde-apps/kleopatra/kleopatra-22.08.0.ebuild
+++ b/kde-apps/kleopatra/kleopatra-22.08.1.ebuild
@@ -57,10 +57,6 @@ RDEPEND="${DEPEND}
 	app-crypt/paperkey
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-gpgme-1.18.0.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package pim KF5IdentityManagement)