gentoo resync : 15.12.2019

4 files changed, 48 insertions, 44 deletions

diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 6f3e5b2025b4..2f29cb6f4e13 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
-DIST ksirk-19.04.3.tar.xz 6992524 BLAKE2B 2f0640da9dcc48e0b5b803282a63a2cbf0a1339f010f99f3a7a5f80c5a2ddb1eab8b499601d8a9c4867b5c05d64fc2e76cab1afcd2ae01430488ccff8d920bff SHA512 6cd6da1172ea0d89ebf3ff5bd86d6d4228ee8f43bf8c7577d748be1a1fb47d555bbfdb842647a00a4e57ee7e6c262d83e861b084644b2345a5929984ffc7c3b9
 DIST ksirk-19.08.3.tar.xz 6996284 BLAKE2B 4cd50f208df7ccc6bc1ba5ae0ad45b16df2c1533ec1197aca6fe67979b2dca87474809658bf228356bfea4efc3e97125c3f347105cdaff77c55cbe1e276df275 SHA512 4285cd28d8353d60d64fa6a9abc75f7a580e3b600b947be49d768a3d3f9613eaf5655479f1ee5c2bc8139e6efb3dbbbf878a2ef349b017e76a76a2a6c30b9ef8
-EBUILD ksirk-19.04.3.ebuild 969 BLAKE2B 8c21bf543f08116a551940d519e46a7f1ebe778ac07fe17092c704244c4de2e8d5cf6362bf474e8f417d38717897ddaf960c8e98541837bb79163971b2b5cd80 SHA512 50f80fdb8b4f3725ff122c90dc7a44d12220d03b0a8de01aada00b6c9d26a981fa6f5507d2f088f72ead728c4cde45aac2cfd4e844dc5489304fd8a9962c2ae9
-EBUILD ksirk-19.08.3.ebuild 1170 BLAKE2B 21ee7a20e53d9a6e45fbe84f74c1d4e7bd7d21f108a8fe5f135ce604f4c30cc234d4eea74a74b39850cfa63d512cca1594008e365b9eed360b6b1acc48dc6711 SHA512 d2831f5722eeebb262433b90c9ece8ac47335396e11f48e57c54e047ac59181e732d8ee60593571c3c13e1c2e8031d0464041f5c55b7826f0341f1ea2f840c0b
+DIST ksirk-19.12.0.tar.xz 6997032 BLAKE2B 630322e376080525c3752a7afed23c44b2091a3d81312317aa5b431bfd3a233f0cbcceb125bb632a3e8f3a70d3e33d555141f51a6647c906e3c81d0375d69195 SHA512 1d11c1199c00a35221b5367881a8fcc06f6f8ee64ede47cdae3ada76d9ad9f55d9f42c81c9838cef17d4b6d8d9eaa31593a9409b892b75fd0b4491b3ddfc2337
+EBUILD ksirk-19.08.3.ebuild 1167 BLAKE2B 13d7cac8db91ebdb5cbd067147b2e746e0d745696d1073d101255eb372ea149cb9f7c117f2ff4213aa99fc71eb2f983230b35ba13841416edbe3d35904ab249a SHA512 ddd83c910790d0c3d82ca38db16e2ed804c8e6a18318b01327a1f69e89da21ed478b2126f6929c142f1c2490e4fa66420508dc1a30e6575a6280fed8d3be0ddd
+EBUILD ksirk-19.12.0.ebuild 1174 BLAKE2B ae495d8004b6a36134cf5a68155400a629be5ab66c226d2f1aae9dead24de13e4c7f77ce783474dfa9ba79994b33acbbd45e5c123e956cd39edbbccfa37f1c9c SHA512 cfed3e17710547f2694704c5caef40df014eac85a85e5ec801fc747cfecc1b124130a2a80cb0d45f18c3838cd66871befdfd1627e8e081af8494fc3dbf2a3b8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-19.04.3.ebuild b/kde-apps/ksirk/ksirk-19.04.3.ebuild
deleted file mode 100644
index 47e3a9d98198..000000000000
--- a/kde-apps/ksirk/ksirk-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +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="Port of the board game risk"
-HOMEPAGE="
-	https://kde.org/applications/games/ksirk/
-	https://games.kde.org/game.php?game=ksirk
-"
-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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/ksirk-19.08.3.ebuild b/kde-apps/ksirk/ksirk-19.08.3.ebuild
index a59f875c14e3..2d3d85ccad8b 100644
--- a/kde-apps/ksirk/ksirk-19.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-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/ksirk/ksirk-19.12.0.ebuild b/kde-apps/ksirk/ksirk-19.12.0.ebuild
new file mode 100644
index 000000000000..a01536bc141d
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-19.12.0.ebuild
@@ -0,0 +1,44 @@
+# 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="Port of the board game risk"
+HOMEPAGE="https://kde.org/applications/games/org.kde.ksirk
+https://games.kde.org/game.php?game=ksirk"
+
+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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	app-crypt/qca:2[qt5(+)]
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"