gentoo resync : 14.08.2021

2 files changed, 17 insertions, 17 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index e92988da070f..3be174dc5b70 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-20.12.3.tar.xz 4671256 BLAKE2B a6cc830c5fb0f3612c990462fb8dff0fdb33ef81a7909f47c4165da2c4d8b2e4dbc9ccd06f2d8511fb0e3248aad14877bb7c78abf82d792308939b330c35c2a9 SHA512 ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
 DIST kmail-21.04.3.tar.xz 6485408 BLAKE2B f2c1a1de707dbd9c8c2d2567670d9abec49378d847128ca1465e251ffb5e25a5a054247586ad33037925dfaf9ea014db01b7a1b1baa6b35fd689e7fdd0b888fa SHA512 348d67ad825b4e2a4066736a58b71301353258be5cee1c2252ce0789866f294e4145c4556f79f918c47ffea015e4cbed42270964b7cd1002feafd54fed8a9895
-EBUILD kmail-20.12.3.ebuild 3396 BLAKE2B 02c449cc99acffc1804b02cb5fad19781d0a59233083662b3acb11308c0c6a6216e6bdcfe40811511aa039a6ef5ee29105db14f2d70ee149630aa4ade3d55567 SHA512 7b7eead522ffbadcd4112607a49f058fdc8d8f592b162ef77ac1d3ea0b8223815e55c5766b47c0850fd1270764b87d2080f1d351f4dcb30b58791205d3d64393
+DIST kmail-21.08.0.tar.xz 6920752 BLAKE2B 6cf7f78ea7e7fe62e89292908d24fc35a468cb5c18b470a7eb069502cc13bfb8c44a37b9db25982fa094c0ae018a77b9581d6b153f7fd98974d93f611e95db92 SHA512 816286cf6450a684e88513a1bb5aa9cfe4fe7b68915ccd93ecd950bcb01045cbece6e617caa8552ddc1e9f937a42284ed554b29d971d0c0bfee81810d3fdb7f8
 EBUILD kmail-21.04.3.ebuild 3403 BLAKE2B 05bde189f3de3f0c7e785d4c6a0c210a6ff585978bf889e0e9988d63a5d754b7890bb63f2d9236c97b197aef5bcc9e2bece5cc68def8d6225af399ceb0541c93 SHA512 a60aa5c94064b548df242ee9997f3e26e61b809994669bfc40622a7bd0da4773e9cc70888d0bf3fe56512b821a04a3256ab8e6d1237dd9a66e673668e671d98d
+EBUILD kmail-21.08.0.ebuild 3401 BLAKE2B 11c7189c5330458da07f3a034f900cf555b4a0f705cecd36d58c982cee7b6f150f4012b916776407d3343c8cb3b02130a87aba0ff9912d6d9b2ec5366600e41f SHA512 39af2721be18f8be0694970e5f9a0c82fe859654a87ab22285f3095a8908ca9d94bb8abd28470e558783408865fc7848b2f21bbcba5b91d5db22411e6d55b1f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.12.3.ebuild b/kde-apps/kmail/kmail-21.08.0.ebuild
index 23461f641a7b..5e0a6349d8d1 100644
--- a/kde-apps/kmail/kmail-20.12.3.ebuild
+++ b/kde-apps/kmail/kmail-21.08.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -17,13 +17,11 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="pch telemetry"
+
+RESTRICT+=" test" # bug 616878
 
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
 COMMON_DEPEND="
 	>=app-crypt/gpgme-1.11.1[cxx,qt5]
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -52,7 +50,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -86,8 +83,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 	>=kde-apps/kmail-account-wizard-${PVCUT}:5
 "
-
-RESTRICT+=" test" # bug 616878
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
 
 src_prepare() {
 	ecm_src_prepare
@@ -96,6 +95,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
@@ -104,10 +104,10 @@ 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 "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}
 	fi
 	ecm_pkg_postinst
 }