gentoo resync : 15.12.2019

5 files changed, 45 insertions, 83 deletions

diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 476bf85d0d2c..17120c6628dd 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,6 +1,5 @@
-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.3.tar.xz 3578320 BLAKE2B eae35ccd8694d99bcc08b51d9c2671b57b7a200777a10568e81ffa74f1c402cc06ce6bf3540d994542bb3856f991f47d23df1ff3e2a077a2c56d4590d0a9ab1b SHA512 894f97b86a852b5310734f90cffc68970816e4514390797e3a2c43ce102a9c624f2b52ad851e78f1c182f45bedecaf496da6b812e0bd6d7c5c60d79133e1d6a3
-EBUILD kpat-19.04.3.ebuild 909 BLAKE2B 79adad702ef3d4179e0ef026f9721bafc1843058d0f985b709d457c0f671006d71ce8690099f04fd9acd1862e5eb95125ad69184f3c442f2ed50a2364ca602ff SHA512 79cf34949f36b3487e0416766dc13e4a3793356d2d19f1ddda93fc1d9e6820bf6d7f50a9d4542ef1ed19a91d3496c1a9b77010697eee57b16916d4c485462922
-EBUILD kpat-19.08.3.ebuild 1045 BLAKE2B da8673f073e5eed56ab9542f1162012396d40a680c92192fc200cb3cf693f17b0e2afd9a04b27cdfd37259b6f1f64afc156029fb43f9459897418c80a1b3e0b4 SHA512 e820614e56824e7df8da5f181da9e3db300ed087cbada0634ce9e2259e17964dbbf8d620a8d4016a4092e88dcae32ad314668caf9eff960969a5b56363aac7b0
+DIST kpat-19.12.0.tar.xz 3577680 BLAKE2B 443c9610670fb67fff257e64f50a7eaac1ca47a635e214fa91ef0a2025f624b2adabcd7308223def8a200e7fda4cf3a4eb20a635dfed56cc572afa913c81b7e4 SHA512 40a620ed2f3cdde626d816e2c6032d659a02a85a1e2229b0acf139a4842e38d55edb68f40d4a4880ddf7508c2ef744ba6545136d12d688755d1707711ac05e12
+EBUILD kpat-19.08.3.ebuild 1042 BLAKE2B 51f4240bc2dd1f24b6f434012835acb89af6aaf3d588003bf5474014c6f575ac7c6d7867061ebc158f615423279c1df811fa6a6cba771e2696f39b36a2d0b2f8 SHA512 b86324c5829b92e98d1bd9843c47d3d020fa12d63a0adbf700a18af72f5fb5224eab163c38ad2db38239fb2284eaadcfee5bed5b0f0f5f35a1bdd1e49b1893b9
+EBUILD kpat-19.12.0.ebuild 1094 BLAKE2B a6c751b14648fc6417edc45739a8628e28be5daf3a4300c4fe2b6dac41d83068e40635988a90093cd105068aed8fb1297794be71d7458531e8ebafe57c520afc SHA512 9aa6e4c3e0856f5013af1c5f94bde9829d221a5ad3f1aeef1b14c09665c345ad197c7ccaa1cd6d4c9745e7af6682358f7d90ebd548b1037495c720f2354d64e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch b/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
deleted file mode 100644
index be272b75f4ca..000000000000
--- a/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5b68765dcd431bca55582c4996adf73ed0ac0123 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 18 Jul 2019 23:28:57 +0200
-Subject: Add QMap include to fix build (with Qt 5.13)
-
-It looks it's no longer included transitively.
----
- mainwindow.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/mainwindow.h b/mainwindow.h
-index 0d6b2da..ca6ee0f 100644
---- a/mainwindow.h
-+++ b/mainwindow.h
-@@ -23,7 +23,7 @@
-  * -------------------------------------------------------------------------
-  *   This program is free software; you can redistribute it and/or
-  *   modify it under the terms of the GNU General Public License as
-- *   published by the Free Software Foundation; either version 2 of 
-+ *   published by the Free Software Foundation; either version 2 of
-  *   the License, or (at your option) any later version.
-  *
-  *   This program is distributed in the hope that it will be useful,
-@@ -53,6 +53,7 @@ class KRecentFilesAction;
- class KToggleAction;
- class QUrl;
- #include <KXmlGuiWindow>
-+#include <QMap>
- 
- class QLabel;
- 
-@@ -127,7 +128,7 @@ private:
-     QAction * m_upAction;
-     QAction * m_downAction;
-     QAction * m_cancelAction;
--    QAction * m_pickUpSetDownAction;    
-+    QAction * m_pickUpSetDownAction;
- 
-     KRecentFilesAction * m_recentFilesAction;
-     QAction * m_saveAction;
--- 
-cgit v1.1
diff --git a/kde-apps/kpat/kpat-19.04.3.ebuild b/kde-apps/kpat/kpat-19.04.3.ebuild
deleted file mode 100644
index fbe9f755a2f3..000000000000
--- a/kde-apps/kpat/kpat-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +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}"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
diff --git a/kde-apps/kpat/kpat-19.08.3.ebuild b/kde-apps/kpat/kpat-19.08.3.ebuild
index ad66db73cfb1..87777cdbc133 100644
--- a/kde-apps/kpat/kpat-19.08.3.ebuild
+++ b/kde-apps/kpat/kpat-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE patience game"
 HOMEPAGE="https://games.kde.org/game.php?game=kpat"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpat/kpat-19.12.0.ebuild b/kde-apps/kpat/kpat-19.12.0.ebuild
new file mode 100644
index 000000000000..f7c0bf9f16c0
--- /dev/null
+++ b/kde-apps/kpat/kpat-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="KDE patience game"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kpat
+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}"