gentoo resync : 25.11.2020

3 files changed, 12 insertions, 102 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index a9d3a8c1a234..41c70508f615 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-addons-20.04.3.tar.xz 2064488 BLAKE2B bbcb877b10946eda8388ce92d84bb85276055f46e04d112a8b0503fa80b80c8d5b3f2788131fc56e05d795667a5858c48b75e34012a582e1c757d62ef58cd89c SHA512 faf986a08339452c7f3bd7e46b438ed31780332756b23eb5fe58c3c0325b21694fd1bf462eca7f0b4c463df056d42aefdc9db16905ce1e79a6df3cd0f26e3d87
-DIST kdepim-addons-20.08.1.tar.xz 2070748 BLAKE2B 129ee1ca8b56a5a28560c6852ad282f2bbb82be4eddacf2d99bdd51632c6cc2c73433b1f9b055d3c074512edde39a5c00076a1627bc4a15d05e619ba20d89b24 SHA512 b9ebf5e85bd295a9710c2d5aeb529540437320e0affcc687751ecdf18ca44ca6bf89df223b68bc205f2f1b1ea55bcbec6ef9fc3eb2ecc234d2f514202b56b452
-EBUILD kdepim-addons-20.04.3.ebuild 2535 BLAKE2B cf1124c2a7084c9e759b8dd95348dc5e75192a2766bb8880080f375d2701c3aec528c5da43270621e613fc5846785dee87ac88ab2c2795a5308bee62bf7f0bbe SHA512 2c46f7b35bdd9e70e76eaf42247c374641f2af07db50d6b9c95b276abaf872a4710fce126d5c609964985a368cfe102fe0db3fdf3c0f63ff2f9abaad36fe5517
-EBUILD kdepim-addons-20.08.1.ebuild 2528 BLAKE2B ff16df18a171cbbab83430c88888853f5f6c87a4c031e0437ae816247638356345efdc835712182095c47067c147493dd79361dc3f6644625c28773e5a2da55c SHA512 6ad00972f6c419a9f8f2cab53ef59e205b658e5a438a72ef40e4de9349d8a2676166fd43d3ad46f16d9a7091d1365f1704734545acff831f7a99c5fc63cf868b
+DIST kdepim-addons-20.08.3.tar.xz 2071996 BLAKE2B f66800962d6f42d7205ee718b639b22f2865f6e0f1b36a7c5caac7074affbf83bb5540e9ac6e3cb5587b6b129eb69e8d156f5b6f2f8bf90e11c00f08bb9adf01 SHA512 c788f3aa204486491747ca976268347b8b916c84670e58087a009d0cd153be9a199c09434f2e884d26d39f92728210e97ac4e9c74f20ba6fcf37c6e83276980d
+EBUILD kdepim-addons-20.08.3.ebuild 2440 BLAKE2B 7b58e0b6390e94215ea0cdf002e67ed679e1525bbc7e661edbd6ac26886ed03fff7ac1e2fb9b502e401344bc1cba8bf7559c5b3a3753eb183dcc439ae462c4dd SHA512 62243ba8915f195c977df13a9c19d6fc862f3fe41742dbb1695f9a74582c90cfc44d140b616034f7e7fef94a537edc8f9d588833530c68e377ebcadc932080e5
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.04.3.ebuild
deleted file mode 100644
index 48a4a25ea4f8..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.04.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-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.15.0
-RDEPEND="
-	>=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="${RDEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(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
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
index 7ad4dc10f9a3..bc9c082334d4 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.08.1.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
@@ -5,24 +5,23 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="importwizard markdown"
 
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
@@ -79,9 +78,9 @@ 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."
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
 	fi
+	ecm_pkg_postinst
 }