[gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-addons/files/, kde-apps/kdepim-addons/

[Andreas Sturmlechner]

commit:     e15fd7a32774d5f86334176aaec2a9f0a4cbd732
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 19:15:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:20:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15fd7a3

kde-apps/kdepim-addons: Fix spamassassin-4 detection

Upstream commit e9eda87eaf8838d5ee29860129817e5b90afd78e

Closes: https://bugs.gentoo.org/892593
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kdepim-addons-22.08.3-spamassassin-4.patch     | 79 ++++++++++++++++++++
 .../kdepim-addons/kdepim-addons-22.08.3-r2.ebuild  | 87 ++++++++++++++++++++++
 .../kdepim-addons/kdepim-addons-22.12.1-r2.ebuild  | 87 ++++++++++++++++++++++
 3 files changed, 253 insertions(+)

diff --git a/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch b/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch
new file mode 100644
index 000000000000..ef9436f0548f
--- /dev/null
+++ b/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch
@@ -0,0 +1,79 @@
+From e9eda87eaf8838d5ee29860129817e5b90afd78e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@×××.org>
+Date: Sun, 29 Jan 2023 16:32:01 +0100
+Subject: [PATCH] Fix kdepim-addons: support Spamassassin 4.0.0 with Kmail
+
+BUG: 464973
+FIXED-IN: 5.22.2
+---
+ kmail/plugins/common/kmail.antispamrc | 52 ++++++++++++++++++++++++++-
+ 1 file changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/plugins/common/kmail.antispamrc b/kmail/plugins/common/kmail.antispamrc
+index 67f920b85..acdf1c205 100644
+--- a/kmail/plugins/common/kmail.antispamrc
++++ b/kmail/plugins/common/kmail.antispamrc
+@@ -1,5 +1,5 @@
+ [General]
+-tools=12
++tools=14
+ 
+ [Spamtool #1]
+ Ident=spamassassin
+@@ -258,3 +258,53 @@ ScoreHeader=X-Spamd-Result
+ ScoreType=Adjusted
+ ScoreValueRegexp=\\[([\\d\\.-]+)[^\\d\\.]
+ ScoreThresholdRegexp= \\/ ([\\d\\.-]+)[^\\d\\.]
++
++[Spamtool #13]
++Ident=spamassassin
++Version=1
++Priority=42
++VisibleName=SpamAssassin 4.x (Perl)
++Executable=spamassassin -V | grep "SpamAssassin version 4"
++URL=https://spamassassin.apache.org/
++PipeFilterName=SpamAssassin Check
++PipeCmdDetect=spamassassin -L
++PipeCmdNoSpam=spamassassin -d
++ExecCmdSpam=sa-learn -L --spam --no-sync
++ExecCmdHam=sa-learn -L --ham --no-sync
++DetectionHeader=X-Spam-Flag
++DetectionPattern=(yes)|(YES)
++DetectionPattern2=
++DetectionOnly=0
++UseRegExp=1
++SupportsBayes=1
++SupportsUnsure=0
++ScoreName=Spamassassin
++ScoreHeader=X-Spam-Status
++ScoreType=Adjusted
++ScoreValueRegexp=(?:hits|score)=([\\d\\.-]+)[^\\d\\.]
++ScoreThresholdRegexp=required=([\\d\\.-]+)[^\\d\\.]
++
++[Spamtool #14]
++Ident=spamd
++Version=1
++Priority=46
++VisibleName=SpamAssassin 4.x (Daemon)
++Executable=echo "From: test" | spamc -x && spamassassin -V | grep "SpamAssassin version 4"
++URL=https://spamassassin.apache.org/
++PipeFilterName=SpamAssassin Service Check
++PipeCmdDetect=spamc
++PipeCmdNoSpam=spamassassin -d
++ExecCmdSpam=sa-learn -L --spam --no-sync --single
++ExecCmdHam=sa-learn -L --ham --no-sync --single
++DetectionHeader=X-Spam-Flag
++DetectionPattern=(yes)|(YES)
++DetectionPattern2=
++DetectionOnly=0
++UseRegExp=1
++SupportsBayes=1
++SupportsUnsure=0
++ScoreName=Spamassassin
++ScoreHeader=X-Spam-Status
++ScoreType=Adjusted
++ScoreValueRegexp=(?:hits|score)=([\\d\\.-]+)[^\\d\\.]
++ScoreThresholdRegexp=required=([\\d\\.-]+)[^\\d\\.]
+-- 
+GitLab
+

diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild
new file mode 100644
index 000000000000..378814b81d41
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="importwizard markdown"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+	>=dev-libs/grantlee-5.2.0:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kaddressbook-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kitinerary-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}: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/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
+	markdown? ( app-text/discount:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-spamassassin-4.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
+	fi
+	ecm_pkg_postinst
+}

diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild
new file mode 100644
index 000000000000..4db31e0d4b3b
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.101.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="importwizard markdown"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+	>=dev-libs/grantlee-5.2.0:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kaddressbook-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kitinerary-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}: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/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
+	markdown? ( app-text/discount:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.08.3-spamassassin-4.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
+	fi
+	ecm_pkg_postinst
+}