gentoo resync : 18.11.2019

5 files changed, 149 insertions, 33 deletions

diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 9750ef099b84..c172ab56d30e 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,7 @@
+AUX lskat-19.08.3-qt-5.14-1.patch 2355 BLAKE2B 9860a29c79f0091c0c1fdba5827c2ca9739d9f59643adb1a7cdd6e3b1a888342cc1d7f986eebd1bacdeca3562c4f34d81db883ffb16fc14fd8b87efb7b3e588d SHA512 e7c95fdfe66bddd51bc6ee4f81d05375299384587ab60b6dd5db8bc1781d68c1d5581a01eb3897b44e07dea9fad44b16d9b8ec22950f00f8f6b07cbe4f55f628
+AUX lskat-19.08.3-qt-5.14-2.patch 876 BLAKE2B 07738b892fe135da261a1abff627c546e811ca167c652e662c791889410aa63780b9f172e9855feca1a7c74525047eff3ca9395ba014ce019a58872e3d08df90 SHA512 8ec5088d2a2e2343bfa92d3f7479387714fe2cb0133c9f5400d66cc8e892c7fe4922463a3c3689046423424d68c20b82c14d16d07287c8fd7c8e2abf82dc9d60
 DIST lskat-19.04.3.tar.xz 1217088 BLAKE2B 0782c0b93b590de065eec090d31cfb174cc64e9e8eaa4768570fe9a96a90531934c3849ccdf5206e4d18a0ca2139f550d8826785e8797bb3285c1f6c7a67ed17 SHA512 497729984c2efa01726b54db1c21d868a6f56d01226660b9fc8d4149b259d368596d28c0da88ff8e6056f7ec0bff33456541ce1e0f6bddfdb08d28de42e77ef6
-DIST lskat-19.08.2.tar.xz 1218832 BLAKE2B 68795f168492918061d344cd10d6386b43ffdb5eec724eec8c4ac777fee35138174a8afad18e75c067135f47cc4ac9dceee40606551b4bbb02b2baf55b012425 SHA512 cb83c64de6cb6988bdd9a0abe14aa88085bcc76f5932709fc74baf91d9f98a9189d29081d422db573c31f84333e9e05de65714311c418b5b218e90c8ed66995e
+DIST lskat-19.08.3.tar.xz 1219400 BLAKE2B fd7b2b196a8a7fb279f41c9a42f8e942c52420495babc592ac841056f5fa8a0097d0ee841d9de07595e9cc5ca0c8b474ab2047b29d0cbe379b98304f3280846a SHA512 460bc794627fe612fd2fb7a4949d8c74e4b6ca729db9ec7837a9f988ca1dccb192822814d5c4911cf890dc86ae3314903bbd82263a1a892811dc4fcd2501f6e0
 EBUILD lskat-19.04.3.ebuild 707 BLAKE2B 47b8f99e69e01902138cc74a49a29046a67759aebb6fcf0b21cfefa3820ea1f9fe07b15334152e735782521cc7782c1bbf4d401c7effa87a38ef79c49e42a37a SHA512 06d8ba5d66f2d3ec174888bea6955cf240281ee932b38ce837f40ac14f6b3801b59056f24b29e147a5d52282a379cb3f33d42fa60e3261ee5aafb3b20154ec59
