gentoo resync : 25.08.2020

4 files changed, 21 insertions, 47 deletions

diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 9231368d12d9..d1885ba0486e 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,6 +1,5 @@
-AUX eventviews-19.12.3-unused-dep.patch 889 BLAKE2B f835f27082e6489deb9a55ebb502e3d14ad94d0b31b9cae08de1ec4d0b771cd14d30381c4c2d2c749b6283f7cb194e21a021ff14d7e7c0e8e01f089adf8a3004 SHA512 e2a26c314dadd70400d1eaf54dc50e9a1cdf94699b7b5a0bdbfbcbfea84d19bad1d5b2fee47f54ce31b0ff4ef12dbed0c149eb2e4e8087ab283d5f32ab8afe29
-DIST eventviews-19.12.3.tar.xz 444608 BLAKE2B 253e0d9bffc854ec3a8b8b9a9e1c8c4275d24e20d4d4fee418fe08f3f6e62fa245ffb818e306d49042773ec9966e71d9f8311a58abda64f298802fb5265b040a SHA512 1d7f846070c8e55c00f4f4869fb9207a3b23533aead9dc305cea6e970e7de52904ee1e723c726d36d04e03debdea9cf62747cc6283dc1fd1c53ff1bc77b3d128
-DIST eventviews-20.04.2.tar.xz 443864 BLAKE2B 88f226d402fdcb6d7a954b3a8f3dd6c6995638f36d49624ab142411a29ff068b81fd03d13b23a83e189ec089191794f70c93566818e7ad76ceece9f50f82aa3a SHA512 006fe59a405876f8b7a257005c93197107ebc6fbdc8a359bd1666e4311908ad7e37e265afe69c0bfd93487518b6a74720567f4e4b935c1e873d0c51425107ec2
-EBUILD eventviews-19.12.3.ebuild 1272 BLAKE2B cbc283f87a26687229346513822fdce0bff9b7d6e6f77cae9329e637a9ec6ba7ec5f0c0d47b73ac18ef68d764224743a26b965697be265ca0c3921925189a76a SHA512 84a416b1db934e1cb421aab0397de6f0d7dcf14ad94f4571cf9a1402818841e57a9d0deada0796d37751c139be7500f79b9346f4d2d06825309a24552a63bccf
-EBUILD eventviews-20.04.2.ebuild 1226 BLAKE2B 096f31c2d892f7819a9da8bbb5af4e8b6c77a72a84f3df6c177ba3fab2b9c6822546b0c2ce5f9634fb4cb20a11fc9511453b859021253a302bd76f712c06d736 SHA512 716fdb4e55a1aa958f1bd35e01a6ebc438a62368a9ac138a152499385d406b15835fa3dcacef5aef77bca40f5f83461ee58ea95eb199838484ee133225edcebc
+DIST eventviews-20.04.3.tar.xz 444392 BLAKE2B 9382263a8b8783cfa033caf1d434c1f698aa3d290d9d62e0a167bf4572a9626cd05ace5c8faf98132c376a359010b053b210b8855810e2b75c67b532effa263d SHA512 c099f61c0c8cb1997cdf898b6147dea918066f8e04f155690e80bc93167ed4e851a5042af70ddee876ca9800f8b8af755cdf7a3c3e6d31a68df4189882b50124
+DIST eventviews-20.08.0.tar.xz 445276 BLAKE2B 3e69febb28967f1763c1ccb5258678a3ad5e5c3eeb95a077eb123f5b4dd0b5baa4d18617d6dbb600557d4a7bbf814853437e3b58378c3c19ed9272f360f3ffd1 SHA512 77c4b9d6983abda26aff18baf3152e263426f3bb20f6740f403040c08e8739fbf44ee8abf7b2dc71df3fa6ca61ac8dd9419a9ef32bad850ac20fac55ed3e2a0e
+EBUILD eventviews-20.04.3.ebuild 1223 BLAKE2B 117ff3acbae58cc1af7e207ca78b038e7f59cbf7ff377380bfcba907b6796f17e1d19e847958e675018f63aef57b6c72f52f467c9cac91674b8172c3d43c3dae SHA512 a0b82e3bf390c0de9fac28f4c31c8a9df2e56ac84d499eecbe3aaf58bb51890b631a4d42a42500e3361d3afbc2b47593e9a510eb89008543a04b0835b86200e5
+EBUILD eventviews-20.08.0.ebuild 1255 BLAKE2B c9b6e7dc3da0cf64ed43a807be020c3347355b922905ed003b1cd1668fccca140d49df6de5ff031ce9ca8395b1d2093fb32a85730c44dc682b3194fdfd7906b6 SHA512 65d33511a06b8b9117a0f03d3f6b42010e585067297792420952020a396765fe2f58a19e2e5e1f9e9ca5b6966826b4e343f8a900cdeed947f57636db1db15455
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-20.04.2.ebuild b/kde-apps/eventviews/eventviews-20.04.3.ebuild
index 4f24785a9aef..eadea5559f99 100644
--- a/kde-apps/eventviews/eventviews-20.04.2.ebuild
+++ b/kde-apps/eventviews/eventviews-20.04.3.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-apps/eventviews/eventviews-19.12.3.ebuild b/kde-apps/eventviews/eventviews-20.08.0.ebuild
index 88b93fc912ea..2d02fd051121 100644
--- a/kde-apps/eventviews/eventviews-19.12.3.ebuild
+++ b/kde-apps/eventviews/eventviews-20.08.0.ebuild
@@ -5,19 +5,30 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+# drop qtcore subslot operator when QT_MINIMAL >= 5.15.0
 DEPEND="
+	dev-libs/kdiagram:5
+	dev-libs/libical
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -31,17 +42,5 @@ DEPEND="
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/kdiagram:5
-	dev-libs/libical
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
diff --git a/kde-apps/eventviews/files/eventviews-19.12.3-unused-dep.patch b/kde-apps/eventviews/files/eventviews-19.12.3-unused-dep.patch
deleted file mode 100644
index 1b4ef66a7c91..000000000000
--- a/kde-apps/eventviews/files/eventviews-19.12.3-unused-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 80b191fd01268cbd5afa2cff6925a56f9d1a2ccc Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 5 Mar 2020 13:49:34 +0100
-Subject: UiTools is not required for building it
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19d256f..fceabb0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,7 +38,7 @@ set(LIBKDEPIM_LIB_VERSION "5.13.40")
- set(CALENDARSUPPORT_LIB_VERSION "5.13.40")
- 
- find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
--find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets UiTools)
-+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
- find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
--- 
-cgit v1.1