gentoo resync : 18.11.2019

4 files changed, 68 insertions, 36 deletions

diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 1ba72689c058..6bd45593485b 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,6 @@
+AUX kigo-19.08.3-qt-5.14.patch 956 BLAKE2B 79374b30f282e17933cbb7969c9ca4a4f4cde3ac402f7097f628ea1d98af9ebf0bb78fc928036c520e57620773a7098cff02b66319c1464646292fef6164596b SHA512 e79b6359b462045fa517778c57b6ac9b0637ab5cee8b39b27ac8e3a9c0dcca022b5bbf99eb49c89c9acaace96593ec65f93f564056bb31aa3ca87c9ccfc2e3ca
 DIST kigo-19.04.3.tar.xz 5224900 BLAKE2B 9a80d31147a8e49f47428a84fbd54a718eb0570eeda9aea3159ca2852289b7f6c84939b8e3fbd41253cacb54a45a90bcf640d857a56f4b8af8ec89e9ab215418 SHA512 fd18e7e0a2f8962d4a0474fe63306281c807eb38b886f59a7d1146f18fb52fc0fee5dfa3f1bef5aa67f7974d699ff4b0b0ce77aabab78b060337cad274e9015b
-DIST kigo-19.08.2.tar.xz 5227088 BLAKE2B 11cebdc9ea1bcb7735cf4dd25e32cdc67028d702e82e452488d837f0815024cd107baa8a00d133a40b86d65492150c82f55c2a416be5b775d397f2e312cade00 SHA512 dd7eab7f721646e6324637c19ef504491a34fbda110195c96e5bb7f2c6e357628d695b208d00527abc7d32889e2b84233ff1f586dc657b2dd6c522735c442051
+DIST kigo-19.08.3.tar.xz 5227988 BLAKE2B 3cf39c9347c4f83fa810a3e06c6c4d593d233980e7b05dd8222f642673ba90597d124de65007fbbcb243be996a1a36d3b03e3549cb9758605a631b2943f0a7f7 SHA512 7b4eb14923668bbd886686ba3c17daf2a8118cc6988049780dc6e33649282734f2c58798f9e97ca8b9dde97d36d54790bdd5a1c75452adef726343c061d9e46b
 EBUILD kigo-19.04.3.ebuild 821 BLAKE2B 4be4786b182d0d86e63e9c343945c9400b613cc2a632ad917001db0513dbbc346868735ac15e7db51c66793b0df0d48b5ca7fc5d693efefd9b57d59374d09d0e SHA512 81ea424f5d6161e60ccfbe0e2a7d16a97775565ab66b3a8134343cac95efad9c89dc98d8cbf24b38831c0b16e76933b527b271a5c82c781cfe5507ea432b628b
-EBUILD kigo-19.08.2.ebuild 824 BLAKE2B 862fc7add72c0e3946ed83b0fd0d77fa94e8f00ffbf2b70712ff18e45605412e42d88ce5bcf6e963762ec5b2c60b2b02fdb43847f93dd10cf83904f30ed417b5 SHA512 c4f517e00fa3837a3e153f970205328f44c86ef11789797332c6575eef4a22fc56f6ccc6f12afe5450e92079f2bb0728b1fe3344d815c5bc97c93cad40061bdb
+EBUILD kigo-19.08.3.ebuild 1056 BLAKE2B 1e462a9b87eaa1a8e0a44ab3c4ba12be02382b2b1f02461cd7ce60d2f2b94a3cd89486fcac9665b697e84686b5f398a8bfce90a22d72cbc03f1c62d9c99740ab SHA512 8cf44ab565e83cc27bb404f949748a1774d20e91ef7e4d65572a3e9db654a9ed40cf591dc8a2a49eeac765f2d86650ff562eb5474b8b1987274e4e569f700224
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch b/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..04c0df875583
--- /dev/null
+++ b/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 56480c9c752722f6eaf9fd0fe6798a473a09d978 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:33:33 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ src/gui/graphicsview/gameview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/graphicsview/gameview.cpp b/src/gui/graphicsview/gameview.cpp
+index 603ff70..12ef2bf 100644
+--- a/src/gui/graphicsview/gameview.cpp
++++ b/src/gui/graphicsview/gameview.cpp
+@@ -33,7 +33,7 @@ GameView::GameView(GameScene *scene, QWidget *parent)
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setFrameStyle(QFrame::NoFrame);
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState |
+                          QGraphicsView::DontAdjustForAntialiasing);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kigo/kigo-19.08.2.ebuild b/kde-apps/kigo/kigo-19.08.2.ebuild
deleted file mode 100644
index 40bf0ba84448..000000000000
--- a/kde-apps/kigo/kigo-19.08.2.ebuild
+++ /dev/null
@@ -1,34 +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="Go game by KDE"
-HOMEPAGE="https://kde.org/applications/games/kigo/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(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}
-	games-board/gnugo
-"
diff --git a/kde-apps/kigo/kigo-19.08.3.ebuild b/kde-apps/kigo/kigo-19.08.3.ebuild
new file mode 100644
index 000000000000..60e69956fc68
--- /dev/null
+++ b/kde-apps/kigo/kigo-19.08.3.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="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://kde.org/applications/games/kigo/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${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}
+	games-board/gnugo
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )