gentoo resync : 25.11.2020

3 files changed, 6 insertions, 70 deletions

diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 49076f06b900..4a70164b9456 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,3 @@
-DIST kanagram-20.04.3.tar.xz 8024860 BLAKE2B 59fa4cd16da329138baffdb6466868d4b24c843cc02367a424967dca0ece621c00b632f54694dc9c6149d5a980c4d0720d28182c5550f32e969c6880f5936c5f SHA512 e25f5bd4724b8f55ccf6b1fc71ab614ed7cb813c6558abafb0c1cfcc002d04edee856667f361c1a23b1297fc71b70af28069f320bab923403dcd56b48e2143a2
-DIST kanagram-20.08.1.tar.xz 8031916 BLAKE2B 5f4c2ac89f160aa5b9e16ad4d906585672379e9452b31aea21d4ab0297bc0cacb3e0f79cb23cac1dadc7791137dec15bfbe0691144328947a1c5356be524e7d7 SHA512 82a90e3ef602ec90755f82292b7dbafbbef91698c7279a7b20de66b5fc2bfa2ac5722d4f4852f0c919ca9f6b6b3db069649efe33b9d2c3df95856deeca11bab8
-EBUILD kanagram-20.04.3.ebuild 1356 BLAKE2B 3128f883fde697a1437ecdc5413b141f860131ba5a97c91a2c040d4df2ca54528e6b353ae6b52556ca86aa311c3d300e004d8c889b3ad5dfb764cad69d3fac8a SHA512 66a7f23ea3450d27e077afe85c750cbabcfd1db9b06d4d4dce4bd16d1e71c9c14e1dba4f97713c8ebaafd96697eb17bcc6cce05bddd97e699076ba62692bbf0a
-EBUILD kanagram-20.08.1.ebuild 1360 BLAKE2B b140df108974624602dbd444e0b2b4cd2066a546b68cc43a5f5585c35ad5334b8898b0d2dbf2ab58b3b486b09ad953555a365646cc4e903dea14befd6775c702 SHA512 2eaf4045162ca388c5ce5a377ac03616ae3f37894cc74213d56538ae9cc34bb2fcc671af47067d3ba016900ca9a7595d02734c50f3274f9cf06d43824081500b
+DIST kanagram-20.08.3.tar.xz 8030604 BLAKE2B ccf88417f2404104e90722000245d883502e849cc72550947f7b4e2db4d736453c6f66c4bd8a135cf84710190f10d171fc5c1e08f3a958e08bd4e82582e39251 SHA512 b6d679493f30a4a0accd7ea6b8482b8055b23af7ce5af623e1f95d058a35e0b66164b9fe44347750246910116144ee963da124d06064585dd262bcf0be18ae4b
+EBUILD kanagram-20.08.3.ebuild 1267 BLAKE2B fa50c888c637ccc1d044bca8c16816621a5571f48c7f526c85b0abff7233de2e0f10eed7d2f813be4f172eb029a44c61856476e4f8e7bec5677990621f4e7aa7 SHA512 d9423462db197359e045447d5beac57993a1db1c7f7e0698f2482389ee297c8aa63383f7fbce419445a491c5faf3e87f9b82d737ba64382193f88e59a2eb218b
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-20.08.1.ebuild b/kde-apps/kanagram/kanagram-20.08.1.ebuild
deleted file mode 100644
index 8af7737304f8..000000000000
--- a/kde-apps/kanagram/kanagram-20.08.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kanagram
-https://edu.kde.org/kanagram/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-20.04.3.ebuild b/kde-apps/kanagram/kanagram-20.08.3.ebuild
index 2e2be545c5aa..3f94e16a8e75 100644
--- a/kde-apps/kanagram/kanagram-20.04.3.ebuild
+++ b/kde-apps/kanagram/kanagram-20.08.3.ebuild
@@ -5,13 +5,12 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kanagram
-https://edu.kde.org/kanagram/"
+HOMEPAGE="https://apps.kde.org/en/kanagram https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -33,7 +32,7 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
+	>=media-libs/phonon-4.11.0
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
@@ -42,11 +41,6 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdeedu-data-${PVCUT}:5
 "
 
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package speech Qt5TextToSpeech)