gentoo resync : 15.12.2019

4 files changed, 40 insertions, 35 deletions

diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index e888e6a03cce..5c0aefa669ae 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
-DIST klettres-19.04.3.tar.xz 21463020 BLAKE2B 392c325aacdd49353056b6c2bbf531b40f4519e6d7bae9ae177c3a1bdbc44ee9a8eccc52960998b19c9c154c167690f3b7c8578081da9798f5b4c68e2113ab8c SHA512 7bcd0dfa02b93f31ec69e72a74ab75da4f766a03c178c3bb4dda0536a07dd3d921da20b50cfbe722191bf7d7794d9785a931d63c40583da38193b15cf5654dd4
 DIST klettres-19.08.3.tar.xz 40135784 BLAKE2B 7c6d6d66cc8618c6dcf7a200ad804456140954d3e80e5e2431ab375b6b38c0ba990e5e401feb624b83a87e79af7fcc10070bc6f862b298fa2c9f8a0793f8d11b SHA512 bb6bf0f2b6ccde4b4f2196e9f0154de059420017352152b1059ab799af4c7c796caeb3539394722e97ee79be8930696eab4a22dc5b98f85d40185e0780c88dfb
-EBUILD klettres-19.04.3.ebuild 771 BLAKE2B 8b53cdfd7e2ec00a0e1c280e0f7da1e0f87f2b513007d7a12d0ea70d705550d7d70b235145068c41c22c9b223c1ce7842378003f208ddc6c0ef4fe7e78c6460b SHA512 8287b23677139cfdabce76e0f8d7187a06abc256bf9666e7f445f673bdc09bc14ce8b7650ad5fa226fbe1ba4cfff6d8d7ed895284f67f6bf6c9136eb616d19ce
-EBUILD klettres-19.08.3.ebuild 924 BLAKE2B 62633a5892cc097c41b713dcd6e060b10bb682e82993dbeee9865e8c17530045188a42aecb95bc84ae56baae99264403397d5de27b03e94609e198ed2503fe6d SHA512 8df7144df0fe5dc7970669984fbc712f0de39872f21739707aea35b40e29f440a611e015cc07052dc02109cc6aeaa276334e791f85ca2d1c6f3ef3a134585527
+DIST klettres-19.12.0.tar.xz 40139280 BLAKE2B c965e7d570fcb3a95c98dcd36985705a6c19703ec5a4baeb0e12bc19a8cfa43764e5be767a6be2592c1d82b404783ffefb0ac61e231f11f7f9a3af5895376a39 SHA512 dd881008e5daf8c40e74e427491bece0763671671a80c60a90e31d5eb0a808ca56e9d2c1ee14ffb60f9dc3721763162da977bc7cc4a1cb68b9df021b8783611c
+EBUILD klettres-19.08.3.ebuild 921 BLAKE2B 1751e19a25e7bde8ae0f25cc3787aa33a09d44d2572caea378722d0fb0f58fb73386c94767ee2500f8c258c07a2e15bf42c2ee4e7599be285a1e102a2255e470 SHA512 f7c5bf5d00d21098a77a4547c6fcaf4c16dc046441d814b72b49f3b56bbbf43d0ef8e189d88c048b3172a444c144783de046ea7dffc7c5eba56d555a17740230
+EBUILD klettres-19.12.0.ebuild 933 BLAKE2B 8004349539a5358329daa927d6460df6bc9538f28b39911e6e697d19fe5e0485862e2afd6e7f824a2c2a594bf1b23a67321a4f41a61b3cc9d64fe2e8266074c8 SHA512 13b8c4020d05e5261a9b4cceb4b1f5a5c74fba893b5b952ea818205c09db97d88c27b67077e262fd72012dcbcc8cfe45312a6e32b8dc4d09ff0f7a03b319a947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-19.04.3.ebuild b/kde-apps/klettres/klettres-19.04.3.ebuild
deleted file mode 100644
index 179000b1a667..000000000000
--- a/kde-apps/klettres/klettres-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +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="Alphabet learning application"
-HOMEPAGE="https://kde.org/applications/education/klettres
-https://edu.kde.org/klettres/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-19.08.3.ebuild b/kde-apps/klettres/klettres-19.08.3.ebuild
index dedcf4b0d844..e9d28ff33a73 100644
--- a/kde-apps/klettres/klettres-19.08.3.ebuild
+++ b/kde-apps/klettres/klettres-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/education/klettres
 https://edu.kde.org/klettres/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-19.12.0.ebuild b/kde-apps/klettres/klettres-19.12.0.ebuild
new file mode 100644
index 000000000000..f315cecbe289
--- /dev/null
+++ b/kde-apps/klettres/klettres-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://kde.org/applications/education/org.kde.klettres
+https://edu.kde.org/klettres/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"