gentoo resync : 15.12.2019

4 files changed, 40 insertions, 34 deletions

diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index dc539ac52001..68035b18f19f 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
-DIST granatier-19.04.3.tar.xz 1941860 BLAKE2B 988fbff5bd511869234f392b1f6a0efb4d0f8a86c0df7ab4e8700622c7616b202e11ac776cb96ef0f3ff3b8564b30054687c8ed696f14be737cb587fda1497c1 SHA512 cb1646c4492695c81210e53efe415391733a0626c9a60d499faf38ed165da345569905af1ae28f35447e328b9b732a362f005a35f46ab46532f869f6df12ad7d
 DIST granatier-19.08.3.tar.xz 1945196 BLAKE2B e9617eba2df293a944d1251aaa863762b1a160599800ac91678ea2121c8307d0db8dd17a5ba00d10b5e457de6023505207a1ccaff16266c8915ae0ceccb57e60 SHA512 8407d4e3a7c0f3858301227ac51e9c2d38e54e20b7cc2210ba6e3444e3da8420aa43256218bbc4311277909d32c7faf3a313dffe564bac0bd01dacb8f5c6a0e9
-EBUILD granatier-19.04.3.ebuild 733 BLAKE2B ea7dd365497ba904969a25a555290aee995f1425f089c4b6ba528ea4cc52bf5e889017c03f7d86534e7a79f3632ec09436336f3a1cb1aa1522c3564e49bea7ae SHA512 c0bb2547655109ff146c99ed2f40c984bf08e537511da6bf516cf800bbd20ccedf754936800be0ae64d178bf2df7d1b9e729c858a380710ba7d6a9944715c229
-EBUILD granatier-19.08.3.ebuild 910 BLAKE2B a347833eaa494d401a7bb572d2e48b2f12a929f509a51f6dacf4d1bf0363decd7881390c67b381022f5f787a3ee1cb24959b0810e2b75381d2e6c565539dd882 SHA512 2131f3526fd88d8646cd0e9f7d20af1735ec2e1ecdcec57484400616d1cde4331e898f311ac23fe75b034ec106b95841e110382cfc1d142b6c90d7aa994c8109
+DIST granatier-19.12.0.tar.xz 1943484 BLAKE2B 73e918856163feb72c200ea68b4051ba22910e1229973eeea0d7f392980f2711453c501400ce09f05c1a24de13f0f240c07d13f88fd43470a0051354d243a6df SHA512 2527c7145e4b753c01dd6327d8bb0ce4b174e37666f675fad9204c084d522535ab8a748d26e25e8617e4b4906f9acab1c08b9b8517dd3242efcef1ccf511a8ed
+EBUILD granatier-19.08.3.ebuild 907 BLAKE2B 83608a2752f5cdc6753ed0f6bcf50dfc01bc20a172095cfb5570dcb746aaa90183c22d0b0166ace05413770219e83b74f0b265fe85938570ddf20e83b465fbf6 SHA512 fa4d0d491be81413c08c30fb01af1bb23378e3b65b03199effd00d98077b5ce1706682659934a810b585667335486fadff60cb6d4012562035cb9da949c5b77f
+EBUILD granatier-19.12.0.ebuild 918 BLAKE2B 72f78e9aedc8dcbb846cc5d8d61e67ff6e11520e99177799ea211f844383d981441878a3ee822007538e6007b9f7fa4a3b419a2981b23d854d86bad62f767391 SHA512 7d0a18e0370d5b4691ab25c81122c38a292bfdd44353f8a631746c4647fd0d8ee420f8af431a3d5be7a449f54faa4a745914d079b00ac330f7861f45a5b7b5af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-19.04.3.ebuild b/kde-apps/granatier/granatier-19.04.3.ebuild
deleted file mode 100644
index 2b932c041951..000000000000
--- a/kde-apps/granatier/granatier-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +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 Bomberman game"
-HOMEPAGE="https://kde.org/applications/games/granatier/"
-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 knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-19.08.3.ebuild b/kde-apps/granatier/granatier-19.08.3.ebuild
index 1a40aa3e99ff..23e712580386 100644
--- a/kde-apps/granatier/granatier-19.08.3.ebuild
+++ b/kde-apps/granatier/granatier-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="https://kde.org/applications/games/granatier/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-19.12.0.ebuild b/kde-apps/granatier/granatier-19.12.0.ebuild
new file mode 100644
index 000000000000..d004ba837082
--- /dev/null
+++ b/kde-apps/granatier/granatier-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# 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 Bomberman game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.granatier"
+
+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/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/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"