gentoo auto-resync : 23:08:2022 - 02:44:06

4 files changed, 140 insertions, 1 deletions

diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 79952731db7b..3fc4eb4a082c 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,3 +1,6 @@
+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
 EBUILD kleopatra-22.04.3.ebuild 1460 BLAKE2B 657ec2e6e332822fe4f99480d8337422d414c8cb7199f6c34b7b60d1045f382a359d4b8c2710dedbbf554413695faee9d3ba9b38b53f199caf3c2f79eada55ef SHA512 a82bae5cf495a1c1ebe8930f3e3aaf287119827b1289d677426c30f56a56c873fe52f7ff8cc53470fc668e1dd9570e85ee61c910cc7feb5d5ee1461b4e751b30
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD kleopatra-22.08.0.ebuild 1839 BLAKE2B 5ada3113c16e6e3c27a414d14c12364c559ce525b74bc1b705aa351afd3486d0b35f3cced88d9d26d9ba80896c696bb7866931f9fd9a242b45aa54599f53d0df SHA512 d5a02350cec201f286f8ac1897a20ce24730e106f3964fe927a95c184178a285654f551b4be4407cfbdf1e57601d8a5f795ea667860e6cce3ee3d3a3c246cc5c
+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
new file mode 100644
index 000000000000..bc9dadbcd342
--- /dev/null
+++ b/kde-apps/kleopatra/files/kleopatra-22.08.0-fix-gpgme-1.18.0.patch
@@ -0,0 +1,62 @@
+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.0.ebuild
new file mode 100644
index 000000000000..6846e3672eab
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-22.08.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://apps.kde.org/kleopatra/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="pim"
+
+# tests completely broken, bug #641720
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	pim? (
+		>=kde-apps/kidentitymanagement-${PVCUT}:5
+		>=kde-apps/kmailtransport-${PVCUT}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gpgme-1.18.0.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pim KF5IdentityManagement)
+		$(cmake_use_find_package pim KF5MailTransport)
+		$(cmake_use_find_package pim KF5MailTransportAkonadi)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kleopatra/metadata.xml b/kde-apps/kleopatra/metadata.xml
index d925f2439758..ce52d61e3966 100644
--- a/kde-apps/kleopatra/metadata.xml
+++ b/kde-apps/kleopatra/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="pim">Enable WKS publishing support using <pkg>kde-apps/kmail</pkg></flag>
+	</use>
 </pkgmetadata>