gentoo resync : 25.11.2020

3 files changed, 6 insertions, 71 deletions

diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 3ba791f42246..aca154f3e137 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,3 @@
-DIST mailcommon-20.04.3.tar.xz 707292 BLAKE2B 318c1f0384f6308ced4bed1b1534d73160341a3e9a96f0c8cc4eb5aaf7c20a579e7ee3dabe61eae73946f06faccce90668244ff114ca2b4da6e62f793a6f56e2 SHA512 1de1f3d60ad3010029e95847a2eb9fb4b2df19c550e4378e12cf0a48fb44fc3ae11f834139b0f9fe55b887c1006d71d83168ad3e801694549df010d4048b11c0
-DIST mailcommon-20.08.1.tar.xz 708876 BLAKE2B d3b44107d21d91ed9a2ae74aadaf325aba24fef017f0d370e1694f1d52d3a61736a7aff8291956b6a5d65128a0a25a638c68a5458e64baf526e7f8a945e4d8e9 SHA512 1705b6a9f045d4d27c6d01ea36d259f8ec78d92f20cb8d0db103aab4c4cd82e6a422fabc13f68213a22da1bca08e3aea1b0190e6fff24ad1ffab98967d02eb48
-EBUILD mailcommon-20.04.3.ebuild 1709 BLAKE2B 9a617bc5184bf7ed4510d1cdc0f2a011e8a58cd6aa045607bfe848551b78aedb17653e31df8853f416e152d158c7f043ac4ad05ac284841e77cde9bd1e3def08 SHA512 0b28e16d7004d930c64589002f0393ed25ebfc05268181bb29c9faacfda61a47e1bf3c248a95abe4a06ca208733fc651012b50ba9e1df031c63aff1f7d0cc5bb
-EBUILD mailcommon-20.08.1.ebuild 1736 BLAKE2B 604417dc99a48e36b35d978ad9dad3dd9bc6c300f0952ef16dc70d1d290d5dfa04cecdf00f4de4abed2789c579806743de0e5f0ad2923c03f00848cd3f1a3616 SHA512 f7869c5a5870d2c466c326261010162ad800614fe6fec9538f04498fd58c4e60b493d86b6fab10b734de2901a0e8b46492d5fd8445b307819e2439e896355993
+DIST mailcommon-20.08.3.tar.xz 708792 BLAKE2B 19e1d512e0264b212d85f34d911193d8f0f455f18a51b90cac3fddb7b373283ba42598e2012b3a585298bb00bc907ab09ed94087e5114da3384b8a55fc7ec609 SHA512 b7f21ff44fb2a9735fc870217fdfe947adefe08228dcab16caefe25d429ba19d431c0774b73860fbd9a45e591e749c49e6bc6db479327ce21bb95ed505919056
+EBUILD mailcommon-20.08.3.ebuild 1682 BLAKE2B 729228802e786ec47419527c92e102d1eefbc2cf32b51f7f74660ef9057c3cc964d44cf2ba1e1feda76bea936dd49dec3daac4a0261bc74faa2b83d1b2f5a55f SHA512 de65f0fc6e22aea2fa3598942ea3f7f0483b96ad8605c314243b8b271b456758db1c5df2b26ff465f6e276d322d3aed5a47be2ba508fcc9f2169972cc90039e3
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-20.04.3.ebuild b/kde-apps/mailcommon/mailcommon-20.04.3.ebuild
deleted file mode 100644
index 51fbc82ff37f..000000000000
--- a/kde-apps/mailcommon/mailcommon-20.04.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${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-mime-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.10.90
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-20.08.1.ebuild b/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
index e8c375fcd7ca..9089aab1a701 100644
--- a/kde-apps/mailcommon/mailcommon-20.08.1.ebuild
+++ b/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 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
 
@@ -15,15 +15,14 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-# drop qtcore subslot operator when QT_MINIMAL >= 5.15.0
 BDEPEND="
 	dev-libs/libxslt
 "
 DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtcore-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtmultimedia-${QTMIN}:5