gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 152 deletions

diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index c17c2f4c08c5..5444799eb75c 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,7 +1,3 @@
-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.08.3.tar.xz 1219400 BLAKE2B fd7b2b196a8a7fb279f41c9a42f8e942c52420495babc592ac841056f5fa8a0097d0ee841d9de07595e9cc5ca0c8b474ab2047b29d0cbe379b98304f3280846a SHA512 460bc794627fe612fd2fb7a4949d8c74e4b6ca729db9ec7837a9f988ca1dccb192822814d5c4911cf890dc86ae3314903bbd82263a1a892811dc4fcd2501f6e0
-DIST lskat-19.12.2.tar.xz 1219188 BLAKE2B 62b4a73133fe017faec155a7eaf56bbf086100f3f0d756a0d7c7e3aa965aed7d190d01d2b296abc243cb04a24695bac5f098917f2493bbbd5be749fb9345f7a2 SHA512 ecc2f9f3ea61f8efc884c775f393a85c895980a6b1b69c1dc90b64e2569c81b6fbaebec091132756dcf40d4d6fdb343c84a0e6690489bc92d4526851e1b6719c
-EBUILD lskat-19.08.3.ebuild 915 BLAKE2B 182083c672114cc1acf2e2377480ad7218a5ed5e85fc00dcc66a69310f3c6bb81bf84eb27ffc98bac55b63eccd79f89125b1b6b10297af8cc031baa03fa4abd0 SHA512 f3aab70280accd2d5ffa519bdc41b5efc0a0250035aecf0b9430df16a8c67977a85130dc78daccd8ff3ae18d18b718bdd217a65c014601f73c4d7921b6a9eb32
-EBUILD lskat-19.12.2.ebuild 870 BLAKE2B e8cdc60bead78a8a3819eaa6f02fad5f42f9e38d43056e54df2b0e67d747ed1b4fb36c1758fc2b26176c1f60eaabff8f004bb7ae5b16e9d82ea89c0fbce835a0 SHA512 63e9e207b0879acef27e1edf541ba7f69e521572da202f4a0187f810f3283cdbfedb616a86b44232c74ed2ff08f2a76df5f3e9101e12c7994509021b7db7ac29
+DIST lskat-19.12.3.tar.xz 1218840 BLAKE2B 4e6a352123230dcbef67f85b519ad220c7723b215c9fce2b89938c2b4b0de00326ef427fb410de3432b1e288e9e5c5d5dcb38090320c4a443ca1c78098fdc736 SHA512 84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed
+EBUILD lskat-19.12.3.ebuild 867 BLAKE2B 9df24bc9fd9f718b8050af44c341e43435a2a44df71e3359cd86a88e060aebe03c09de955d47c680f5b4ae3a01f34386214ab9d012d22a2833ab0b909b7cf4b3 SHA512 0b47f4420384b644075b0ec114edeb4bca3e5aefd85070f7c553f1c4fbb834745bffdcbdcedb84a62b061bd932f8c3234244f654a30fa34f4c1dbf9b122069b0
 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
deleted file mode 100644
index 0e819d33161c..000000000000
--- a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index 2e8c9454246f..000000000000
--- a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.3.ebuild b/kde-apps/lskat/lskat-19.08.3.ebuild
deleted file mode 100644
index fdc464cdd68d..000000000000
--- a/kde-apps/lskat/lskat-19.08.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 )
diff --git a/kde-apps/lskat/lskat-19.12.2.ebuild b/kde-apps/lskat/lskat-19.12.3.ebuild
index fa5b50fd9d1f..600de7f13955 100644
--- a/kde-apps/lskat/lskat-19.12.2.ebuild
+++ b/kde-apps/lskat/lskat-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/game.php?game=lskat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="