gentoo resync : 05.04.2019

3 files changed, 25 insertions, 20 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index f4130904643d..4e24b3ce8f41 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,4 @@
-DIST kmail-18.08.3.tar.xz 4778216 BLAKE2B 18cc1402fe56e53b99ae3b4b152cb88b4831a9a851f359dac39b23c249790107a80ae6937a78b62c5b561e6a7ca89bbac1b58075993465e56fdb3dd67b35bbfb SHA512 1ce516f18d01f8a4bb2cfcee8adf6fcd32d8ee2fd2a9005935c57fbf2cbc9ef35dda98815202822f606cf7a7131e86fc6eef875975da4e00bf421bed5a989c6e
 DIST kmail-18.12.3.tar.xz 4724432 BLAKE2B 60b9eb05fd8847afd75e6bc780c6b2a44193216ae0a02fb46ec5dc8c7228c83cb043b2a4bd61126f228a6a0c1a1a005cb3a95856a3af62ccc012f00776146310 SHA512 579f44be2d6aef1759cdcc0fd1c596872ede5007122d9d537fd11c2f876c8f623bb398e17f407f203476ffce22fc665e878ab40518074abe4a6a96bd15c1a93a
-EBUILD kmail-18.08.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
-EBUILD kmail-18.12.3.ebuild 3300 BLAKE2B 3644fff7c42f0e8a303f22872f1c71d819285b2c0a30425cf6dbca11c0652fc400511ce9a52417068ab9c84fd8edcf8a63e55d4b01632fdafedd753c1284ad0a SHA512 426deecce69af775f49b5341357b4ca348120e8853eb042827bf2642c46f86d1bc92123735d8536c6b121afc94b781b39b0e2805b60a9b2f8dbd4a2989c6ce44
+EBUILD kmail-18.12.3-r1.ebuild 3343 BLAKE2B b9742bd165e86e253bcfd51cc9d2d346746580732b56881b5d5b4160b55e87ea21bfcc6ec1c352ee371f562915d22d6f6625ed273014f8ba54d923f52e0b6f85 SHA512 b5f742484963be100786acba83eafc42ba797e707a4ffbcaba63ace9c4f0d9ea0645e87c3a04095bd672336bd74d73ea88ffc108f76da7f89842169733cce6fe
+EBUILD kmail-18.12.3.ebuild 3305 BLAKE2B 3372a8584da0187c27ba0795a12f752c88d349d7de36beaf5d1205f6c64e60df10303f380e42e102ef7efb400281426b6c49bf96c69f86d49fb9e5d1b65d3231 SHA512 d9eb607d62d3b330199c4c21230e2c58eceaf5f8cdc0c85b843be401ce6ab569ed5ac331dce03f381250d8b41514770d5e5ca3a11ebe3a34200dbd25bad3aa92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-18.08.3.ebuild b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
index 7edc02c76e08..27af04091178 100644
--- a/kde-apps/kmail/kmail-18.08.3.ebuild
+++ b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
@@ -11,9 +11,13 @@ inherit kde5
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'tools' 18.12.3-r1) )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
@@ -39,7 +43,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
@@ -69,12 +73,12 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'sqlite' 18.12.3-r1) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
 	!kde-apps/ktnef
 	$(add_kdeapps_dep kdepim-runtime)
 	$(add_kdeapps_dep kmail-account-wizard)
@@ -97,14 +101,16 @@ pkg_postinst() {
 		echo "${1} ($(has_version ${1} || echo "not ")installed)"
 	}
 
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "KMail supports the following runtime dependencies:"
+		elog "  Virus detection:"
+		elog "    $(pkg_is_installed app-antivirus/clamav)"
+		elog "  Spam filtering:"
+		elog "    $(pkg_is_installed mail-filter/bogofilter)"
+		elog "    $(pkg_is_installed mail-filter/spamassassin)"
+		elog "  Fancy e-mail headers and various useful plugins:"
+		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+		elog "  Crypto config and certificate details GUI:"
+		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+	fi
 }
diff --git a/kde-apps/kmail/kmail-18.12.3.ebuild b/kde-apps/kmail/kmail-18.12.3.ebuild
index 62edd752e788..ab25a29b6f67 100644
--- a/kde-apps/kmail/kmail-18.12.3.ebuild
+++ b/kde-apps/kmail/kmail-18.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 BDEPEND="