gentoo resync : 15.12.2019

4 files changed, 39 insertions, 35 deletions

diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 6bbbbc965fae..d686f63a75a7 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,7 +1,7 @@
 AUX katomic-19.08.3-qt-5.14-1.patch 1864 BLAKE2B 5ba599090cb8e63a3831f9529ebf556504413b3b9c7a095667c03cdc3d1e105cc87fa42d0a1a4ad69da58c7f315de18d20577c709b65ab633e6dce94fa874130 SHA512 518bb34a1707faf57f5919d05e738e26eecec1f8e74a633c2f966f2320c250b158ad0bd7c270677cd59abe3b5c43fd60e60eea6b9811cb66d3c12fff28b01306
 AUX katomic-19.08.3-qt-5.14-2.patch 983 BLAKE2B ee718aa69afab72ce2f70aa9155edbce5f77224f8d995daa5ea47ac26d24c7ac81fc68ee6e921998a7fb3a1fce793b79247fb5512d4d0e8abb7a285c1eba3a0a SHA512 288ef44bb2d8da8f412239f9ef996de2b00e35e12afa93830be7796249d2e8efe85802c25eed610f044ff8f409734bcc5b4c9d40b1b35429c03a5645ee5975bb
-DIST katomic-19.04.3.tar.xz 1422248 BLAKE2B afdda00fcb810e4c45ee855e5b1c7731f0f506fc2c9f81563799e21cd7f26678508655f3afc6075f0a3a39137399902bf79133bac6e7cd829754e3128b642ade SHA512 7a65cca9f49004d594b58aa911d46dd8e749da30e1f014804e89d62e95f669584c21064cb902cc1a6e7511c70467216b51f5142fc7f4dcafadb935d2c663e48d
 DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
-EBUILD katomic-19.04.3.ebuild 737 BLAKE2B c5291f36dd283f966aca18347576117a335b1c93ea603b0a88a9b25483ae3972b92b270670f9bb58973b9988119dfdf2a70150b17d264fc72425cbd6b65672e1 SHA512 815bf9103ab2b6d34cdc2e7c96d15f49877466d239155b31b00e4c798e019e1a1f10f9b30be2b5c343c350f52223d7f48f7dbdc985b70412421c7813d0e3cc66
-EBUILD katomic-19.08.3.ebuild 948 BLAKE2B a560ff56ca273715db613e0c16ee500157187704f3c9d08dff7fc407b4f5b537c58ce503510cb1df0cfd61e5fefc0c109215659d25d58c35ab523e851c67e8ed SHA512 6a2a8045c050ca10f2bbc00924da2f63f5326f77467ab055e89da472390dc0813e4d9bc2ed06f398b45edfb221f867f587d69348d09c972ecda87362a0daa6f6
+DIST katomic-19.12.0.tar.xz 1423304 BLAKE2B f4b1b8fdf64d466f102460fe1cff737e27a9b4c685487090da6da809a72404b75fb54ecafb097c56e986ceeaebbdc612e36c3c3fea19caf3c199a7348073766d SHA512 acc172a0d90fb35b1b062e72fb93b0a5eb3141aed01a5fe0f37e033cd999a30c44409fd8a6790a177dfd07a40b619fcc4fcae66394c7fc8c84b68343cdbb78f4
+EBUILD katomic-19.08.3.ebuild 945 BLAKE2B 5372dec4f1c5a114db20af2c57199b5df0a0b2bd146138cd368afa7bb98c758c02bb72acff2df441894c26c2d9aec00e938e49caca130e3f6cea29f870d396c8 SHA512 cac8c1197629fbe115232efdbaea696eca3344cc2fe0b18a06e6ab87e63a284104fc03f0da5097122115d6ef3cab2b7944d8e16d7270af61cf78cf20d87c168b
+EBUILD katomic-19.12.0.ebuild 900 BLAKE2B 9217871f5de398b0bbb13a2d58c165001d6b63fbfb42af78869660c7a7ef098cf983fefccdb3e9277a5b9c0ddade74c2976c0076ab565f4c3e3a892bf2b9e678 SHA512 8e3c95a3cb0379e4868e333d265f20f08b3fe5dbf83d5137f3c60867b152518b91f440ff51fb66acc2bd3cab6d8ea8040808a3ee8815e703c719521378fd230a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-19.04.3.ebuild b/kde-apps/katomic/katomic-19.04.3.ebuild
deleted file mode 100644
index 10e9f24e4cec..000000000000
--- a/kde-apps/katomic/katomic-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"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/katomic/katomic-19.08.3.ebuild b/kde-apps/katomic/katomic-19.08.3.ebuild
index 1038eacef7a2..e00914a2bb0a 100644
--- a/kde-apps/katomic/katomic-19.08.3.ebuild
+++ b/kde-apps/katomic/katomic-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-19.12.0.ebuild b/kde-apps/katomic/katomic-19.12.0.ebuild
new file mode 100644
index 000000000000..e52bf04fbff9
--- /dev/null
+++ b/kde-apps/katomic/katomic-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.katomic
+https://games.kde.org/game.php?game=katomic"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"