gentoo resync : 15.12.2019

4 files changed, 40 insertions, 36 deletions

diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index bdb6a35ee0f5..9b3e7bf9510d 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
-DIST konquest-19.04.3.tar.xz 658488 BLAKE2B c41ef9195efca35535aab14963cb8da05f41d40a23d4962754896a2a12f4b39812dcb14524963a214abc30e2058e9464325f5098a568ca12cb0046177a0e46d1 SHA512 7a8c0ca2c723e7175dcb1e19c6666e8e219ed96a6ca585cdd8951c375ae28b7aadc19f4527dc1a09faf65786b8661096b05de2b81e1878a4142f1ac0bb0cf8ad
 DIST konquest-19.08.3.tar.xz 659172 BLAKE2B c6a3b5fdacce8a22e820ab8aa922b8130792d4c91b3eb1c9ec0115fcdaefc29c04c0c6a44682e3939f20fe6239be8f01868c8d51c3d18ac516250f27f6fb0968 SHA512 d3537ca9395425bcc342884db76fe4db4208b4201dceee67c2203a9dbf3ea45c11826e5bbdb86533292b8c2c1aed8877bfec1a26cc0790be144a7399280cf837
-EBUILD konquest-19.04.3.ebuild 758 BLAKE2B c67e46535589f2d0aace9f6259c1acc177e8404a748fa47d85a8d67e7db9c819b7f37bbad254eea210ed4daa71532cd35c52cee6a07ba6499bd9bf1a28e60337 SHA512 8471bdc031fd7bc49db5d524e86ed5d223a617107860db95af32b96c3d088c48bac1ab76996288381976701bc92fd0c7c0e72584839ec4e37c6fc56fc1d5e37f
-EBUILD konquest-19.08.3.ebuild 923 BLAKE2B c5c899e38428aecdfaeb92b0f641894bfaa762c7c0c972e0831962bb614067783bb486d64000a9ff72df52421100d1ed6c94ee33e8269c4ac542ab5b4274870f SHA512 8303ebab96a6bf1ede73f071e3a06edd80644dd87b8b04092b4d1b7115160ad85107f71d61e4b15c823df67ca542c856217c5022da9bebcbdcc6fbf75d1ebdd9
+DIST konquest-19.12.0.tar.xz 659640 BLAKE2B b59f3c63480077d5853076e93690fa4668d00f99baa3a6596d72c295e4b0235275dc8e465ccef4594ce10b6213829e62f7228de4980b8350a2873a12ff28f835 SHA512 921fb6040c2173d2f6f0aac5fcdf2d03993ea836838c17de3302cbe2acc511e3e5b831f3af1fb9e82aea11d12eea9582aa4220be82e37ca13a8e0ad81144e010
+EBUILD konquest-19.08.3.ebuild 920 BLAKE2B 14e75bf7f2bc5aa886f086e7740681d77e3b428d47826b06c86c568558298c30fc9edee01d147c857e1744ebd747c38c2e19c002ccce4d8f78591d4b403e84b2 SHA512 fef88eed39b4dae8920af97b74437a81d1fffe61ef91d128ca30223357882f79a9c54688c3c236cc8f57eaec2e4f92b55bea6b4e513e621f042e77c5711c0abc
+EBUILD konquest-19.12.0.ebuild 927 BLAKE2B 8b1a554f23389393b1119b309c2c0bd487975cccda3ee9a3fa660f01493bc98e8c0ce1647a62287c9e985ce94e114bbac808e4f5230975121b38ded679240a3e SHA512 4d2190a1589a820beb2a75fd5f8affbc26f9c957ce17467a2b431701d2078a8dfdef2e3c3c6c14f14131c880e141f50de1ee8063992fe90839c74d7fc99324d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-19.04.3.ebuild b/kde-apps/konquest/konquest-19.04.3.ebuild
deleted file mode 100644
index 9eb2063a9723..000000000000
--- a/kde-apps/konquest/konquest-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +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="Galactic Strategy KDE Game"
-HOMEPAGE="
-	https://kde.org/applications/games/konquest/
-	https://games.kde.org/game.php?game=konquest
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konquest/konquest-19.08.3.ebuild b/kde-apps/konquest/konquest-19.08.3.ebuild
index 4abd1959a783..a62c268dbc9f 100644
--- a/kde-apps/konquest/konquest-19.08.3.ebuild
+++ b/kde-apps/konquest/konquest-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/konquest/konquest-19.12.0.ebuild b/kde-apps/konquest/konquest-19.12.0.ebuild
new file mode 100644
index 000000000000..f991efc7b649
--- /dev/null
+++ b/kde-apps/konquest/konquest-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"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.konquest
+https://games.kde.org/game.php?game=konquest"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"