gentoo Easter resync : 12.04.2020

4 files changed, 30 insertions, 53 deletions

diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index f887854a20c9..bb97bec3389b 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,4 @@
-DIST eventviews-19.08.3.tar.xz 443148 BLAKE2B 2a59da83d3882fb2b3a59ceefbc723ded681f88c318c0c3e18f82d2963d461429c38fc491165648c7ed0821739323f51695d4e7dd65854704ed3c87a48cb001b SHA512 58636b0614f2df5e8f13b63769685c4f13d1beb2d00f6690cfd99999a428687a1004c8ede0854c3bcfd117cabd1b91ea8a5f739945d6d1d4e79d9bba39046d42
-DIST eventviews-19.12.2.tar.xz 443504 BLAKE2B f8ac1526cbce561474b0a7411b472cf1407a129d54b02cb6d065ac70de8ae366b6a8bd864c99ab0de286cd3d625144b01c6b85e02e662600507cb3774ef67e89 SHA512 da3fc8e912571a478577ef98e4e6195510edf96a115c6e21fb07f60a62b522f981c8c1b97dbd0dac9265641fe419e77c34afb1e2396640547d11fdce1ff840c1
-EBUILD eventviews-19.08.3.ebuild 1276 BLAKE2B b960bd6f1b5012796708b19954ab92929b6d86ec8d8ef0ae8a58e18ea3723a282b3963f8f851e1d9d11031dca82f7f436cfa0b7057f20e9938d60bf477b8b766 SHA512 24451b365b87e6a6770b77767d5379bce7869ac689ad58885dd5e7777ae26a2765bff1354d796f4ad2c505ac54c9a4a4798135d05ad5f77be3eb65df08a57414
-EBUILD eventviews-19.12.2.ebuild 1256 BLAKE2B db21bd7457e3819df7bfe578f782fed1cf2728318f79c18d87ae95c45e41609202d9dab59fdc0b69e4fb97ecac54e05833695fbbff6ac505d32832c9739bf391 SHA512 c943401912800237b11ff47b1698b4853b8afc30f86edb280acf58933d0cd8dfb0cf6db374e8a725d0fc8e06ac808a3706dd5154b2d6e71af88948e1b256246c
+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
+EBUILD eventviews-19.12.3.ebuild 1272 BLAKE2B cbc283f87a26687229346513822fdce0bff9b7d6e6f77cae9329e637a9ec6ba7ec5f0c0d47b73ac18ef68d764224743a26b965697be265ca0c3921925189a76a SHA512 84a416b1db934e1cb421aab0397de6f0d7dcf14ad94f4571cf9a1402818841e57a9d0deada0796d37751c139be7500f79b9346f4d2d06825309a24552a63bccf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-19.08.3.ebuild b/kde-apps/eventviews/eventviews-19.08.3.ebuild
deleted file mode 100644
index 55ed079e2acd..000000000000
--- a/kde-apps/eventviews/eventviews-19.08.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=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/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-19.12.2.ebuild b/kde-apps/eventviews/eventviews-19.12.3.ebuild
index 748d0d758ff7..88b93fc912ea 100644
--- a/kde-apps/eventviews/eventviews-19.12.2.ebuild
+++ b/kde-apps/eventviews/eventviews-19.12.3.ebuild
@@ -13,7 +13,7 @@ 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
@@ -37,10 +37,11 @@ DEPEND="
 	>=kde-apps/kcalutils-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/designer-${QTMIN}: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
new file mode 100644
index 000000000000..1b4ef66a7c91
--- /dev/null
+++ b/kde-apps/eventviews/files/eventviews-19.12.3-unused-dep.patch
@@ -0,0 +1,24 @@
+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