gentoo resync : 25.11.2020

3 files changed, 6 insertions, 84 deletions

diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 952285412c86..0592b49ddad7 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,3 @@
-DIST knotes-20.04.3.tar.xz 320856 BLAKE2B 03545965cfdbd55c857c584376cd46afc455de449b66f986dd45b0112d638fd77eea1bfe33bd7448c0e62ffc1435ff11a198e5ecf11236c8c5e5d0a2153f80a8 SHA512 560eaace0c0c0b74e639b9c9276e2d07eb28a24ff3986459f1011422b447d653b6afbbc17469b28563c0afdc14ff821b073686d3cb155aa2ad807834594ebf50
-DIST knotes-20.08.1.tar.xz 322388 BLAKE2B 366adc9ce270d0230a63bfd69090ba6d33912929e4cf22199afdd55c63f57d9720f788fb2454d909c18982a83228db4a288167ff147aee7b2bc805d34e06891d SHA512 19030e36b66714aaff7a126aafea6bb78a7e5fdf58c25bea3ed6875d79939c825c031ed0f4bb58fcfe34e736861f68ccc834a1c36f17f01345957fd39a12c7b8
-EBUILD knotes-20.04.3.ebuild 2157 BLAKE2B d410e515050975eb884b95ec2b9d364d5bef1a9bb682796f32d38d624a45231bf19610820092ea76168601b4b95eec980e8fcc2124612b716238a31df93cd05f SHA512 323f90f3cc1333a091dd71c3c53163a07392e8eb74f8dcd5b8da2851b83b59f53a732a9f6624e6a213dd71b821f0baa55a8b1241f5f320400fef968027ee739b
-EBUILD knotes-20.08.1.ebuild 2160 BLAKE2B 06a8f085eba9d4eb30361bf9f6e752be6d214002f7db01baf09112d9e893c84365b6d42e080bea90d086bcee809d9447ef75d2e5eee43b7a75c9ed65a971f4a5 SHA512 72d21ddb4fc0a5dfe8060dd98b69fe07ff1c178793804439b7ea87388f8d83eed068831376fbd47e861d154556e59de6890e03050cbe0d3045406d6ad3fb98b3
+DIST knotes-20.08.3.tar.xz 322452 BLAKE2B cb07719d7623549d63c0af6232923a7b522db933920af0f24208acf3500412386a73b755d42ba3195ffdf1ec1ca278cb9dfb01fe70c237b6cdc0c2ec2007d8ea SHA512 79babf26d257775fb150e3c424f876e29461257780204605cb5c8af8fade803fb112217489ea69a90923fb8a2b7a08cbebc75a9d1836bfc3b3cab9fe8f8fcfdb
+EBUILD knotes-20.08.3.ebuild 2141 BLAKE2B 4954a6d75da35b1771cf4df1c7d8bb372eaac1bf6947d66b7062c171ae10c7ccdd465a90312f21d3bf865a3dec3f749c2b753f8713d98b58fa6053a35bbc2149 SHA512 fc60d83069e6b67c3cdb2a2e72f851ab13e106cbddc144260b092c4dd385a000cdd42d69e8d41ac30c9e51d1c9cf21c69dbe68ff8b159809d17f7179efbfb62c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-20.08.1.ebuild b/kde-apps/knotes/knotes-20.08.1.ebuild
deleted file mode 100644
index d5518815ddf5..000000000000
--- a/kde-apps/knotes/knotes-20.08.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/knotes-20.04.3.ebuild b/kde-apps/knotes/knotes-20.08.3.ebuild
index feb8c24266dc..fcfb0c2c981d 100644
--- a/kde-apps/knotes/knotes-20.04.3.ebuild
+++ b/kde-apps/knotes/knotes-20.08.3.ebuild
@@ -6,18 +6,18 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
+HOMEPAGE="https://apps.kde.org/en/knotes
 https://kontact.kde.org/components/knotes.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="