gentoo auto-resync : 30:01:2023 - 20:59:33

5 files changed, 175 insertions, 5 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 18cc506a8fe9..a9a5fe11c9bd 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,7 @@
+AUX kdepim-addons-22.08.3-spamassassin-4.patch 2287 BLAKE2B 378da71f00f434ad8b6689063289f4f3a54f283c0e5a825ecc024d796be2339a5006530c32ffba13000cc46a70b2a9239113770a673087d937137d290f4d9612 SHA512 c1c795fc22f09a8cea95e776634c5bcc8966bc8ccee5af7736fe011412c9bf1694b17473f640ba29b39dd8e0a6cc79a700b6faa9a7ad532cbe8f18934e0e2111
 DIST kdepim-addons-22.08.3.tar.xz 2301376 BLAKE2B 9e7cc90f8962b963e240cdf705301e399f409547396a77e3d5f506332c9897d9e89743f57bf725a21f348fe23f0b9d51e09552dbf5db88aaf7b2307a1d307671 SHA512 6e05806a5e1810c41e5af54cbf5aeef9345f4a168f520f0ed2a91552b4b786e0cfe9be98c127869640d2ed5f342a03da189fc60913c313517de4ff19ff66f1fb
 DIST kdepim-addons-22.12.1.tar.xz 2663620 BLAKE2B 0d9ce3785330b013699fea72fcb4440e03ec57b16dddc002402c15d06328a3875228bade66de5ef732f08438c240e56416a122d7b20e0ef652b222c48e1b2c90 SHA512 3d8c715e72a8b71139cb3dd21a54a6e88c0ecd31345f9db3f23d30dd91acfaaefb78754dcf6aaeb7434b8555b7fdd0f7393a08cee51ba350b6a45ce6cb643785
-EBUILD kdepim-addons-22.08.3.ebuild 2435 BLAKE2B 131b6da19a6ed9b81f676cc92af695c52153511dba5b78b2b66db60bb1b327f74ae516ad402c771cabf74a9f7a96a0405ec28ae57e41721095c4e093be098fd2 SHA512 947dea697a35e2c12049547d1edb5f872a46713b016f16bd5e8717f94ab8a0d8f2c9fdab18cda2ddc2d687ad0e064707ab887d83748b4e20632cae347679d20c
-EBUILD kdepim-addons-22.12.1.ebuild 2439 BLAKE2B 6f0a09ea845c2a0c69c6aa5f8f82e2af8da95aae12a1fa7235a15bc02adac96812641924d5dd526f4be2fb9d0bad4df1c34f440eafc83358bbb751c7a43eb9cd SHA512 d4543ba241f89af98afe33645821f62ad90a531ea0d049aa7fbb1c2718d5a23c72784a9ac66acc24f0b8917a56566f8657a3166bceb0ac40947cf88386765407
+EBUILD kdepim-addons-22.08.3-r1.ebuild 2437 BLAKE2B a19e5c689c83ca3505bd42f328fb5e78b75c247489f73ce7585ceff92acbfad66475cb0400958b229eb565365872048cdbb21cdf1366c717e98597b7459ad83b SHA512 84bd181a8cfa8f7a97c63a3f428593c4f1203c47f6777505779c5facf8d3710059e1b43b24f10f3c676f19b4f7d7d882d0237aa763168f18ec53e95d92828481
+EBUILD kdepim-addons-22.08.3-r2.ebuild 2493 BLAKE2B 5b90ad0f6fdc85a8558ca90149f3fbf4e9ece8932c99406cc253f3bad58ee01d5d3bb5f4a56fb50ca6f82c503f781a3d909bc5340c67d2ee851d2797f4e8bf37 SHA512 5cba1cf9d292ba3b7787485912fa55a04c9e07b96a77581ace2283605fa054c927b5a16c617b734407bba8921140fbfbf9ec438bf491d3b5b4fa9e55907c4994
+EBUILD kdepim-addons-22.12.1-r2.ebuild 2503 BLAKE2B 7e4b811a0a2606afa4aa6e47adc46a309201a88b469d5fabba1056a22df24145ef27036b4abe384026edc7f556fb8f13d4bf17071d691d359c28e776db006bf7 SHA512 098aba0aef93cdfe603108ce267b0cf17bd54f4dda19fe177bbbefda90a2dfcaaa981f0e4f06a248efdc5426aca18f23dfed0d9f0be06c5e2c6b7e2d935d5968
 MISC metadata.xml 535 BLAKE2B 372b4b81f73cab00c89c12fb43fbb4edeea2521a7f443c70bdd68269780b82ed98e71d5a1b16cab55827f11fefbd70c65fbf860e3d6b73b39647bc02256edaf1 SHA512 a4a82c962488e785ecc5b36711c5730955f0352d7fcc184facfc351668dd22ba82247b9608ca39fac48f6260f29283b3c95e967ab0d887421f5849b425aa7b4d
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@kde.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.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r1.ebuild
index 253d0f82a089..b669a0282cf4 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-22.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -64,7 +64,7 @@ RDEPEND="
 	>=kde-frameworks/prison-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
+	markdown? ( app-text/discount:= )
 "
 DEPEND="${RDEPEND}"
 
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.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild
index 4402d2c94965..4db31e0d4b3b 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-22.12.1.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild
@@ -64,10 +64,12 @@ RDEPEND="
 	>=kde-frameworks/prison-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
+	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)