gentoo resync : 18.11.2019

5 files changed, 120 insertions, 31 deletions

diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 4758eb4f9d58..9bd6294fc8fb 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,7 @@
+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.04.3.tar.xz 280592 BLAKE2B 067f8393159c12446bde93c88bdcc4e1cde2ac4affff5d4c0ee5d95a9c96b009af8531bbb40e9c48622be0b5ead8f18b9129529e42bee483362acb6420baa6f0 SHA512 5b18ab96f5227f2900dbe5a5255f5e837bb34990661273327eeef53cdba7aed53cdf282f7287ea2fd0fd4849aa3009f96dc3d59bb23459bcf6477d3338ade74a
-DIST kollision-19.08.2.tar.xz 280732 BLAKE2B 3946acaf54ad6f13911812d628726cb21f731fbfb691178380e3b04c783a4570b934562c7b5b67adb5ead9e05a6f5b0f044ff5a90971a5da5fd55846e1c5416e SHA512 3f53ddda075ccc0afb41d2a85db7fd2192fb6c78703b11ea09969f77c8c860efa45a86aafb870d911fd5d5486af280fa235f9ba204f42539d2bbbe61d7dbe921
+DIST kollision-19.08.3.tar.xz 280844 BLAKE2B e9f2aa8de4d414676775427c1940390db6298b9bc0aab338f57d85513a20d4efe0cf02b0ff5c755010d68b53b5db36a8c74661da64990b8a9a2fbaea5a96fe05 SHA512 e19d14db64942cc0c1355ba465bc64c6721fc3e723c60ab1ef7b48525747ddebb43551772eaddc15dccdf991e8c11452686cb5590c22b66bf90ca088850e133f
 EBUILD kollision-19.04.3.ebuild 676 BLAKE2B 9cd1917f198443f48cb64e7ec931f228ebe60ee4f80fb3f4f7c6f0aea2c3a1b5a9b85d3406ed56d22394f027b04cd5e13ec25477600819dc0eedef8bf00965be SHA512 a5b6c31ee5d06c0a2db7006756c88c1dc941342a915bc374eb7e803e8c6a344042a3547549667f95ffa6bd9c86720334a727375a43fde569491c9eb8e52d01cd
-EBUILD kollision-19.08.2.ebuild 679 BLAKE2B f9d7ff84e6b10a880da47d3e018604b06050d7cfa8cf1ae307001427d3d95849a3a6d12a444284dca4adb6fdf6c78fcb65c1c3674e1d2bc0b75d81055d6dd736 SHA512 a9df202ebc4716181f5324162b66136ed6b0e7dc92a2a41d379b92a20f05c207169738273be8e221e66d687cabbb0a85855b6592081e6112dc1c1ce26633414b
+EBUILD kollision-19.08.3.ebuild 881 BLAKE2B 2abb98a539f43d322bacdc0a18645802373bbc289dafa034c4526e0b9af43d209512204e91f622cb4a61218a4a52a90e3047033d33bf51288e9a47b6ab5c0b7e SHA512 4e860047d1a32dd1b97d4fc02da8fc89f95af82e8390041177d8ca7b97c3c58d3747edfe6a19e5b7d76096a0f4b8e42d7df0403c47ce965b6bcb42463cba86e6
 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
new file mode 100644
index 000000000000..8995827a83ee
--- /dev/null
+++ b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,56 @@
+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
new file mode 100644
index 000000000000..d665345c7120
--- /dev/null
+++ b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+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.2.ebuild b/kde-apps/kollision/kollision-19.08.2.ebuild
deleted file mode 100644
index 8cd239d19fb8..000000000000
--- a/kde-apps/kollision/kollision-19.08.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/kollision-19.08.3.ebuild b/kde-apps/kollision/kollision-19.08.3.ebuild
new file mode 100644
index 000000000000..c36210ecc3ca
--- /dev/null
+++ b/kde-apps/kollision/kollision-19.08.3.ebuild
@@ -0,0 +1,36 @@
+# 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 )