gentoo resync : 18.11.2019

3 files changed, 41 insertions, 36 deletions

diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 6b30d914acbc..476bf85d0d2c 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,6 +1,6 @@
 AUX kpat-19.04.3-missing-header.patch 1371 BLAKE2B c557139aa81f5d5258a51de0fdceeac125c3649a658b1219fa2e311b5c3491f4c577d3c1aaa13f2d4cbb4cc6d122f26629e98bd79c15dccf22e1ad9bed293259 SHA512 9f52f0f0a079113e7911c877b8b716765abec188759faa4851ca7cbe8a0a3a47cf95d23d48726707e3c839b244809dc36716d9b04a40f18f0873fe684bfaf68c
 DIST kpat-19.04.3.tar.xz 3576096 BLAKE2B f086f7ac962171a9f2faf75f3a44ddf71a6c4ca42277178739596475f6333741b1de14bbbb27c7cb9b3076bf483d9717d041e7d7482f2ac9ca643e10993f58b9 SHA512 67ea63fc76fe95c10093a4d28575aa22c211312627323409f11c7973992f6afe009dc6d31433b42391f44f3f4930f0a6743d8beb59df1558697c2db5f8303eff
-DIST kpat-19.08.2.tar.xz 3577248 BLAKE2B 4bf2f59c41a4e9b4331136378ef3bc0ac7d45181ee5f43e20fc1fe959339ea2bb5ed67b3d9fbed6c42b3dd009769c276cdad49e460cfaab7c95bf3bfdf5ecc68 SHA512 4ac8068a5f8eb7385245a9accae9652eb8c0b1919f5b96995968f961288e36dcaff3762cfec3e5a307601e3df0b1d31942881d8d90869a8a930c678593b17107
+DIST kpat-19.08.3.tar.xz 3578320 BLAKE2B eae35ccd8694d99bcc08b51d9c2671b57b7a200777a10568e81ffa74f1c402cc06ce6bf3540d994542bb3856f991f47d23df1ff3e2a077a2c56d4590d0a9ab1b SHA512 894f97b86a852b5310734f90cffc68970816e4514390797e3a2c43ce102a9c624f2b52ad851e78f1c182f45bedecaf496da6b812e0bd6d7c5c60d79133e1d6a3
 EBUILD kpat-19.04.3.ebuild 909 BLAKE2B 79adad702ef3d4179e0ef026f9721bafc1843058d0f985b709d457c0f671006d71ce8690099f04fd9acd1862e5eb95125ad69184f3c442f2ed50a2364ca602ff SHA512 79cf34949f36b3487e0416766dc13e4a3793356d2d19f1ddda93fc1d9e6820bf6d7f50a9d4542ef1ed19a91d3496c1a9b77010697eee57b16916d4c485462922
-EBUILD kpat-19.08.2.ebuild 859 BLAKE2B 98847c8b817d02930a8b07f55b7b2c3b719bd18bf7dc822bae87360f42994bf41f1d57aed725c239e0b452d8a57317c2183298011a7a1dfc27068bd0a6a54028 SHA512 2a11f535aa08e26f4940abab00647b8143dd1615564035e17f1ebea88792dd389c8d879cf4c5ead84bae34fef3d8533d6afda99e2f699bcf28d55da1a143b26b
+EBUILD kpat-19.08.3.ebuild 1045 BLAKE2B da8673f073e5eed56ab9542f1162012396d40a680c92192fc200cb3cf693f17b0e2afd9a04b27cdfd37259b6f1f64afc156029fb43f9459897418c80a1b3e0b4 SHA512 e820614e56824e7df8da5f181da9e3db300ed087cbada0634ce9e2259e17964dbbf8d620a8d4016a4092e88dcae32ad314668caf9eff960969a5b56363aac7b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-19.08.2.ebuild b/kde-apps/kpat/kpat-19.08.2.ebuild
deleted file mode 100644
index c11a0502692d..000000000000
--- a/kde-apps/kpat/kpat-19.08.2.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="KDE patience game"
-HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(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)
-	dev-games/freecell-solver
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpat/kpat-19.08.3.ebuild b/kde-apps/kpat/kpat-19.08.3.ebuild
new file mode 100644
index 000000000000..ad66db73cfb1
--- /dev/null
+++ b/kde-apps/kpat/kpat-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE patience game"
+HOMEPAGE="https://games.kde.org/game.php?game=kpat"
+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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${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-games/freecell-solver
+"
+RDEPEND="${DEPEND}"