gentoo resync : 15.12.2019

4 files changed, 37 insertions, 33 deletions

diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index ae21f2c0144c..c9894723f260 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
-DIST kgeography-19.04.3.tar.xz 10820872 BLAKE2B 2d09154e3e549870803a27ae475dd053e3fde7ea7377cd44b70912997045df171fa72fdba1c6a995d5f9861829b931fd1199a109a288e5acd40c64d62f74ca35 SHA512 623b315371f3d627da25dad22452e058077fd0eb29ebdad14ff76e5db60c6b9c14058ce3560607760f217b32d1cb27dc50e2771bcf41f75faecde4a9ac0b35f0
 DIST kgeography-19.08.3.tar.xz 10888780 BLAKE2B 9ed7ceb67b86186fe7afef7f5d23789e9e5ffc31c4fd85fd6402fcade31752fd4a15fe7936f364d7a3dca3e68b45fb123c1dc9392fdcfc32d273f7ba59e5247a SHA512 d975bcce54dcae7a8d6ae28865b4a0a195163bfbef3741636e8cac547962013d7a9b58fa20ae3ec0b3b59d1c9370a350bf2f1d75733e53e18357b1e81f07c4cf
-EBUILD kgeography-19.04.3.ebuild 746 BLAKE2B 2213a028d89b9463f76595962418ed9d51c0d39144833bd031baa3045cc99a62e22d18bd971ba31c888ee5ccc82f42ca0970a37f01f1396747618b27b6621608 SHA512 ab04c5ffd8d31dd3b5d768dd900ee9882eb6628444f44e429bdda4cd970b590e0de816720d2b65e755fd84baa3b203977a5703b7a70672fb248601262760a4ef
-EBUILD kgeography-19.08.3.ebuild 893 BLAKE2B f50e2767eb35281107fc70086e18e0dd1d031b5e1672abd834236e48c4502366957aa99b2c6535536a66cfa77c2de058b2ee98265a2c69cad454a57b148b66cc SHA512 3514762084a9c7893dd4698696c539d1015b5e2df54e4942e33c0c333dd0a760d4a516cecc2618b8bb2a4b89d02cd727bc357af2f6215b9e5b75b0cf2a5b4e7c
+DIST kgeography-19.12.0.tar.xz 10889136 BLAKE2B a1e7a6f0850d0cbfaed51bd4acfa198da97286941b01ff003928f1855b39ce1ba2762445846198d7a2e7d7d2b81fecf4eeafef42f9bf1c55007937e95bb9c57c SHA512 3cd4bfeba0ff82e14530848d3e48d89519efd72f8c332689bf5ccebde520048bee57df8f2f838eeeaa3d873e941850b7ca82a8d97aa4b77c8a747e5fee216261
+EBUILD kgeography-19.08.3.ebuild 890 BLAKE2B d9187861bfb424a1d164741846251c1a2f89582bad5819cc2402fd718af3acb38c47ede95caf11a1a3e9ead2243eee29f391cb6c8e2d8230d268c3d45628aac0 SHA512 db28eacd6b9e64b7471f578284a43d6366a5f11c9b58e12100f4931283ede25bb94ebe47487db114469d665b113a0ff05be2c4ca167c2e665aefac8e90e10073
+EBUILD kgeography-19.12.0.ebuild 846 BLAKE2B 95cc882f103f1b5502058cb2d1da99847082d1c1d43a9af860acd8a807a366f5dc0acb7ce751ecf119a98afb877c9f9b9c26aad761ac778dc18a2ebaf6b67da0 SHA512 bb2c3a584b2ba1cbc771fbfcaa1fb21f4129ee3845c16c2a09af7b18c69112f44eff0a35f43b23f86924164879ea3e856d9e54ebe277673e97446f2d4e8ca9bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-19.04.3.ebuild b/kde-apps/kgeography/kgeography-19.04.3.ebuild
deleted file mode 100644
index 99a1268a37d6..000000000000
--- a/kde-apps/kgeography/kgeography-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +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="Geography learning tool"
-HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
-https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-19.08.3.ebuild b/kde-apps/kgeography/kgeography-19.08.3.ebuild
index abf2f11a6877..adffc78c14dc 100644
--- a/kde-apps/kgeography/kgeography-19.08.3.ebuild
+++ b/kde-apps/kgeography/kgeography-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
 https://edu.kde.org/applications/all/kgeography"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-19.12.0.ebuild b/kde-apps/kgeography/kgeography-19.12.0.ebuild
new file mode 100644
index 000000000000..f772bdfe0709
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Geography learning tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kgeography"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"