gentoo resync : 15.12.2019

4 files changed, 64 insertions, 92 deletions

diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index ca11e5362ce5..2d4f10a26677 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,4 +1,3 @@
-AUX zanshin-0.5.0-cmake.patch 664 BLAKE2B 337a1052537a9dd5db29f13044cbb29a8d51081d36225bbde1955567565654b1b50eb57fed1beb0dd8dc83e2134c414aeef273abe74da2e55cbb4d5107c86fc5 SHA512 dca194bc1bd6ae94932fb5032820b8e59e138052c9de7b547ab5ede1064c4cbfebb66a9161a2772b0126922af3984ad45bbce744374d579f9df167b3937a4841
-DIST zanshin-0.5.0.tar.xz 438300 BLAKE2B 323f7f8545ba59daf2e62af6873be47b81e62b808495757752e4a33e3b0816c63e0e08979695c33cc70b4aebcff6d30814b8cbb400fe64af5329e72501639399 SHA512 9e4f01ee622a07096b7cc234a6a2f0b35501497efb662af590d4c4fa3f55f21acc528bfae10e92da8107f26f3d5f4b777730512c97017c36cad96d6e6cb28e43
-EBUILD zanshin-0.5.0-r1.ebuild 1694 BLAKE2B 695630e3cf306c57c47d57900272d149e91e82514bd543e57f6be901f3370d5b4d8085aa0164e4323fcc0b71fbe6ab5e0d395cbf587e331e913f4748169b225e SHA512 86e4cb1e3f27301058502ab3ad8caf1c49a4b54b625128d52680878fd7d280a69328895c3c5552e38fe813d7c1cb4371e6b2c54d56db3b061c776fd920d51bbf
+DIST zanshin-0.5.71.tar.gz 355173 BLAKE2B 245ccde6b6a68ca0b7093525b2b3d0384b9222efbbb6366060a5061020c565dcd7e6b9b6e4fffadc164bae93783bdcf69e2d02b1df4c9cb382c473dc1a10152b SHA512 c04f280066f97e3984988a86376b6e86b451d0fe5bab31eba4de03f2c2d15e65a3681d3f9f6895bf0750ccac4bf7a4666d742dd9c74028e689d732615cce3e97
+EBUILD zanshin-0.5.71.ebuild 1857 BLAKE2B 88635bfb63e9005946e3c52874efada1219be1ff766e2bf4b16c439d9a62d0192ffa54247e158641a3911c2e92314fa7c756bd0eda8bf0224e865bd4865c804d SHA512 71a99b27ce97820f5a9974d0ca3d5c84a1150f0c94458bfc81f1f9792b66f0f6c7f08003c5e7a6275bfaf1cf4872b8f2e4c611d5ab77fe73d09652f844838fa4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch b/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
deleted file mode 100644
index 6d6facbaeaa2..000000000000
--- a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87e98e6b0aa704558009574eed8d8bdf2bfa0fbb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 22 Jun 2019 12:47:28 +0200
-Subject: [PATCH] Add missing KF5 dependency (fix broken cmake against >=19.04)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6191f54..960fc6c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@ include_directories (
- 
- find_package(KF5 REQUIRED COMPONENTS
-     AkonadiCalendar
-+    AkonadiContact
-     AkonadiNotes
-     AkonadiSearch
-     IdentityManagement
--- 
-2.22.0
-
diff --git a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
deleted file mode 100644
index 981efbc3be50..000000000000
--- a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? ( <kde-apps/akonadi-19.04.50:5[tools] )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	<kde-apps/akonadi-19.04.50:5
-	<kde-apps/akonadi-calendar-19.04.50:5
-	<kde-apps/akonadi-contacts-19.04.50:5
-	<kde-apps/akonadi-notes-19.04.50:5
-	<kde-apps/akonadi-search-19.04.50:5
-	<kde-apps/kcalcore-19.04.50:5
-	<kde-apps/kcontacts-19.04.50:5
-	<kde-apps/kidentitymanagement-19.04.50:5
-	<kde-apps/kldap-19.04.50:5
-	<kde-apps/kmime-19.04.50:5
-	<kde-apps/kontactinterface-19.04.50:5
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/zanshin:4
-	<kde-apps/kdepim-runtime-19.04.50:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/kde-misc/zanshin/zanshin-0.5.71.ebuild b/kde-misc/zanshin/zanshin-0.5.71.ebuild
new file mode 100644
index 000000000000..b3ccd806876b
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-0.5.71.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_APPS_MINIMAL=19.08.3
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Getting things done application by KDE"
+HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
+https://kde.org/applications/utilities/org.kde.zanshin"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="https://github.com/KDE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
+"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
+	>=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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/zanshin:4
+	>=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
+"