gentoo auto-resync : 13:12:2024 - 02:01:50

4 files changed, 127 insertions, 3 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index fbb69e573af7..4b21e83e2623 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,3 +1,5 @@
 DIST kmail-24.08.3.tar.xz 7742152 BLAKE2B 2fde35b83d4e0924bfe7321f085dd7e6f9caa3a51c5163829b4d41410a9e5e1388c0db7e6dac109cdb2999d3a93693dfc5987dcca8d6eef1aa4ee12cfa005084 SHA512 7d61b49423ba8d0b9630022d63ef4c4efd3c63f74d94d80841b96a92928e2f61e0e16997bacb962f25d49a683868d2a94b35e069c0435e88f86bb728d959af48
-EBUILD kmail-24.08.3.ebuild 3846 BLAKE2B b4e3aada2d66d4eaf81a0b070a22f7ed810600b25ad04f72e159a653ea105e5da44d55af11729c3bfb602c67e05e3f09eab5a25d326008e97f30c7e39d59a2e1 SHA512 66cfe5f088ab2fcea15577e616138dbbce5b384bc9fd753620a63759c50c0b8996a6bf5aa59cd3db0ccf9ab4dc3b779f0ce688ed515e8c4b55fa9cf75e0b0c78
-MISC metadata.xml 371 BLAKE2B 8d7325373019e5c73324a122fbf35343ab97141bba1820170595adcf636f51fe905a0870742283cc9c56a48c1d4519fdcc6e64d59ead7c76f6ab4c96cb88ae81 SHA512 c234ed3cebd70f5dd809517da752458ca24a52b0268711cee718b42de7afb75fe9c24dbbcd0a8e540668250955fc18dd14e389d5fb57ac6016f223ea4d99fffe
+DIST kmail-24.12.0.tar.xz 7771708 BLAKE2B f4760eecdbd60164f019ca882c174d573cc1177bd2afe10169df0e563334c52fecaa24da0bd9e2a014f1cc26ac0b1e3fb81b2a9a797ed90b9c16c91100b4ca67 SHA512 bf4d73347357dfd1abb9c5a2721f43cd3969eafa7f0a76bd79fc6a93b70255cb59bdec79a90ada02938f3c766296267585dcd7a12d0b58f478f50efcf8e4a86f
+EBUILD kmail-24.08.3.ebuild 3846 BLAKE2B 0895dde9afa03566043bc4b3f3ea881171abef1a5a6108c81a0dcfa8d6999e30f6026b6ea705ea2aae2500707f58dcbb47951d6b1f32513bdd7b9390141d12bb SHA512 fb0e18430c203c5efbb81725a0678fb3b5e27527460f1b8bcb42d8c4d2f3e4ffe6f1e7782e3e6973c5e6744bce6958f4e6673426ad68b26d2e6680cd517dd77d
+EBUILD kmail-24.12.0.ebuild 3883 BLAKE2B c86d5c85458c4cb7cea523ef12c5046f81ee1162d35fa2e53836846bd93298e39eba79db21531587131750c354ea35bd4831438c2558d3062bb8ba4fc67d86e2 SHA512 43e0ac809576ec8850a43c39e4021c2e45d5073b5ce81c8309e561a6c53f4db4959fcc19cc755e2c5e639b30fa6e0a85b5c3f33a772978225522a79849c93754
+MISC metadata.xml 496 BLAKE2B 3a1f9cb1712438b640bfb0acb46a971148b3db414c5f1f214e893f13b4f3d6a95de2fc13d808000321fbbec220ee53052b0e5cbc8b10794d6828a7a1dd72e0f6 SHA512 5b2a74cb5f0a568570bb71cd46a2aaffbdde4984e61246f61061e451a93489887acc526079c64ab5040af67e6537e4e76294332c6686bdf8bacca3fc526d20cc
diff --git a/kde-apps/kmail/kmail-24.08.3.ebuild b/kde-apps/kmail/kmail-24.08.3.ebuild
index 0d7058b045b5..45179d2ba8f6 100644
--- a/kde-apps/kmail/kmail-24.08.3.ebuild
+++ b/kde-apps/kmail/kmail-24.08.3.ebuild
@@ -81,7 +81,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=kde-apps/kcalutils-${PVCUT}:6
 	>=kde-apps/kldap-${PVCUT}:6
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[sqlite] )
+	test? ( =kde-apps/akonadi-${PVCUT}*:6[sqlite] )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:6
diff --git a/kde-apps/kmail/kmail-24.12.0.ebuild b/kde-apps/kmail/kmail-24.12.0.ebuild
new file mode 100644
index 000000000000..42c33775bcce
--- /dev/null
+++ b/kde-apps/kmail/kmail-24.12.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 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=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/libktnef-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( kde-apps/akonadi-config[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+	>=kde-apps/kmail-account-wizard-${PVCUT}:6
+"
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "virus detection" app-antivirus/clamav
+		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "fancy e-mail headers and useful plugins" "kde-apps/kdepim-addons:${SLOT}"
+		optfeature "crypto config and certificate details GUI" "kde-apps/kleopatra:${SLOT}"
+		optfeature "import PIM data from other applications" "kde-apps/akonadi-import-wizard:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmail/metadata.xml b/kde-apps/kmail/metadata.xml
index b30294b3a575..43db3297d685 100644
--- a/kde-apps/kmail/metadata.xml
+++ b/kde-apps/kmail/metadata.xml
@@ -9,4 +9,7 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="cpe">cpe:/a:kde:kmail</remote-id>
 	</upstream>
+	<use>
+		<flag name="activities">Enable Plasma Activities support via <pkg>kde-plasma/plasma-activities</pkg></flag>
+	</use>
 </pkgmetadata>