gentoo resync : 15.12.2019

4 files changed, 39 insertions, 33 deletions

diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index b769369fb98c..96804dfbc87b 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
-DIST kfourinline-19.04.3.tar.xz 635864 BLAKE2B 8a066cc10c081552c37b5290a40e8f44e19e8af2fca95a657a6c11c2ec6c9dae97ac5efe5b033d416e13d86d0f21efde0211cfb7e599af2518cf9a4565be8430 SHA512 e08e11ad0e97bb88f2180fc72a02f73892614002dd0b2b1de307a4827850d0091cc82195b23d90ebf85579d40a934ce85172233a1bc3338b9511a40fe7ed5fd1
 DIST kfourinline-19.08.3.tar.xz 638368 BLAKE2B 14b43f85698df427adb536b2f0d6278cba6fe2701c87973dc4e20682211f5b3e51c09a18a104a1740d537d3604b5296ae28dea97d9bea79ccdd4a48350d4284b SHA512 c500ba027bc0e773f4ef35cce8d7c9124ef4cc7a9cdf942e236483f37215085e120634895fdf6e958934d69535497952cfb001f3331a6e90bbdd57f823c17ce7
-EBUILD kfourinline-19.04.3.ebuild 728 BLAKE2B bf0ebff8c213381abaa2101da549ec2539af14fc2c263e7f8227b9f8e6ac4ee97ebc204b9f91f4e2994738a4f3c2f0e142a7d19c187865d935dd36d769b32eda SHA512 9c4a7dda6e47b5d8185ea019f72781273980d9d17f2db7cf7446a840c7cdb9204f13702c31d6d5a81fb50d0388d03f0a8a8d83a2bf5e0d3e93b557de7c6190da
-EBUILD kfourinline-19.08.3.ebuild 893 BLAKE2B ed3e18ba7a0fea8c76fd3e0b2125c9b94bd9feaa01dc881072172a7e75aa8fdc3b0ba1e30a6d2da26f8e0bd1e2d54d8895fca405505648ee0a0dc8ee1e50ffed SHA512 38614e0e7bf358d9a82e0f883b549638ace09142a4bf245447f247a499e0dc6be4484941528d5d4e62174707f8f18fe158db66c93bcf3264cc0a983e50249d7a
+DIST kfourinline-19.12.0.tar.xz 638496 BLAKE2B 1e4dde38d3931771c583a09460e01fb1680326fa8e12797c5ac838457e12fdb4f1d421254b8b546f487ef65278015c7ba5369908b74cfd78962baee42929306e SHA512 af6a94828f1234e9b2df08b5030e53421a0a579388bba4438220cc3c45bf2f099a3b09ac0cf182f7c72c8784f9b483258b8a384a033ab929ce25b78b419e51fd
+EBUILD kfourinline-19.08.3.ebuild 890 BLAKE2B e3ba5efbfeee3821da3e3252c72d78070b5dfda7eb1c97ecdba89699bc374ee21398b8754495e44edc51fecb995de39836d7c22733ada158ad67b5a8ed8a4df9 SHA512 83a69b694b976340ec8c62ec63d111e15845d55d973844a523849b64786e0215d2c32d7d5e818e06a6ab681c39caeea82c3625cfdfa6b7152dce86b333859359
+EBUILD kfourinline-19.12.0.ebuild 901 BLAKE2B c230e6f87bc338d080235b6cd406167734c2c19a3db0414e99aa66dd843fa725bce795bb64e44c18138724ac9001a70a748f1bce43e91ef560a78d98e26acdb4 SHA512 611d63c7bc9a0f7ce188b6638b495b560d2c7b9a8f0f7a5a2f8ee58c49b6b4730661b4d90f02da464a9449695af85bb371129c2785299fed5667275b96e56dea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-19.04.3.ebuild b/kde-apps/kfourinline/kfourinline-19.04.3.ebuild
deleted file mode 100644
index 772c61acfa8c..000000000000
--- a/kde-apps/kfourinline/kfourinline-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="KDE four-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/kfourinline/
-https://games.kde.org/game.php?game=kfourinline"
-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 kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/kfourinline-19.08.3.ebuild b/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
index 3edfe3507716..471d0cf92dd7 100644
--- a/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/kfourinline/
 https://games.kde.org/game.php?game=kfourinline"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-19.12.0.ebuild b/kde-apps/kfourinline/kfourinline-19.12.0.ebuild
new file mode 100644
index 000000000000..14c49b3a8486
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE four-in-a-row game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kfourinline
+https://games.kde.org/game.php?game=kfourinline"
+
+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/kdnssd-${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/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"