gentoo resync : 15.12.2019

5 files changed, 126 insertions, 146 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 5b69e96d77db..f7b1b433b85d 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,6 +1,5 @@
-AUX kmail-19.04.3-missing-header.patch 714 BLAKE2B fc0ab7dd44d7439c22001c1d72944624cdaa005faff4631e6bd673d15b896e9e87ca5b5bdbf2a1adbede7351112dc453e6c1b3a7d64bb6e7662ac4935daabfe4 SHA512 f1e56dc6ccace2e96527d74d848f53e99ada3a460cf0f73493acab6d10bf265fcc61dea3ec553a2214c0b54f03e19b35567249a222331aa12e8333849158d041
-DIST kmail-19.04.3.tar.xz 4717936 BLAKE2B ef449545ddc5be0789089626ca962bca7beea4dc3186279cc86483c443fb8f36710f30bbeb0bfdbd1edeca2ea9d7b99296b7bcc34632da0abe7f96f9c0f7d03d SHA512 96cdf824f16f29ae00d461986990524b22b3774bcda679db5495ab9b127eaf7af2e0ad127cbcb8cedc5b24cf8cbf94d5324d09781583affb140436f67290b08f
 DIST kmail-19.08.3.tar.xz 4728620 BLAKE2B d487a62df13b49b1d7d054a005481854f8636e72d13be882586f1ebabf0fe02b3c27d47b172da7e0785a905b39cd5ba7e8a9a03d2cefc6be1e542ce354812f20 SHA512 ba8804a47144b62d35a5fa777616426465d5da5d98aaf34d30c7863c12198139e34249315533752a897d48619eb5546810363d5f2bd50622f513e78eb6367001
-EBUILD kmail-19.04.3.ebuild 3334 BLAKE2B 612ac0a050bc7ef11c318ee57d6fb548647d26a29b98314e17647f0344ad2392c29d0361d60b00a738f34803a7d64e7a881458f8c3338b933029d4a00557b9a3 SHA512 72cef755587afd80e6d9d1002dd00e1fadd8a52f5a8d4bcf5a302db87647e2d5d55e385e15144108f4eff15608d6922cb2ae5bc2e9103d0c2c17274dda0eeb1f
-EBUILD kmail-19.08.3.ebuild 3595 BLAKE2B 8b2c84430a7cdba75ed6aa3aa1c1255e838f108e4ee029a3315f6f5de75fcaf15f3d6bf4f117d1a2d5d03015342e467be653542e15cc2895cf49ed4f1b19197e SHA512 70465e9d08a79c89dbfebb3c4781e1d5fb50a1d6f391171401d2b57cedb452f756b0905f428d389f99549f4ced8f3d9aac6757f6906c357fbe55fb0f31daf6c0
+DIST kmail-19.12.0.tar.xz 4712840 BLAKE2B a3a5e50c3e49c65d6554ef8ab9fce440cb39e3dc61b6343f37a07840fb514df2e81b26585093059df5f48aeb98c14f48af345cedd7c8145447f5a1eb8210a0b2 SHA512 48cec2af9d716da9755699f78039f67f9b6630fe97531ec28f57dc22dd93c44cfaaa56bacbcccddbf135e3b195191acd0b694ac95d298eb8a236606238778949
+EBUILD kmail-19.08.3.ebuild 3592 BLAKE2B 818294a2319408edea5c7e908d589d726b03aba6987702af830ce30c2538bfbdb06e9bb8ec20d7603d8ebbbaf02928d3c6bd700ce6034e77cdaf87a0d9badf38 SHA512 b1d9125a1fcc120746263c5e93fcbad105008a6662f038ab117f7376470e5ca6c444adee5dce5c92bdb1a9184f353a31944be82c4dfea682196ea534d7e815d3
+EBUILD kmail-19.12.0.ebuild 3734 BLAKE2B 6465dfb999b92e3a52f047fd1cfd763d6d3e5e544aabe587da5bc9f543bd2ee32cd09a42a235e59e088b1458c0904550209a22ca3b60aeb7cbd116762451cb63 SHA512 47005834836edff6dee37c8a8707bc230d978520579dc5116980e1dab13aed1ed1370977b987a37c8efac888f26f956d5624f610d4c8c4b87299e6753801fbba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
deleted file mode 100644
index 6c6cc3092132..000000000000
--- a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Thu, 18 Jul 2019 15:35:24 -0400
-Subject: summaryview_part.h - fix build by including QMap
-
----
- src/kontactplugin/summary/summaryview_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
-index 542335d..b116e23 100644
---- a/src/kontactplugin/summary/summaryview_part.h
-+++ b/src/kontactplugin/summary/summaryview_part.h
-@@ -25,7 +25,7 @@
- #define SUMMARYVIEW_PART_H
- 
- #include <KParts/ReadOnlyPart>
--#include <kparts/readonlypart.h>
-+#include <QMap>
- 
- class DropWidget;
- 
--- 
-cgit v1.1
diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
deleted file mode 100644
index 3fb1fb73c9aa..000000000000
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	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-19.08.3.ebuild b/kde-apps/kmail/kmail-19.08.3.ebuild
index a15244b79cef..76f90647ff53 100644
--- a/kde-apps/kmail/kmail-19.08.3.ebuild
+++ b/kde-apps/kmail/kmail-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kmail/kmail-19.12.0.ebuild b/kde-apps/kmail/kmail-19.12.0.ebuild
new file mode 100644
index 000000000000..5a8d62ba35bc
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.12.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
+https://kontact.kde.org/components/kmail.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+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
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${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
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+	>=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	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
+}