gentoo resync : 15.12.2019

4 files changed, 98 insertions, 93 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 4f30169d7682..cc1daab091bd 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-addons-19.04.3.tar.xz 2076656 BLAKE2B 1b60fb43489836081a4456836d9c5e521368002550ce2b451ca13565519be04a18e08f5ca7e02ec63ae25efb9614f1fd5da2a519361c4cca488d10e711448fb1 SHA512 b5111cde99153939fb7bc4165331467fcaf607098b81be5ad711ddbdb953f93612ace52a76c6b784060b212ca84af3e1034180964cbc0397bfebf25274509dc9
 DIST kdepim-addons-19.08.3.tar.xz 2091080 BLAKE2B 172e8f80dda538d413f85f998657b9882f2fbd61afeb58be3026c12e080551da2a5237a344af6f45b57e6e905c5c07a37b4d34fc3785473b82984620df38d7f7 SHA512 bc9d3cc80a50a758052d9f67fbdb26f9babc8f03e3d83928b63040dc5bc96bf38e76664ced3cc89025835850845d03386093705996dc757e6d46c02a7eda6425
-EBUILD kdepim-addons-19.04.3.ebuild 2406 BLAKE2B a0369974a7c15003602461ef3c3f59cde976aeb229136d1e4cdf474183068778c070573ecd04ede4e91ffd9d72a4d0036c2c5c767c975f85315cf64c8b90c740 SHA512 90223da6066fdea518da99204fa4e3b3f2e0ba1c134e7f50b6d8a586b63e3b89dacd82aaa23812719e212398f1038913188497e10fc91f4a25586af80ecb4f03
-EBUILD kdepim-addons-19.08.3.ebuild 2619 BLAKE2B 38b521390b9714589fe7620f532b1bf9b068bf7ff0d49ac5e64994598001dad8af8086bacd4d3b8ee91cc14833f3a4c60de5106d21407f81fe7b957048782033 SHA512 94582d7422057615934d66fc5a46539912847de7696a2c37655ec91ea1af77d125c0f1fac3d54d7a7a2bae8b34d86d5e980219e6335bb3a896e76b679566d63c
+DIST kdepim-addons-19.12.0.tar.xz 2105188 BLAKE2B ce2e1f1544932ed613a463b068791e6bab7d9ae480ceade9ec9748ddf3407cb351d2bcb1dda4e5c626aeded01bdea252235c6aed5212d051497700b21179922f SHA512 b841cfc05d732979dc9cd58cad8ac2f62610915ba6542f0956491d292b18c28fd0695655e2fcccf7e4352a6b8e14f16153c2689c6d94a8d9e54ffa0e148ffa54
+EBUILD kdepim-addons-19.08.3.ebuild 2616 BLAKE2B eb032121cf681711d26d645a8b9e4ead87a8de20aafb6cbf962b76191ecd5b7a03dc28a4eb54f8cf826ce56d65cf696ecb383467c4c4f7038497ae09b7c32b98 SHA512 38116a532dc33f1112f2d8d14e65c2b9dca53718c21bae0b127e687604cbfab7a4ffab53037166eee56f4e3c18ee0c686c581ec5f1a154f44b0aacf0a376512a
+EBUILD kdepim-addons-19.12.0.ebuild 2715 BLAKE2B b3d738db10b91350470c7c6cfb6b6e05a6f418f0597e7dbbc3479002f2abe2aaed2193a6a30a8c05fb0fe38f4e4af6b8a6000100a6d85937853da59cebb15aaf SHA512 4d364fb054382954c4b10e299f30284f21663e1ed12c091fbf73b4fb8ccd9f76dacac39f269dc0a49f263e6de56b5b1f6d1d143910077549668550679e8c6604
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
deleted file mode 100644
index 3108de034476..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="importwizard markdown"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(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 qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-	markdown? ( app-text/discount )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
index a184d41ba592..102e1ad40f50 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild
new file mode 100644
index 000000000000..2a2d1c5f34a9
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_TEST="forceoptional-recursive"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kitinerary-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpkpass-${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
+	>=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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
+	markdown? ( app-text/discount )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}