gentoo resync : 25.08.2020

3 files changed, 27 insertions, 24 deletions

diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index f28c9b20fbe9..48482e0f95e9 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
-DIST pimcommon-19.12.3.tar.xz 293412 BLAKE2B cedd59be191fc2fc7cbe65b2e576fa8f5bc6004ddd61b38f238166e9523f0ff487f011d257fee18f05b1888e011579b2149f1efc1e36184d93de445a1ab5de72 SHA512 f1368fa5d0825087c8447651e2d878f7f1428bea2dc8372f979694cdff1f961ee3555409738b0e54c6886004a258cb3e7752fd27d3bcf867564471027ebfb6cd
-DIST pimcommon-20.04.2.tar.xz 294416 BLAKE2B f869844093fcf45827e03658bd138d17d8d7da7c5f9b1bf94c1b4e8e7a3d6cab9095cf1bb202dadd555ebb1ecc409edc851d27d6d76a3b3b2211829e090a9f1d SHA512 eeca7d414d4e5b8601c137aa22f657eb24f06adb423ce85886a525347a5bac63a4e2c9fc706d49a4986a3dc382b54bfc832953fa8ca926f713b0c01865e63f3c
-EBUILD pimcommon-19.12.3.ebuild 1621 BLAKE2B 4f708ec32b935ac6e8467c04a9277e98c01c55ad94b601868b0d2e442342e15a1eca7bab2faea4a5ce6e586a79110d49e7356ff31bf30513fe25d4a2f78f680e SHA512 f44deeeda7e5f99816fdfacd5ebaca0c076af0601afa8c06b8aee62d5d9a1d82dcf5b6572d17279cca24946ab7483ea69ead4f9fbf21f700673aaf505f84f222
-EBUILD pimcommon-20.04.2.ebuild 1583 BLAKE2B 52823d08c511760a602a2bdaef577588e612afdc8b08e605ff3317d382640231c83cfa000b7b086412eae3fcefd31af4eca09580c700f70ae7565427e62a53c3 SHA512 56155af615ab2a113b5d4cdb7438696b24fea4b2fdf770ee8ac2ea794cb00aeefbd084eeceb330b4940e7c541549aca72855891fa93fc9026e454fa5da8190db
+DIST pimcommon-20.04.3.tar.xz 294328 BLAKE2B 0f6ebc6d7949b04f0d74655ef4c6ad1f8c9c24c0964727e9b68b67b4d1f5707af29d452391e61e0f33985065a2d389d2fce987cd1fcb6490f0121b96bd46234d SHA512 63396ba86cbcd6a8e53981cac79f30ead57dbe06eb1772274a185726117b2bbcb52f8c8f0dc9a8d9534f147615d985ed0d6812e466989b6968944b775ca2dd31
+DIST pimcommon-20.08.0.tar.xz 355936 BLAKE2B e538eae240c92debf685abea5afbf4f08a13de5cbef049b7bb7f501d95ddb6e5e8b7d95cc2c795e2a400e06d18cca0865881889330827166ef6f690d3205cf6b SHA512 841bbd453a5809125af1657c384545e316744c47de8ce36fbe91431fe86bf98a1884f8baa877b805c2d9109dd3cfbc9b995299ab9ca92ceaad09217a95286120
+EBUILD pimcommon-20.04.3.ebuild 1580 BLAKE2B 837bd04c9f17b4eb9de25aa0305c6f6445c496289dc0c0c9ec7f8e095f17a3bd08822ddb9a1dbb9305f54cb1437cefb92c1a642f3c321fc2f91065d176a6772b SHA512 ff934e3ba125aa076d2e242fac2ff0a2ba2f58be85f6a4965ce854d1eeffb075e502d2a8bb30a9e0f267d4d2ef6102c894a9ab805a71b7b35cd1663e699756cd
+EBUILD pimcommon-20.08.0.ebuild 1682 BLAKE2B b9aaade74ca58d9b1064e2b91c40242af3e0e56950f431942d003a284616710c9d0cb57a9bc2af1a7b5eec610b58b27f39789b83ac782a1f49433a5259aaf6e3 SHA512 dc1a559e618e674a95048a23d67b740119de5439fe764571a3b7676b65d88c9a676c6c53d8ae3c6b96491bf5f4812174fed18e70840b2f3562febda731507a99
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-20.04.2.ebuild b/kde-apps/pimcommon/pimcommon-20.04.3.ebuild
index 6347b27a76ed..fbbfb48c2956 100644
--- a/kde-apps/pimcommon/pimcommon-20.04.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-19.12.3.ebuild b/kde-apps/pimcommon/pimcommon-20.08.0.ebuild
index be2585f50d5a..d4ed0755468c 100644
--- a/kde-apps/pimcommon/pimcommon-19.12.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,21 +15,32 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
 	dev-libs/libxslt
 "
-RDEPEND="
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${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/kimap-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-frameworks/karchive-${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/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
@@ -39,21 +50,13 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	test? ( >=kde-apps/kmime-${PVCUT}:5 )
 "
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/libkdepim-20.07.80:5
+"
 
 src_test() {
 	# bugs 641730, 661330