gentoo resync : 15.12.2019

4 files changed, 45 insertions, 41 deletions

diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 5a1685d07657..21f104aafd61 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
-DIST knavalbattle-19.04.3.tar.xz 1281700 BLAKE2B 0f1fbc17977ceebdf791fba0a5d05bdae09623bb225532e445397d444904f3ef3e8b889fca58c02d32af0f3be01f847482b65eca2176696f3dd84e0d5061af92 SHA512 fbc6559c602982b218c555bdbd621975fbfd9867e3f3d19792c49dcf7ee4979a066436fa2eebf248b2105072747b199ce7128dfd78c45b06c82626cdd6c9d2aa
 DIST knavalbattle-19.08.3.tar.xz 1281260 BLAKE2B b446600aa8799d5198a2a0399349762fe71259ba08d86e705796ff2b589b0f88ea44bcc991bd6747307246b00ce93eb455052061ddb91a38faea4252205e7065 SHA512 e4e80f729698a9c0ddf6d71dbab9318f25e7b6b70f768b11a7738c21a89de62f08b36f42e226a86a54ff1df7d8c16ac8f946bfef96e4b8d6b00707648c971e7d
-EBUILD knavalbattle-19.04.3.ebuild 879 BLAKE2B c3c85d48ff7ef77940bbd8c053dc6bf1a5c6aee2ce245f6dd96b410eef91090d4ee379fde0e79fb4838d365cdb71e9f50a3861e90b71765600299e88457443bc SHA512 1127c7ebd69ea141ef85119202f6c3157f20498f1492225b97442a4b79d8fa1d689d2c36cd93e75ed1638bbe55ba59f0fe71257be9c6bd960e0a35613efc93dc
-EBUILD knavalbattle-19.08.3.ebuild 1062 BLAKE2B d79dd4de7c2ab7b51684834d433519dd19b3bda9f27179f81b0f7e06c206ad6e2af9e3c23a0a7e626e4cadfa5a94c375daa12511f8a19b756b7d1f3fc42a4cfb SHA512 2c597ebdc515a58fed9155c3e30790d4f13984ecb453c9e92d678f294f8405092904cf26dbf35964c3d69813e58720df42158b87e178778c9a9e95d5cc5aafdd
+DIST knavalbattle-19.12.0.tar.xz 1281504 BLAKE2B a0df775fd659d3376018a69b2932c0eb45637e0318e2a7c813b1ad53c7a27ce6b26d0275546b480c02a8e34139d4a1bec244578fb952d2e2cc97e0f7740602d9 SHA512 639a459776b2cb79abf50f15ad27b9b9cb34f8e96c325faf2e6679a0b2a1a57707b0ff2c2767878abfec376b0b9456fe79a85feeb66263293dfbe43fc20ef98c
+EBUILD knavalbattle-19.08.3.ebuild 1059 BLAKE2B 6879f59ce53dcf460b408712ed6e5b99ba5c2c957cd119cce6e3a063f8374b43cff4f3ad3be835a60bc03a92589e6519b67c9d349c6e59f2eaeb28d466dc39f8 SHA512 f2d2baedac10ed79695c6809e500c63a8cc7233fb9d3c7f9bc6ddb23051da9807863de0a47950974f3a13d3482b2f1a37480359af2cad3c3bfd8bce53bef18f3
+EBUILD knavalbattle-19.12.0.ebuild 1059 BLAKE2B d35e84113127a6611f885874743a5707a8c274764ea5b0752995a85a51b91227d376794af4cede8203315de6f4384087eac1daac205b3ba8b8fcf925fb9c7441 SHA512 1eacab7c3075aa9dfadc8f35c0ffa6bc7f838f506b41ab034c14a4757c0055d8326368dc691e570f449da5a106e5b1d31d617b63c62c31369219ba34d04cc654
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild
deleted file mode 100644
index 1e710881fc0c..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +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="Battleship clone by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/org.kde.knavalbattle
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild
index 0c8364dc70dd..d805233e010e 100644
--- a/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-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/knavalbattle/knavalbattle-19.12.0.ebuild b/kde-apps/knavalbattle/knavalbattle-19.12.0.ebuild
new file mode 100644
index 000000000000..4ad447c52349
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# 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="Battleship clone by KDE"
+HOMEPAGE="https://kde.org/applications/games/org.kde.knavalbattle
+https://games.kde.org/game.php?game=kbattleship"
+
+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/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${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/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )