gentoo resync : 15.12.2019

4 files changed, 42 insertions, 38 deletions

diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index f7c7ecc474e2..f74a0346814a 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
-DIST kolf-19.04.3.tar.xz 1031060 BLAKE2B 278011e121ebc44e8c50af4d00bf4184fb6872d323b619f14698c0f3f70d194fa3da7ba6185daab87ce3272bd8e42831c08c8379aa1a416bdc4bac2ea573ac77 SHA512 b8471ada423a2ec0ef1ccbf4d87adee1a91b7cce59b558587b43aaa47b91d8d57d159bda0d64cccc3119129f6f0a1bff1e3e03682678527502ed75bc8876c19b
 DIST kolf-19.08.3.tar.xz 1029800 BLAKE2B 693909f406e653aec6ebd78afcb30f69a604b93e54e3d88fdd36efe41be3d2c4d33602db3904b0c3ef8717957318317d2a89da299a4cd8b871540082d1d93a51 SHA512 0edc586c8232f0e02906f12331e2021aba2e7cf468a071394175350036b77cfd8d6cd54e2071860d25e796befec4f3a53b94fefb1fd66dcdf0a51d991f32c8bf
-EBUILD kolf-19.04.3.ebuild 833 BLAKE2B e9161e178253d93d3fb37f0a1986f948cf07996e9b1fab720789aa7bee0120b6fb7ac51cf3468bab68fafea1956a2abf3183d4ee9046221bddd20603edcfa00b SHA512 aac79bdf8e3eabbebea5ad6d2d265fc41bd95adc69dfe97c1b6229215114bf53d1f3343ecf134935f007998459ac3c41de35a83ab44dc4158968f320e357c55a
-EBUILD kolf-19.08.3.ebuild 1010 BLAKE2B bbe0b5384e845b84ed5425368aeb0151677316e0ccb74a19b1dfb84f486341d5ef58e65fc621511d165a0f2a47cae1be8fc93a1d09e94aa14414d8d5e611aec7 SHA512 fdd0fc42070d239287abd8f34aad48626939476c084416e5283299900278efb56f2f9d48160746dc73a6066d04581d13b5b48c69ae6d822f0d5c044142758130
+DIST kolf-19.12.0.tar.xz 1024888 BLAKE2B 3b25ddc11d5907c94d104cc01a59e2bb3a6d1132f2efe2871b30e1891ce73124f67461922c983f15a35344a6c9711867067e65da87d00df6c3e28e881628370a SHA512 7c289cddb7d9c9edbcf1ff9c73f098299a7115226210904985709dc0fb60e4c4c1505e7f6b5eea16d26bece350e1fbd72ac707049462ef148458ab6f792b376a
+EBUILD kolf-19.08.3.ebuild 1007 BLAKE2B eccdb8363dd1c7d70111139e45ca044b46b7d5fa6acc5f6b61a4452d0e0bdee1c773e07cef4b51f5ad3cae209919b7eee48cf6ff1056f603ae79bf359fafb0e8 SHA512 9f9cd07ce56a4fabd25c5ce4ad64c307d19903e80bd4b28aed331f3a2fec049e5a1984c37b4c793053cdfd8204ee7c05287ef4acce1655ae347b8978f14e75c1
+EBUILD kolf-19.12.0.ebuild 1014 BLAKE2B 29c8276ed682e581c7bb38fd4a7088dd5be552323f03bbf869e260cc25a31d1a60b1ced3230b91722fd8f25c8699975640738f41b8029626d277602b3bb56208 SHA512 fe0018c2977d527914bdfcece7b17290fcafb570fb2d366a03be863e98190c2edebefefddd34a3fe196db33ed487c87db10cce05973f5e26bc961556a092935a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-19.04.3.ebuild b/kde-apps/kolf/kolf-19.04.3.ebuild
deleted file mode 100644
index 4ea70e7733cd..000000000000
--- a/kde-apps/kolf/kolf-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +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="Minigolf game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/kolf/
-	https://games.kde.org/game.php?game=kolf
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(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 kjobwidgets)
-	$(add_frameworks_dep ktextwidgets)
-	$(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/kolf/kolf-19.08.3.ebuild b/kde-apps/kolf/kolf-19.08.3.ebuild
index 664b1b1905ce..ce40b002baf9 100644
--- a/kde-apps/kolf/kolf-19.08.3.ebuild
+++ b/kde-apps/kolf/kolf-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/kolf/kolf-19.12.0.ebuild b/kde-apps/kolf/kolf-19.12.0.ebuild
new file mode 100644
index 000000000000..314674e87a26
--- /dev/null
+++ b/kde-apps/kolf/kolf-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Minigolf game by KDE"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kolf
+https://games.kde.org/game.php?game=kolf"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${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}"