gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 123 deletions

diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 27a6c70acc83..87e17cdb7d42 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,7 +1,3 @@
-AUX kollision-19.08.3-qt-5.14-1.patch 1197 BLAKE2B df4416d7c3462abde47b8b5ec4669ac69ae9965b8e267d4320775410df8a3090a3e9f28256ef6852ce9e76eda6498ce9dcdef455764e491e13d569cca1a95bf1 SHA512 a10ce0f97cb9658f13233aa32e19e47902ac90a74511c182263fe2ea0ee5c0e90e5061d9a9b8f23589ed6f501e7d927fd549f4eb011dbed2c992d18934883665
-AUX kollision-19.08.3-qt-5.14-2.patch 872 BLAKE2B ed7d8965cad72a262a6031b0925334864c05dc317dccfe8d158148be7c001375f4a3777e9e235297049ec15bff3243e7ceb77fd1a39aa9e588f2a8e0786a8eb5 SHA512 74b2849bc2f639457369bd7b56ab6db7f8a89d13be985eff54e8993308fb0a61d42a7eeaeb3c140d29c77b800e0b05bc1afba34e96bf4ddc4f14a0950bb35a8b
-DIST kollision-19.08.3.tar.xz 280844 BLAKE2B e9f2aa8de4d414676775427c1940390db6298b9bc0aab338f57d85513a20d4efe0cf02b0ff5c755010d68b53b5db36a8c74661da64990b8a9a2fbaea5a96fe05 SHA512 e19d14db64942cc0c1355ba465bc64c6721fc3e723c60ab1ef7b48525747ddebb43551772eaddc15dccdf991e8c11452686cb5590c22b66bf90ca088850e133f
-DIST kollision-19.12.2.tar.xz 280804 BLAKE2B 938651dd8faa65c723c094a048e80dd092215143abd56ca407de0044b234a2feb8cea299c66657ac6bd2a292176ca623a025b1c8d718ed904de225336fd2c1cd SHA512 fb8fe5a8135d39ad2a25344880dbf207404dbbc1d706ba1216984e11bed8cd4f1c47b3ba3bfabca119dad7e7c57432484d1c1ba4da4e13ce4960f53316730f86
-EBUILD kollision-19.08.3.ebuild 878 BLAKE2B 5ad93bee0a746a36093e96d705d51d79b0ba14c3c0836118074154a2ed0207dd6ab9f19a272ec9586a56a79e692e4b6f8964ce76d8842b79018449d6cba7342d SHA512 1e6ff73ab77480b1fd2ad70b2d186edb7ff4cd45b155ceee7596372de150c5c1f6a2a3e764a6dcf79ac1d2c0487175a3f62e3e8e01ace30ec69f44bf1ea9a364
-EBUILD kollision-19.12.2.ebuild 833 BLAKE2B 7dd90c1e22f07621a51bb767c048e2ca93f13612f1cf7a7e32a3412bb7874b7b6ac44a20cdc80d0e79fb6e54e7645b274e565efdd7040f3eea1a7d5d37df1c77 SHA512 7f9b90be93e64e0c06a5dc5eb5e46c0ff8b565c0089eecdcc8a01d19589d0a9611f09d94e098e51804f84344f07e63b838d7e7cca9f48dde40140a08e6669ae6
+DIST kollision-19.12.3.tar.xz 280964 BLAKE2B 5f74c6c4f845981f30848c9efb9f714134dbe4a7fd34900b732d3d7c91b34751af2731188732fab9f836fc3c4997245ad73adcdefbd97962527f17590eec14f4 SHA512 ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141
+EBUILD kollision-19.12.3.ebuild 830 BLAKE2B b54b262a839575d244e1a420e9f6f07a642d3a5fdab4ec6d98100bd7890257be3e8b2cdaaa5081f5241957524f4a10be0cc4d13e383576a6575ed4e0b5970253 SHA512 5618a855e6bdc5487e4658a78fbeaf4651ad3930dd97db8a9f3432c705d8daf80826671b9b3386a348c1b5d112a1f86a3415138c81d6bb38aea3a366ebb8eff1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch
deleted file mode 100644
index 8995827a83ee..000000000000
--- a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 77958df9caf1c12ff92380ea4ea382572c2e8447 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 17 Sep 2019 13:39:36 +0200
-Subject: Make it compiles against qt5.14
-
----
- animator.h | 4 ++--
- mainarea.h | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/animator.h b/animator.h
-index 3fc944e..5a501f4 100644
---- a/animator.h
-+++ b/animator.h
-@@ -12,7 +12,7 @@
- 
- #include "animation.h"
- #include <QTimer>
--#include <QTime>
-+#include <QElapsedTimer>
- 
- class Animator : public AnimationGroup
- {
-@@ -27,7 +27,7 @@ public slots:
-     void tick();
- private:
-     QTimer m_timer;
--    QTime m_time;
-+    QElapsedTimer m_time;
- };
- 
- #endif // ANIMATOR_H
-diff --git a/mainarea.h b/mainarea.h
-index 782ad21..2a6bae1 100644
---- a/mainarea.h
-+++ b/mainarea.h
-@@ -11,7 +11,7 @@
- #ifndef MAINAREA_H
- #define MAINAREA_H
- 
--#include <QTimer>
-+#include <QElapsedTimer>
- #include <QTime>
- #include <QList>
- #include <QGraphicsScene>
-@@ -35,7 +35,7 @@ private:
-     QTimer m_timer;
-     int m_lastTime;
-     int m_lastGameTime;
--    QTime m_time;
-+    QElapsedTimer m_time;
- 
-     /// time interval between two balls being added
-     int m_ball_timeout;
--- 
-cgit v1.1
diff --git a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch
deleted file mode 100644
index d665345c7120..000000000000
--- a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 09de155160c41b2746623a3e4b338da7d79f553a Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Wed, 30 Oct 2019 13:33:41 +0100
-Subject: Make it compile against qt5.15, This enum is unused
-
----
- mainwindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mainwindow.cpp b/mainwindow.cpp
-index 7ac41c8..ad453fe 100644
---- a/mainwindow.cpp
-+++ b/mainwindow.cpp
-@@ -29,7 +29,7 @@ MainWindow::MainWindow()
- {
-     m_main = new MainArea();
-     QGraphicsView* view = new QGraphicsView(m_main, this);
--    view->setOptimizationFlags( QGraphicsView::DontClipPainter |
-+    view->setOptimizationFlags( 
-                                 QGraphicsView::DontSavePainterState |
-                                 QGraphicsView::DontAdjustForAntialiasing );
- //    view->setViewportUpdateMode( QGraphicsView::FullViewportUpdate );
--- 
-cgit v1.1
diff --git a/kde-apps/kollision/kollision-19.08.3.ebuild b/kde-apps/kollision/kollision-19.08.3.ebuild
deleted file mode 100644
index fdab34849958..000000000000
--- a/kde-apps/kollision/kollision-19.08.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
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-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/kdbusaddons-${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/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
diff --git a/kde-apps/kollision/kollision-19.12.2.ebuild b/kde-apps/kollision/kollision-19.12.3.ebuild
index 0d2f62ed5a5c..9d9f17924d19 100644
--- a/kde-apps/kollision/kollision-19.12.2.ebuild
+++ b/kde-apps/kollision/kollision-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/game.php?game=kollision"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="