-EBUILD lskat-19.08.2.ebuild 710 BLAKE2B b9ea8bbb8959335d093740774b50dde3e57c6384f147ce69442d4c13e9e1c1fc217ced6d66d103093ea2a6ffff9d636ecfabac3fb9526eefa1f595b4ecd0272b SHA512 2d35a3178f800a45d4a4c045850b0654c7c78e8eaed8b7aea44f0278b14a74dd81e536ba6e64916642f3675b235d161c9c8d0a7428b84d7db43dd1862ac38e52
+EBUILD lskat-19.08.3.ebuild 918 BLAKE2B 87aa70ca2bae615dfa0c17637b2cc221a63414b62ef8b13f08ab0a8e4067cd86a83b7a65e9c83ce0780025809d0d20bc6ffae918d10ba676423b6f7d18a5b6f9 SHA512 1ab469aa5b810b8d28f4451f181ec53c39c7c5e13dc60f40d69374ebb48c21b5f7c7adf96fd8cafd22e581c6f7e1467645c31f4ad1a28a45af19c513ff3df60f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..0e819d33161c
--- /dev/null
+++ b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,83 @@
+From d2eae3d524bf84b843eacdf45ecfc77908e12ad8 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:39:55 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ src/gameview.cpp | 10 +++++-----
+ src/gameview.h   |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/gameview.cpp b/src/gameview.cpp
+index 69c94a7..a9bbbac 100644
+--- a/src/gameview.cpp
++++ b/src/gameview.cpp
+@@ -26,7 +26,7 @@
+ // Qt includes
+ #include <QPoint>
+ #include <QTimer>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ // KDE includes
+ 
+@@ -95,7 +95,7 @@ GameView::~GameView()
+ void GameView::updateAndAdvance()
+ {
+     static int elapsed = -1;
+-    static QTime timer;
++    static QElapsedTimer timer;
+     if (elapsed < 0)
+     {
+         timer.start();
+@@ -118,7 +118,7 @@ void GameView::updateAndAdvance()
+ // Slot called by the framework when the window is resized.
+ void GameView::resizeEvent(QResizeEvent *e)
+ {
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     if (global_debug > 2) qCDebug(LSKAT_LOG) << "RESIZE EVENT " << e->size() << " oldSize="<< e->oldSize() << " at " << t.msecsTo(mTimeStart);
+     double diffW = double(e->oldSize().width() - e->size().width());
+@@ -182,7 +182,7 @@ void GameView::rescaleTheme()
+         return;
+     }
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+ 
+     if (global_debug > 2) qCDebug(LSKAT_LOG) << "Theme queue rescale start at " << t.msecsTo(mTimeStart);
+@@ -217,7 +217,7 @@ void GameView::mouseReleaseEvent(QMouseEvent *ev)
+ 
+ void GameView::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[])
+ {
+-    QTime time;
++    QElapsedTimer time;
+     time.start();
+     QGraphicsView::drawItems(painter, numItems, items, options);
+ 
+diff --git a/src/gameview.h b/src/gameview.h
+index 8c5c995..d2da977 100644
+--- a/src/gameview.h
++++ b/src/gameview.h
+@@ -31,7 +31,7 @@
+ #include <QPoint>
+ #include <QResizeEvent>
+ #include <QSize>
+-#include <QTime>
++#include <QElapsedTimer>
+ #include <QWidget>
+ 
+ // Forward declaration
+@@ -116,7 +116,7 @@ private:
+     // Active input offset
+     QPoint mInputOffset;
+     // Theme queue delay time [ms]
+-    QTime mTimeStart;
++    QElapsedTimer mTimeStart;
+     // Debug frame rate sprite
+     QGraphicsTextItem *mFrameSprite;
+     // Time between updates
+-- 
+cgit v1.1
diff --git a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..2e8c9454246f
--- /dev/null
+++ b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+From 7361a17fa8ffe607ad7f050062a5e4a1eda24f26 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:33:58 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ src/gameview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gameview.cpp b/src/gameview.cpp
+index a9bbbac..2ca126d 100644
+--- a/src/gameview.cpp
++++ b/src/gameview.cpp
+@@ -52,7 +52,7 @@ GameView::GameView(const QSize &size, int advancePeriod, QGraphicsScene *scene,
+     // Cache on
+     setCacheMode(QGraphicsView::CacheBackground);
+     setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState |
+                          QGraphicsView::DontAdjustForAntialiasing);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/lskat/lskat-19.08.2.ebuild b/kde-apps/lskat/lskat-19.08.2.ebuild
deleted file mode 100644
index eb135a61fed2..000000000000
--- a/kde-apps/lskat/lskat-19.08.2.ebuild
+++ /dev/null
@@ -1,31 +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="Skat game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/lskat/
-	https://games.kde.org/game.php?game=lskat
-"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/lskat/lskat-19.08.3.ebuild b/kde-apps/lskat/lskat-19.08.3.ebuild
new file mode 100644
index 000000000000..edb54ba5df73
--- /dev/null
+++ b/kde-apps/lskat/lskat-19.08.3.ebuild
@@ -0,0 +1,38 @@
+# 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="Skat game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${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
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )