gentoo resync : 25.08.2020

3 files changed, 30 insertions, 22 deletions

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index a9ecbb6291f4..49177c06ee1c 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
-DIST akregator-19.12.3.tar.xz 2194372 BLAKE2B ff42d62cacc7fb2d3319762a147d05e80ac9df92c4d673329cbdd222799cb6d7682696542cde2a006507f51a07a8dbc0e76dca6eca3892f847276e6da63521a2 SHA512 8670184ae7e89f60e25525a6a6046f54759e5a277b3ed85fe003c045c3cf39f3666f5327283f39a65cadd3442006478348ef6a16541b4d7474ce45158d0989fc
-DIST akregator-20.04.2.tar.xz 2196800 BLAKE2B f67c0dbd4e59d0e7921a325d88f93223077d1330b3f37ed30d3a31232abe9db2d186803845106a821300f9625a6e87cef2cbcdb88a3da5ba1f8f3395a44e1249 SHA512 5176116ab66b11257fc7b562b786cbcd1189e1b2160501a4f54c731a21d63d597a1f1d201266cd42721ee3e89f1189baf6ce0ba181c08048418ad69fc1758280
-EBUILD akregator-19.12.3.ebuild 1616 BLAKE2B f5d00840eb2f8cffdc85b305bfdd9d961c3d7f837b6a0c8961edd97bac9f4f0ee20b7af6fcd5eb845ae8aa2561dd8eb85f5dfe488745c472e11fa3862490ce8f SHA512 ced4efdc256dc1966853dfa7c0a7f5970684447dc57b36dd4ee8bd7858787cfcda2431a201fbd0a64ab3fb2dc7ff70f064750a376873e8eed1fc5ffbf6028e0d
-EBUILD akregator-20.04.2.ebuild 1745 BLAKE2B 55dec6af57aa4ac24fde8e21d8f14aef91288fc4e1f6b264296c5b9a6a250b21fab2a3158fbbfc9992318696df4ebd4e25d6f2e446af57cc3665868be6265c9c SHA512 74eab8497fe24cbda7656e3f0104709fb6c70c67ff01e617abe4d638dd28aa42737df1b9600e1e13ad7dcbebc6072e8b077c901983e2f3dda9176bd9e3755214
+DIST akregator-20.04.3.tar.xz 2196124 BLAKE2B 80be80ed8fb10086635bb224024ee16180d119c1632125f6eaadf7977ec255529d35b11defbf96058ea3b313723828820c4742e0518aa79433d77ef802d77048 SHA512 5d4d76becd5f6491a010ec27d24775b4163697b9c1ea780d382fee4a2351b937598b449f269e7652656bc0a14589726b68f3bf5e62d8cab62de6862d5182758c
+DIST akregator-20.08.0.tar.xz 2203432 BLAKE2B d88e544b83344a5a31b54cc3e7426029a20fbb65c273c7793b96a0cd5b9a504837ff942eb3425cb471b640c215c195b3eb3e9e9ed00d41f70b3acaacc3f60208 SHA512 1f3752a1bf526b529115a486c56fe859af87fde08d100207211a1681491119402b3b47e54a7d758bf83a7f5f8b71caccb7cbfd0ecb16a8d96bc7fa0bd290940a
+EBUILD akregator-20.04.3.ebuild 1742 BLAKE2B aa6258adc1cfc1021a232bffc22b845fcfa79dc8f5b1241f52cdb470d9e8cf4bbd770929073b382d82ac80cbeb85b5aeb4fb12ce3092be96d0043dca2fda4a61 SHA512 934b017333a3fc02631d857a5b48f9f60377a9b85f245d54db9a09997a1ae3d4e6a5e5e26755168604e8985f3f95c6465b0844370de597f650d4a849eccfbd72
+EBUILD akregator-20.08.0.ebuild 1745 BLAKE2B 6ba16b5d978ba38559619bfe9958d8dc9bef2412d86a5c72f5d4b856dbbe68fdfa56d533f8d46445509d0bb3be0ae7f0a0db6b7abb2043a7b10a508f0d4df78d SHA512 6fe4e3d59ce5acca58806e87465b5e2b489702c5a1bf54b50f275c46f52c4c787ce85d30a39f3ccdcc36ee976fd2c7c3b84e0686bfc1da95067e7b548e473460
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-19.12.3.ebuild b/kde-apps/akregator/akregator-20.04.3.ebuild
index aa6ca1bd3cee..0eb7a05714a0 100644
--- a/kde-apps/akregator/akregator-19.12.3.ebuild
+++ b/kde-apps/akregator/akregator-20.04.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="News feed aggregator"
@@ -16,9 +16,21 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
+IUSE="telemetry"
 
 RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -27,7 +39,6 @@ RDEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
@@ -38,19 +49,16 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/syndication-${KFMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${RDEPEND}
 	dev-libs/grantlee:5
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/akregator/akregator-20.04.2.ebuild b/kde-apps/akregator/akregator-20.08.0.ebuild
index 1676fc88236b..4ff5aaa6da79 100644
--- a/kde-apps/akregator/akregator-20.04.2.ebuild
+++ b/kde-apps/akregator/akregator-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="News feed aggregator"