gentoo resync : 15.12.2019

4 files changed, 37 insertions, 33 deletions

diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 9bd6294fc8fb..07a051b893b4 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,7 +1,7 @@
 AUX kollision-19.08.3-qt-5.14-1.patch 1197 BLAKE2B df4416d7c3462abde47b8b5ec4669ac69ae9965b8e267d4320775410df8a3090a3e9f28256ef6852ce9e76eda6498ce9dcdef455764e491e13d569cca1a95bf1 SHA512 a10ce0f97cb9658f13233aa32e19e47902ac90a74511c182263fe2ea0ee5c0e90e5061d9a9b8f23589ed6f501e7d927fd549f4eb011dbed2c992d18934883665
 AUX kollision-19.08.3-qt-5.14-2.patch 872 BLAKE2B ed7d8965cad72a262a6031b0925334864c05dc317dccfe8d158148be7c001375f4a3777e9e235297049ec15bff3243e7ceb77fd1a39aa9e588f2a8e0786a8eb5 SHA512 74b2849bc2f639457369bd7b56ab6db7f8a89d13be985eff54e8993308fb0a61d42a7eeaeb3c140d29c77b800e0b05bc1afba34e96bf4ddc4f14a0950bb35a8b
-DIST kollision-19.04.3.tar.xz 280592 BLAKE2B 067f8393159c12446bde93c88bdcc4e1cde2ac4affff5d4c0ee5d95a9c96b009af8531bbb40e9c48622be0b5ead8f18b9129529e42bee483362acb6420baa6f0 SHA512 5b18ab96f5227f2900dbe5a5255f5e837bb34990661273327eeef53cdba7aed53cdf282f7287ea2fd0fd4849aa3009f96dc3d59bb23459bcf6477d3338ade74a
 DIST kollision-19.08.3.tar.xz 280844 BLAKE2B e9f2aa8de4d414676775427c1940390db6298b9bc0aab338f57d85513a20d4efe0cf02b0ff5c755010d68b53b5db36a8c74661da64990b8a9a2fbaea5a96fe05 SHA512 e19d14db64942cc0c1355ba465bc64c6721fc3e723c60ab1ef7b48525747ddebb43551772eaddc15dccdf991e8c11452686cb5590c22b66bf90ca088850e133f
-EBUILD kollision-19.04.3.ebuild 676 BLAKE2B 9cd1917f198443f48cb64e7ec931f228ebe60ee4f80fb3f4f7c6f0aea2c3a1b5a9b85d3406ed56d22394f027b04cd5e13ec25477600819dc0eedef8bf00965be SHA512 a5b6c31ee5d06c0a2db7006756c88c1dc941342a915bc374eb7e803e8c6a344042a3547549667f95ffa6bd9c86720334a727375a43fde569491c9eb8e52d01cd
-EBUILD kollision-19.08.3.ebuild 881 BLAKE2B 2abb98a539f43d322bacdc0a18645802373bbc289dafa034c4526e0b9af43d209512204e91f622cb4a61218a4a52a90e3047033d33bf51288e9a47b6ab5c0b7e SHA512 4e860047d1a32dd1b97d4fc02da8fc89f95af82e8390041177d8ca7b97c3c58d3747edfe6a19e5b7d76096a0f4b8e42d7df0403c47ce965b6bcb42463cba86e6
+DIST kollision-19.12.0.tar.xz 280988 BLAKE2B a8ab3a70acf544a8894bed6383e851bccd9c5d07e45db699d18aec46a4c5e228a9516f60f56071bcc505ed00d0629125d7f8ba75f204ae34d28210222f25b98c SHA512 ed314a758936f728f2580cb0bc1107d8ef276e66ae4c489b7d45d3aa25ce1a551d637e35bfec883b3d9e7170aab42641a66cbade5bee6e19b6ca776f097d071b
+EBUILD kollision-19.08.3.ebuild 878 BLAKE2B 5ad93bee0a746a36093e96d705d51d79b0ba14c3c0836118074154a2ed0207dd6ab9f19a272ec9586a56a79e692e4b6f8964ce76d8842b79018449d6cba7342d SHA512 1e6ff73ab77480b1fd2ad70b2d186edb7ff4cd45b155ceee7596372de150c5c1f6a2a3e764a6dcf79ac1d2c0487175a3f62e3e8e01ace30ec69f44bf1ea9a364
+EBUILD kollision-19.12.0.ebuild 833 BLAKE2B b016de9f46f560c27d024239956c5a29291bf233842664b339b08d1da369084a2153cb61675cde038b8ce68595df4ead12713713646cdcc703fffaef1f49d1fa SHA512 4267100319633bf0849157e69c338ed7f9a8e28f802ac3feb1a95b8eeda0083c49fc5b99176c9331eb81a9cc4b1231e55228808c0d140ca2d2d7243fa7524c73
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-19.04.3.ebuild b/kde-apps/kollision/kollision-19.04.3.ebuild
deleted file mode 100644
index d0d1e39f5f60..000000000000
--- a/kde-apps/kollision/kollision-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="Simple ball dodging game"
-HOMEPAGE="
-	https://kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/kollision-19.08.3.ebuild b/kde-apps/kollision/kollision-19.08.3.ebuild
index c36210ecc3ca..fdab34849958 100644
--- a/kde-apps/kollision/kollision-19.08.3.ebuild
+++ b/kde-apps/kollision/kollision-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-19.12.0.ebuild b/kde-apps/kollision/kollision-19.12.0.ebuild
new file mode 100644
index 000000000000..011c57d4334b
--- /dev/null
+++ b/kde-apps/kollision/kollision-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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kollision
+https://games.kde.org/game.php?game=kollision"
+
+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/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}"