gentoo resync : 15.12.2019

5 files changed, 45 insertions, 66 deletions

diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 76dfff2604ac..d164a1ed39d7 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,6 +1,5 @@
-AUX palapeli-19.04.3-missing-header.patch 614 BLAKE2B 8b1866cc21544d74c2b189bdd03506577d3a39e2f8ec2ebe51c0c2646f61a7b80f1570aa6ad8e898501a5de44c5d578a15c075e673db2ebd05e4a6c9b0c8b026 SHA512 05fcff5bf4691640d2d9e99c9b8ea5f43e2322673163e167ddd5b3562d9db698ef8f617761bf475aa0741011b65a09b73c8d25b4473bc08f50594eb9c10b72a9
-DIST palapeli-19.04.3.tar.xz 2068716 BLAKE2B f0765e43e4e0490a8166f2c3296977faa7032c7354c2ef1be231a4156af0606cb58fd3c62544edb61f730c8be3f895042e3a658280357ba9c68c9637fc90d96a SHA512 cbf5b6f3a963980795adacb8c1da7c32bc285142a2d4f92d9f0cb34cd69b3c5f9c4d2f51c1f43ef14a088dd86462c86db0676d627bac12182f7d562544554d22
 DIST palapeli-19.08.3.tar.xz 2069352 BLAKE2B 0ba42e64f3d76f84b826e6da4a9d219b47f52d6241da7b999e0d207078756a30dfaef1775816272a78fdc709ad0659bfe570e53af0cb39e765a1bf5d7debcc4b SHA512 1e263e10a3d6d1dfbc2a0951297cbcc381cd789d5c806ec4ad57db4feef9a9e6a525e61991d03d554a02154652cbfe485a135da72822d03d35579de171c91ee0
-EBUILD palapeli-19.04.3.ebuild 926 BLAKE2B 7ae76ed8557588d412365a6ed200db80ff8318e658c37ff7ea2c58d6360798d187927c1517b0c0890169e8f966cf92d4b36e0c5cbedde219cebf26cdad5b9e87 SHA512 f3a222bd6b5eec6f4b27bb3d60cf911f8ecaccbc884d10f9f784bcbd5d0a74a87a848cfc149efb93ae32e1f0c5e9ba43990fab05f4cf65d21e4dec3a82023810
-EBUILD palapeli-19.08.3.ebuild 1074 BLAKE2B 0e03965ab65be745433b37b25ea3eaefe55987cf70adc79c3c5e0b0437838335e89d94f15d2d9bfabbad073e2ca2416cb0a7de6d5524858406f43b6b3009b711 SHA512 99a17745294fa72b8737445d821c8afdee8fcda8c431f3b7613ded10fa9d4fa86c4ba427806c4c8e43ed195f292f064f4317c8455eaa7e2c3515e62c3c0f6c11
+DIST palapeli-19.12.0.tar.xz 2069068 BLAKE2B e05ad0824d59f2d9f784c6238e0f38fa1822125d167309877da71402116244fed07183235fe3f3501e3df1e035c6be3d47106044707f395622e55d7bba880371 SHA512 af4aa35dbd5a1917ba1a135388944fc31eb423c6b69a3ce6040f5b2641cf02c1951b5d7e6026fd12f8f965ee840c3e05ceea05245779a73050b607096fe2152d
+EBUILD palapeli-19.08.3.ebuild 1071 BLAKE2B 08f685c532336e0867bb8b348ce63035bf052403a41b0a8680606dc04213d763e69a4ac5bb7086f6c58ca137e21a8d87a6b5dd0faeb752610d6ed00fd38c25b6 SHA512 49777482d2d68667bdab5c22990ed07b437fe3a9237a25f6e65ff18c1a66e1125a1cc98c7c7ef2e65e6e56d36bfc19589d4cb08e87f3c0dc5f2f53fa55874c73
+EBUILD palapeli-19.12.0.ebuild 1082 BLAKE2B 0073565801ddc85016cade530a67d3b14d0fe2febccdb4311788afa4a6b12edf87fb3ec8fde9a078002fe93ae8192a3752c5ddf2af97b41974e41fec1911567c SHA512 33e9f369bfc3bfb675e26fe84d2f2382523f69e959ccbb6d6a30ac9b8489c3a0f3ea855d416901805f02ee64bd56a1281d12136bbab56454fe2b9d900d360ede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch b/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch
deleted file mode 100644
index 23f9b0d73283..000000000000
--- a/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 017a6325de82f3872b36ddb35052e1845fb97ff8 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Fri, 19 Jul 2019 07:31:17 +0200
-Subject: Include QMap header explicitly
-
-Seems no longer included transitively in Qt 5.13.
----
- src/engine/gameplay.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/engine/gameplay.h b/src/engine/gameplay.h
-index a759f8f..af18373 100644
---- a/src/engine/gameplay.h
-+++ b/src/engine/gameplay.h
-@@ -26,6 +26,7 @@ class QStackedWidget;
- 
- #include "../window/mainwindow.h"
- 
-+#include <QMap>
- #include <QTime>	// IDW test.
- 
- namespace Palapeli
--- 
-cgit v1.1
diff --git a/kde-apps/palapeli/palapeli-19.04.3.ebuild b/kde-apps/palapeli/palapeli-19.04.3.ebuild
deleted file mode 100644
index a96a015e4b0d..000000000000
--- a/kde-apps/palapeli/palapeli-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="optional"
-inherit kde5
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/palapeli/palapeli-19.08.3.ebuild b/kde-apps/palapeli/palapeli-19.08.3.ebuild
index 12b132f3c33b..3dbd3898c0c2 100644
--- a/kde-apps/palapeli/palapeli-19.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Jigsaw puzzle game by KDE"
 HOMEPAGE="https://kde.org/applications/games/palapeli/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-19.12.0.ebuild b/kde-apps/palapeli/palapeli-19.12.0.ebuild
new file mode 100644
index 000000000000..4121c6917f74
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-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="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://kde.org/applications/games/org.kde.palapeli"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=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/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${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
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"