gentoo resync : 15.12.2019

4 files changed, 55 insertions, 48 deletions

diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 23a2b09f2473..f9ecc2a9a951 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
-DIST kanagram-19.04.3.tar.xz 8034020 BLAKE2B 2e925e09fd37126947c6781373c57bc0d0663a836a4fb46705cbc512dc02aff5aa6f6ed4f6a96c149b862964fdaf35cc9560460b6751951ec652aecdc1f0abf5 SHA512 dbdccbcb01f76dd5143d9844e80b9bc992a2334e55e5d7a70009cb6bb3ff83be3dae77e3d091eb2f2d1c44a45f73ef40eebea9bda836eb117e86760de4747246
 DIST kanagram-19.08.3.tar.xz 8031760 BLAKE2B c6af0c58ead32a0e781f843dfe2e23288e5538a5fa9ed05ba6b81143f1c6981a49d5b987c294302fad016c61e1b80b92c1c12a7071055ded08879e01af3b5341 SHA512 72120d98ff5555ed84fab22716c0871d8bb11bd32529bae62d632aa979668d2ff8166c94b46bff91f77aa88b7a355f1afa13ad769771780a9dd52cb0452f7870
-EBUILD kanagram-19.04.3.ebuild 1093 BLAKE2B 0464a99e0bb0d249f6d49f7f7326db1a035a7c7f71fd23d2e79bdec932b3b051950093a20b18f76ead2f497f6205ed516fdd6b8987bcf4ccc0cbd28c0b098ec9 SHA512 be8a2180cbd7cb9752ed3388e5298b44aba639442cbef1c4dfba4276c17c41f8a0c47885d58b2cd8b64998c14727c0cf256fe5866ae79db3f9c942bbea7ba635
-EBUILD kanagram-19.08.3.ebuild 1289 BLAKE2B 2bb79f35fb9f138536b5868b80fdf32c16cb95b280b6baa06408ecb2cc7bc32929145bb1c0296afa5dc1edcb494a76dfd4db57ea043e95eb811d4fa1b10e3693 SHA512 cc05819e83bdb25af2410d9fc69cd93a2919cc32facc5cde82a0cfe09a11c3077d2c3b879cbd7aef8c8f4fca4e248153a6176ace4499437c3a0f2a50323cc8c6
+DIST kanagram-19.12.0.tar.xz 8028824 BLAKE2B 1129557abd5ee35ed8f98c9a275604a233bfaac5d88c3ccbcbba3fe37b42ac59eed637b4242c583c0cb95657244cca2d56ff021407436885c2c37bcb0d83fa88 SHA512 4ffaf3723a745af61c55d71d991c0892e27066264ebf887422d9e6772e4e817aa465cf120efd188cecc095fe67eb7250ef6d390a6a07f01df3ded613a8cf61d3
+EBUILD kanagram-19.08.3.ebuild 1286 BLAKE2B d4fab88f3599832d4b5ef0899b397c49350cdfc454e8497c2bf1daa6a6d2b788701cd31b5ed2aad2feeb7b2474eb3322c854b71bdd4007725ac69f6df85467f0 SHA512 fb660ce6e266784b12f8acce3e0b4a7426c78689f33d839579b690049ccc6d646f53f84a8fc2b74b5d51e8ef7dcccb3a667ec73c56facbe8a0ef96de6c53ba3b
+EBUILD kanagram-19.12.0.ebuild 1292 BLAKE2B d2ce1145882295f7904444a6903a26c1b506aa3f7a2853ea39a2ac9271e49ed57d7fde230b67018aa28d9a214566964783839fa04387c033867353a853789ead SHA512 56e7f5d920e1e8d5ab879fa591f4ef254a03edcfdc9d3722ffad0f0bb31a3ba08872f797fa09f61786ec85fb93f60b42b53c3dd477b23633a606b8cbbe7088ba
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-19.04.3.ebuild b/kde-apps/kanagram/kanagram-19.04.3.ebuild
deleted file mode 100644
index cd2c418a3c1c..000000000000
--- a/kde-apps/kanagram/kanagram-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtmultimedia 'qml')
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-19.08.3.ebuild b/kde-apps/kanagram/kanagram-19.08.3.ebuild
index 39bf95d6fb53..44774001c87f 100644
--- a/kde-apps/kanagram/kanagram-19.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Game based on anagrams of words"
 HOMEPAGE="https://kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-19.12.0.ebuild b/kde-apps/kanagram/kanagram-19.12.0.ebuild
new file mode 100644
index 000000000000..a1a4f5088dd2
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-19.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+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="
+	>=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
+	>=kde-apps/libkeduvocdocument-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdeedu-data-${PVCUT}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}