gentoo resync : 25.11.2020

3 files changed, 6 insertions, 70 deletions

diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index d630014b85e6..7f1d4b32fcbe 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,3 @@
-DIST libksieve-20.04.3.tar.xz 555012 BLAKE2B fb8f94ae447352fb196759df3dd6b1eea966ea3b28aac4eb5e41a094b6baadf45a5cba6fbb51ad52f810c4116ab72cb45fe24474c2039889d1b1a33922c8adfd SHA512 08c6e6bd9e6df12d81dcc51aa5221653c13fd21cd353414033fe3a70db13cf4c68d7f90478da5fc0c434afe02fb2bbd43daa412850007be1dabed3bc50d70744
-DIST libksieve-20.08.1.tar.xz 560112 BLAKE2B ef64556a70dde5b7b36ee9114190d3c74b016f563298475f77bfaaaace64ade52998bf9a99cab67f8a1871b622747526c02536a206d918030f837380f098b469 SHA512 da14213788997031355c6d1763b647a3f4085983092c6b297f2ce7ecb6fd853b58325eeae1671241a2df7e0a5b30fc0cc07708df3c8a5b4324dc41fdfe8fdf8d
-EBUILD libksieve-20.04.3.ebuild 1570 BLAKE2B 16ccf11a7e32edb21d462b010949a0d9f8b00e0031b2207632d299a985afcf073ae799da3f0baf08bbcdfa367afbfab932c0133f6eb2d8f957c4efce88885d97 SHA512 77cfde4252c09de3fe22f87c87204b26189b1ab11b3524228740ab17cd7bc5fcb8d2f76d173af5374d1588c8c4207a848973611cc33b93904b631279f54ee30c
-EBUILD libksieve-20.08.1.ebuild 1463 BLAKE2B 6ff5a6b4c81383c1164e3e2e561a51e07e8925933e1936f9b8ce0e5c90d3a364b0bbac1670ab55d00faac7d4492cfb44a818d40b04f4e58f53d75074434251e7 SHA512 57b9e8da59fdf4ebdf6df81ab79e9d237f62c0bd6218997fb4b524ddac390b96b2b1410849d5b8a0268cee3f84d0110ae445c3b3457218484e4654a324179723
+DIST libksieve-20.08.3.tar.xz 560144 BLAKE2B c2b03d38045909a3adb2ed65650d593cabf66734993eb1757cbbf8954e4c587fd720cc53e3f3821b10d147bf2f6c0608c9d9c10d1a0fbcc606dee582103bf81b SHA512 419d142bedc36b3cf21b3808cb95dedd17e3ffa859327b45ee5b5808c8907c08e164f0d5e9ef9bbe617a331352275a7d6d3b375689377e26962e22cf558f7505
+EBUILD libksieve-20.08.3.ebuild 1406 BLAKE2B 4fd3b149b480f3d2693979265bcadff0ba942221af1d49cb5c694703729d275d099141074f85644e5aa126076433540256dc476aa0d8ec0b0839fc335d6e668a SHA512 e8ce74a2e79cad269f5508114544e42d84fc8921a22af4803d376c8b157aa156626da8596f8c515c7362c675da8e5cc893ae436832d7b51621be06f67f241e89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-20.04.3.ebuild b/kde-apps/libksieve/libksieve-20.04.3.ebuild
deleted file mode 100644
index 4350f73d549b..000000000000
--- a/kde-apps/libksieve/libksieve-20.04.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libksieve/libksieve-20.08.1.ebuild b/kde-apps/libksieve/libksieve-20.08.3.ebuild
index 4d701791ee6f..04f2f1697224 100644
--- a/kde-apps/libksieve/libksieve-20.08.1.ebuild
+++ b/kde-apps/libksieve/libksieve-20.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 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 PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
 RDEPEND="
 	dev-libs/cyrus-sasl
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5=
+	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5