gentoo resync : 28.04.2021

4 files changed, 40 insertions, 8 deletions

diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index e23a2c5e1af1..d7df53f7f75d 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,6 @@
-DIST filelight-20.08.3.tar.xz 667748 BLAKE2B d3d6e842eb2027e9b9420fd7130d7a32a5f63d0085029e1bf382c88b9cd12b073ec5c001eb9c6a351a7d46feb43b105a3f8bbaee7c2b6d170ded2cac0df0a61e SHA512 1cf668980055b158479ba5016bef593774ef06aead671d1ff09661f93bf78f591448568f3ec447fbaef53fc2f7253adeff797a26e3d467d678c9f336ea7b3aa2
+AUX filelight-21.04.0-kdoctools_install.patch 813 BLAKE2B d0ce60459c3e1e3ad3eefb858ff3f1bd8c6459c9672d7251f799d0697bd138e3ae83d64b41fd799bd43ddae2f9500cb120eb36a64f2d9dacbf80b92f872803c3 SHA512 9f2e1131f18cddf3b76783f85ab34a8a271ccc5979e5e4c984f680e162e221441fb165d6d460999f2b7cb9e0171b830a314ba4cc72b3b23615d6d758f300cf9a
 DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
-EBUILD filelight-20.08.3.ebuild 905 BLAKE2B d633e30ccc272ef4a9c6195a88574b7161ae496fd0baff2bf860cbd186b2138c95fb851a14dc6417d4c6dda0100c25c22e65df930c81596b61dbde7e9c5d936c SHA512 2b193b2e6206d9472b60010b54e52739c7b9bec7bcb6842fa26d989b5381ab6e5279835bedcc56389c6858faa75b8245cb94f27ab4b29899019a5059e1bacd88
-EBUILD filelight-20.12.3.ebuild 935 BLAKE2B 5db77f38f4a695e5b465f99fe8dad4b36fe59404fc5dc866b013351fa96327ab1caf1cfa1ec8f3a80f90ebe6c372a37840bb760a623407c66381d66654790ed0 SHA512 849f087f134db35fe5ad97d8bee7ff0f1e8c4190bbfa021cdc6e6869f2b3bd5e62c78212a4f8fad04c975a6a1fd5a68a898eab6f4ddd874a4ce8acaeeb1ba7db
+DIST filelight-21.04.0.tar.xz 679032 BLAKE2B 4d3537a189f1fe0c0412e2415f8d364f8517af954bc034bc8e7f87cf77821997316131b4fb30c0fa106c5300f37fa4914321e7cde0368c16e0ccf1dc4f6b9955 SHA512 c87e1ec0a9401ad6e85e6074e59c02cc5c4dca8de98e698bf7dc761036db27bb38eaed914d0302109c5bee26b5776aa4d493114107e2f3ec6130b3078d73fd89
+EBUILD filelight-20.12.3.ebuild 932 BLAKE2B e68ad78b143aeefe28595b24d0b7391eb35e7ee4a846b3449f9ff2f11956fce0231c0cafaad9b024794f3dcc8e2ffe1d27bbf971178d12fb032ebefbd5cb3ab8 SHA512 26414f5f817d585521b5987f144b1cf3d1d97765de890ef42e1a6a9e2d046dc72d36d3121173bfe807720fe94025b97dab2a4bad2b2da2ab3eb4ce8fcfdd1c20
+EBUILD filelight-21.04.0.ebuild 991 BLAKE2B fd64815e1dcdc746b7a718abd4502662c3af94dc013d383385ff390867f4eab93c1bce80c5e00901db9729f38901d954b2fc93931829fbf3fc3f8ab74723f548 SHA512 b265e6f4dc78f8de100eb1f0b2e3b8e7b3247ecefe110e5fceb6e8167c6c4958bfef4e039e9e99d546f23bca535e69dd7ac08eb6af88e7a37fedab75a7283d72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-20.12.3.ebuild b/kde-apps/filelight/filelight-20.12.3.ebuild
index 2568251b6066..e39fb92427c9 100644
--- a/kde-apps/filelight/filelight-20.12.3.ebuild
+++ b/kde-apps/filelight/filelight-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-20.08.3.ebuild b/kde-apps/filelight/filelight-21.04.0.ebuild
index 4e5350a9939b..7ae7ae95813a 100644
--- a/kde-apps/filelight/filelight-20.08.3.ebuild
+++ b/kde-apps/filelight/filelight-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
@@ -15,11 +15,12 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,3 +33,5 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )
diff --git a/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
new file mode 100644
index 000000000000..e9d4c6444f65
--- /dev/null
+++ b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
@@ -0,0 +1,28 @@
+From 0db4a8c6b941800d0616e726ebf3f2e751f2293d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 11:34:46 +0200
+Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
+
+The dependency is optional in this package so the macro call must be too.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8c5c73..72e80dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,5 +56,7 @@ if (KF5DocTools_FOUND)
+ endif()
+ 
+ ki18n_install(po)
+-kdoctools_install(po)
++if (KF5DocTools_FOUND)
++    kdoctools_install(po)
++endif()
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.31.1
+