gentoo resync : 28.04.2021

4 files changed, 37 insertions, 6 deletions

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 5f5d559a7ca0..e92c023a0c71 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,6 @@
-DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
+AUX akregator-21.04.0-fix-dependencies.patch 1061 BLAKE2B eaec25b98a2f4aadb4547a50c1d732c015a6775aa435a0ff866289e794eba9cd927a8b510f034463a11610332d73a96a768a8fa90686c2ccae0851d8ead853db SHA512 1e1cae77456104dd127076439f857e26950ec672ee22ddb37b6218eece56ebbddf37d93fede886ecce606717260df7066db2ad1603483a69017bca1bb35bd3dd
 DIST akregator-20.12.3.tar.xz 2206188 BLAKE2B b1bb959de8d792057b6542a9f059687121fc3cfcffa36e519ebbb10940f1a0d002d9d3c0784e0c1f0163ebaf7442fea19985fe434a728c060e254fbbc8369624 SHA512 f223c45fb63a844a1f662c3a77a1f6d23a9b0f8de738fd3a0a88379a82c1be4343536f6ae11856839b03406181ed1bc42cee8ab2cb1ff2515a74a2adb2327ad7
-EBUILD akregator-20.12.2.ebuild 1727 BLAKE2B 56737a4663211a79cf102f67774c62c16444bd95fc1ed33f9ba9c803fe3e11b27239b4f96e5ff98d9799dc62e681c1197e2b97b1b23a49009ed918bf2d128310 SHA512 2c4fab22348188ae0947d2b48e52560f72563e9e4b78e8df4b2f12b44a99323470b96b87d92354f6b588b89e96270e8e61d0f65c3505fa3438dd4cc9ea2808ef
-EBUILD akregator-20.12.3.ebuild 1730 BLAKE2B f55e06fe6861a10c9a85105c098c831f2866c0fc0c1fdbe03ebc88a1529ed98e535ad531bf9f061a88755fab8ccf334dcef49d8022d20a0e52cd58ba9081e9d5 SHA512 73cdf61fe918fa243cfe2d791784b0f011a7586f9b950a0538b358355d9fa20c1717e0abe80fc1e210c5a718c43191165c2ad86770d8ad21bddfe250fa69b50f
+DIST akregator-21.04.0.tar.xz 2213808 BLAKE2B 90bc37a9a54271a6b728397e461ac0f48044f446cc7990f3c830ffb38cc1762fdf5f016a2c0a934b2acdadd440e58fb79e17a408fd8404db1012bdefd4cc8cca SHA512 75d158cc4384728b5d690550bb49eb620b38606ff73c070cbb0b3ee39186c9a84a81cebd0720e0b08c7d1b517efc7124204fe25b608dd55274d3957548009731
+EBUILD akregator-20.12.3.ebuild 1804 BLAKE2B a1aa477d57307643d1330eb8e1e0f336c283786fd874615a108021dcb9728154b6240aac12fdd3784d93be22947eecb67e06586bb61edf917a7646912b11b5bb SHA512 0b6253cc4dce84f7c16067389e2f38f2c5cee07c35e4e68a52092df3f2581714d3dfbb3b92085baae34d026d072374a41154eaf1e41514097bee60010590edcc
+EBUILD akregator-21.04.0.ebuild 1798 BLAKE2B a2cbf708e4973aef7d1a5c94be6085b76e38e89eba3edd36f574ac9c84e4bccd1c9015896b47108161ba4ca53b0dd7712ad0241d1d12306d9a23d0bc84016cb6 SHA512 733b90ff9ed384100a5ccebd92245d51c45d208b3531f1e380d9914fea05153cd96eb0a6423c889db71afc786c276e7697b924504627d60a3587ff1b6dbbbb1a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-20.12.3.ebuild b/kde-apps/akregator/akregator-20.12.3.ebuild
index 3fce873a34ae..45c5d16c8f31 100644
--- a/kde-apps/akregator/akregator-20.12.3.ebuild
+++ b/kde-apps/akregator/akregator-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 RDEPEND="
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 	dev-libs/grantlee:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.04.0-fix-dependencies.patch" ) # bug 783921
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/kde-apps/akregator/akregator-20.12.2.ebuild b/kde-apps/akregator/akregator-21.04.0.ebuild
index 2f6b14d2bdc9..d6d4f438d456 100644
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry"
 
 RDEPEND="
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 	dev-libs/grantlee:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-dependencies.patch" ) # bug 783921
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
new file mode 100644
index 000000000000..4455b10fbd30
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
@@ -0,0 +1,26 @@
+From 2f8cd478df76c029d20870364dae577fe1bf82e5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 23 Apr 2021 21:45:33 +0200
+Subject: [PATCH] Find KF5TextWidgets instead of KF5TextEditor
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef9d3084..04f14929 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5NotifyConfig ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Parts ${KF5_MIN_VERSION} CONFIG REQUIRED)
+-find_package(KF5TextEditor ${KF5_MIN_VERSION} CONFIG REQUIRED)
++find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Notifications ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Syndication ${KF5_MIN_VERSION} CONFIG REQUIRED)
+-- 
+2.31.1
+