gentoo resync : 28.04.2021

3 files changed, 19 insertions, 21 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 6eb4f8ba48c8..70d16a4d33b8 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-20.12.2.tar.xz 4671468 BLAKE2B b95329724286f690a990a100bf88b5c743ac9e06688fe1e8c7208fffb0fe3a600b68a61215d2761a1edabfb56d95264765e790db1156b2c49349fcbfd93077ee SHA512 f6b2b217c95b844b8a4ed3c254a798310da411b6a9bc911378e087c6a150f83d76ab0c7d27bb337b5d5713f62852c3c646f2f8d5a1ef4cd44f7250be38a71945
 DIST kmail-20.12.3.tar.xz 4671256 BLAKE2B a6cc830c5fb0f3612c990462fb8dff0fdb33ef81a7909f47c4165da2c4d8b2e4dbc9ccd06f2d8511fb0e3248aad14877bb7c78abf82d792308939b330c35c2a9 SHA512 ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
-EBUILD kmail-20.12.2.ebuild 3431 BLAKE2B a2311087df478180bb351552bee6e24442513f0b526c5ffd7b7c7dc2900a6af366bd943c2fbd444a0ce83a18809ec37c503541c60d8c8042c18e9126e4971b44 SHA512 5919b130db0efd512c617b351b0b7ab994862a5e4e9166d0001192163cee767a76bdc90c1e781975a19ab2e2f969b122e0e1ba9f9d7dc08bcaa847fed83355fa
-EBUILD kmail-20.12.3.ebuild 3434 BLAKE2B ce3f7d8114688c17843b982c9865120407ea5ac07cda2ce083ee5062d5dfea28f0c94590e71b046b6f4744d86f72423c81824425556b4f36de3495a6eeea65c1 SHA512 6b87e5d7bfccddbf82718f3f9943eb6f70bc2c5eab59a5a52c8e70150044e1b610e48f21031702e7dd64d52867285f70af791056c986ba679d06dd669ffdb742
+DIST kmail-21.04.0.tar.xz 6298468 BLAKE2B d608daf2bcf432569017367cecf1f68c544469ad2f0b6d68e203cf964b0c3eb6c78e89beef692f02acc25956c8296ba5410a249c93eb40a159d0c83ffa8bf3c4 SHA512 e1a404c490b5ba4a8ccd0c1e0a16a3ac1d1ca0007490de2bfbc5dbd775d4da0858aa49d29143c8e50b5f4ce046468e8a4d2f3d3f24f04b8028023aa8c66a80a5
+EBUILD kmail-20.12.3.ebuild 3399 BLAKE2B 281e6880aa0b1acfe9bf3956bdc6179f8bac9b97583da12c419dfaae1bdca5ecbcb40c746ca367ff2ea8d64650121f04d36b1b03ce7e08259daa8976d8f1c281 SHA512 1eba65eeb1262c114993737ce307dff573ab177dd3ba692d140d66758a093bdaac876d078b55e1424d5ca6623375d0da17e97ae5323e62bf56b440f4e4af6b06
+EBUILD kmail-21.04.0.ebuild 3408 BLAKE2B 988020bca0f5891a07ee389569e48594dcde3f22eb5e3072d35c0882985c7e65272e3bd934c269575ab353ed7dede0a8f6380b37b8005db0760c366f2d2de431 SHA512 b32fa57eb52e0c896d34d19d1cf41324be5799d8f9c4538916dbbd6b0c7484f9bab456b6c92d22b9122c7cd0dfb38bac342d1d43ea3c264305fce406f55c421f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.12.3.ebuild b/kde-apps/kmail/kmail-20.12.3.ebuild
index 453b9dbcdede..860ae432ca27 100644
--- a/kde-apps/kmail/kmail-20.12.3.ebuild
+++ b/kde-apps/kmail/kmail-20.12.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 BDEPEND="
@@ -104,7 +104,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		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}
diff --git a/kde-apps/kmail/kmail-20.12.2.ebuild b/kde-apps/kmail/kmail-21.04.0.ebuild
index 5b1a935b2e84..38f6b53fdc2d 100644
--- a/kde-apps/kmail/kmail-20.12.2.ebuild
+++ b/kde-apps/kmail/kmail-21.04.0.ebuild
@@ -6,24 +6,22 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
 HOMEPAGE="https://apps.kde.org/en/kmail2
 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,11 +104,10 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		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
 }