gentoo resync : 15.12.2019

4 files changed, 49 insertions, 43 deletions

diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index cfce77fc1906..36dcafdb2fd4 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
-DIST kiten-19.04.3.tar.xz 11288144 BLAKE2B 8c279218e24e461ad1128aad9ec3489679e398f3973cd2e19dd17d38a4e0a5a25cb990fed92917fe9f64c34ce0bfa539fdd6798ecd91dfb9c2013ea8a1439fbb SHA512 18d24ca0457d36d2c6bcc5c90a14c63f60612962a241d62afba67ca9e649a10d1a45ff1c906e480986a6e8e202d239e00978d7e340d5c77e8591da886ea568f3
 DIST kiten-19.08.3.tar.xz 11279532 BLAKE2B 1cb6ab60b310949b51ab0a1011228921bc2a76914595c2680d3ce68b2289030fa7c32ed60c21859cede4e08097899fb5bed7cae91493ed6bca669c5c420d85f5 SHA512 330544abf9fbf6723588f4fc476275500da90a03f61f55569779cffbb31d6fd83fb752d3bfa6393a4298bac34ed43b52581c4df3555d9ccbd80be4b401147dfd
-EBUILD kiten-19.04.3.ebuild 960 BLAKE2B 65d74c97e06d8be09b9f237f89a7c4b41eec140fd781307f493c9d7ca0f9548185fa1936495f2ccb1b632b01e22dd10dc785b5562d21cc75d5aad2760398ebda SHA512 70b336a14bb172f3e17af548c1609dca200221855bc936fc289b422ba134058e545bb96585384b3eb9b81eab65b6160bd3804bc6da9f22f3cde80a4a5c718670
-EBUILD kiten-19.08.3.ebuild 1130 BLAKE2B 6b03fc744dfa523edc5d472c37df696659060ddccb87caeff218be8737aca6e5f09ad46cf3a23a3479ad5ce0c72b0ce38a62bc11632fd51268ad9cc85f55dce9 SHA512 e78dce2edf2581d30cab898353cd142738c3e7e1e5c22fbc393f0600cf4868bcd3d8e3ab6627fb9b6eda9060c0ae9395779a5eaac9680fdc7d52a602684e72ea
+DIST kiten-19.12.0.tar.xz 11289024 BLAKE2B b6bb4b094907f2cfbbe1ec5270d651c8d4795a6badd82c150e7eb88e56b1208fa26e6f5d4202e37632c4ad7de3522b6a0aef2afeb16ed6d988f7e8a50ae9c646 SHA512 7462c3ca2f12091a60d007dd6b46f286d5c133d7fa4244cafda08fb65b8006084e4fe048f732a6434c37a09fc6033f6fc951063780af116962a76009f7508c3b
+EBUILD kiten-19.08.3.ebuild 1127 BLAKE2B 2555f0290de7eff557a2fd3037abf962f85b865727f58c4756b4375710af715a6fd242579f0d97b43f6425988204c944af752f43f14aaa444fb528ea89bcc021 SHA512 27170374a5df899eb70147fd3fa769c63f1b3aac3a31b01181d7d7ef110b9aa93afd556daea266b1d21b66293bf64910bed35937549766e9b5dc0affbcb617fd
+EBUILD kiten-19.12.0.ebuild 1139 BLAKE2B 8db690b9a150f7d12b12bfbc015e77f921beefe93d09123b128b2995ab02f0d890fe3aefd7dec9fa9d25ae8ab35eb10fc5333fde0b6b167f332c288864b7059e SHA512 a98745769b79766d008a3bfdf4253f5dab277e32f8c6c4573eb8d610157fbe336433b52efcccf1e24b6ada4480f7a32f43b5bc797403ce49752254fd70517248
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-19.04.3.ebuild b/kde-apps/kiten/kiten-19.04.3.ebuild
deleted file mode 100644
index 0c3ce36103e5..000000000000
--- a/kde-apps/kiten/kiten-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +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="KDE Japanese dictionary and reference"
-HOMEPAGE="https://kde.org/applications/education/kiten https://edu.kde.org/kiten/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	kde5_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kiten/kiten-19.08.3.ebuild b/kde-apps/kiten/kiten-19.08.3.ebuild
index ca09c8f746b6..054ea7d6fd58 100644
--- a/kde-apps/kiten/kiten-19.08.3.ebuild
+++ b/kde-apps/kiten/kiten-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://kde.org/applications/education/kiten https://edu.kde.org/kiten/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-19.12.0.ebuild b/kde-apps/kiten/kiten-19.12.0.ebuild
new file mode 100644
index 000000000000..372e058febd0
--- /dev/null
+++ b/kde-apps/kiten/kiten-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# 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="KDE Japanese dictionary and reference"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kiten
+https://edu.kde.org/kiten/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=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/khtml-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory data/font
+}