gentoo resync : 15.12.2019

4 files changed, 44 insertions, 36 deletions

diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 5b620123dedd..4164caec1046 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
-DIST klickety-19.04.3.tar.xz 1389368 BLAKE2B 112da788f49599dddfd37123e47264ddf277c07b5ac523a2a9f2eed815e20732c18ab5bca29f1e72659661e87632f1b2e18657159b6f57109ebc40dbc60dddc5 SHA512 9fc2c5ccdbb9a90d9c6a8fdcf7fb97e064dc40ba8f47c10296f09f1b3d15971c9b83c9f8d613588d331b56e2f0540593400e30981b52090e4eb4b1941ba4ef30
 DIST klickety-19.08.3.tar.xz 1389972 BLAKE2B c5a4e1c7f0eea5e13948d15ebedbb2b584f06f9838cc13961c07c3b2d9ff708a45534f88f68ee3cbd8c865dfa7316666a6feab8b3adb498d7483c66b80e7254a SHA512 89bff8d42483a1af1c2ffcefcb04811c4a1e56a72f24c6d422bd3eaf6e729f3d9d7b2294b7b0cb4c56f00dbe37b9c5484534fc84f32db4b2bda730e187aa1b6a
-EBUILD klickety-19.04.3.ebuild 758 BLAKE2B f08661f92ca2d4839233aa6fe97e1f3ab8376c35259a43e4d93acc21be1c4bf0969d1158a8c69c258f24e3b4cbb82763528d4a6d0fa2c836745a1108616ddb11 SHA512 744f99d36d54406239f59a13446655503d8f79f13c516073c1bccb6b792d06837775ed209b3216fe42b33ec3e3d15d8e3b48e7e9aaccbb00fd0ccdbf818e58f1
-EBUILD klickety-19.08.3.ebuild 935 BLAKE2B 0b98b95ab080f123cc052609bb33832053d955cd852b858b49f7af6e22ae5e28a2cfdafd1c95b06a1f255ac4cbe966d72209823a011c878780dcb86325cf3116 SHA512 e982983eb7a58b625c55e6c3211b6dc46c183041ca543f984503e4e481cb7e04a67bae94447eceba4b9bc83d5ad7928d1c8335ca7d8fb7d8bd3be3dc2a484b16
+DIST klickety-19.12.0.tar.xz 1390044 BLAKE2B c4b99a90b815fd1764f9aac513b76bcda348f92b9e8872b0c247fc9f8cb0854af558fa7135f3a3073a3f5b40cb8a57fb0b590ba022327109960f14982890a824 SHA512 b960bccfa75442dd2d604d343a77c5edf11d6371e52b78550de39b7b867be85d8fdde58f14cda36a9f92983b4be05e73dd68020386b3f78afa43e8035c792572
+EBUILD klickety-19.08.3.ebuild 932 BLAKE2B 2b556c679ac79b5ec709510161173e7565ce93f78a29f5991d57401e645f90f5fa7165d07c14aad34bb56ad1725eb872c2eb111bcaf7a378ac7fb568de4265fc SHA512 9b7a31ca944eb7ac044690ca55d143f29f2cf9a7dee3bf6be069692deb6500143b6bcca3006c88f6705811058ea8085ae2fbeae95841de6ad4d45cf1d1197a36
+EBUILD klickety-19.12.0.ebuild 1044 BLAKE2B fb99843426697110d75caa3750e55622353cb09b0208972b261cf5a726724331eebe4b76889697af2a0d45ddc705131a6b87d3246e1d4561958e945e73da3a7e SHA512 73097bfff282b7e97f47411e05aebad1e20b6afde88b170df5248d3b4d8223e15e976d815507096dfc41634f090630e2b06fef934c00583ee01ee6693b27bbef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-19.04.3.ebuild b/kde-apps/klickety/klickety-19.04.3.ebuild
deleted file mode 100644
index 021980d46af5..000000000000
--- a/kde-apps/klickety/klickety-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +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="An adaptation of the Clickomania game"
-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 kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klickety/klickety-19.08.3.ebuild b/kde-apps/klickety/klickety-19.08.3.ebuild
index 11c8d47aa4f3..c0caca97a136 100644
--- a/kde-apps/klickety/klickety-19.08.3.ebuild
+++ b/kde-apps/klickety/klickety-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="An adaptation of the Clickomania game"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-19.12.0.ebuild b/kde-apps/klickety/klickety-19.12.0.ebuild
new file mode 100644
index 000000000000..2bebb1771bed
--- /dev/null
+++ b/kde-apps/klickety/klickety-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# 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="An adaptation of the Clickomania game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.klickety
+https://games.kde.org/game.php?game=klickety"
+
+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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${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}"
+
+DOCS=()