gentoo resync : 18.11.2019

5 files changed, 98 insertions, 32 deletions

diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 7072b6257dea..8c7871178242 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,7 @@
+AUX kdiamond-19.08.3-qt-5.14-1.patch 1202 BLAKE2B 68f49cd83d8b5a10621e4f39c41dd07650c826592d89c934d811e49115d5c52ab9b18a4c59ce140c8c10ece68df3f9b22b96501f38eb8f09dfbfd32f2cfe783b SHA512 65c5909419b30fbd38f676c0db31be527a4a43bb2a087f929e9d7c972d149ba9a9611c72661d6478c368308569cc2c7f70dde1f0604e33e4d9744e065e0e859a
+AUX kdiamond-19.08.3-qt-5.14-2.patch 787 BLAKE2B e39a46a097e40381cdf8bdc1035e2bdbf0b8910b247b0c4f69886073ea4da8b81743e8a9c7725191fa0c500b5c497468c808a3b4acd2c8c13348b14d40539eb5 SHA512 4d2c625eab936b09f5e93b392521eb4e93a6d2c0396a270ba41861b9729d3b96fee4bde356ec842cd49ecc2a2e0481e99b2060f660fe4e177d0d3c57ce37959f
 DIST kdiamond-19.04.3.tar.xz 4720096 BLAKE2B 82918744f40ac9688263b4d326c51af90586fcf1732a35c43fa7942893a602813f510687c06cc73624de577f6294be8454f481be814d2985151c5bf56ee9dcc5 SHA512 04888283d7efeff81e9b5354fd8b1ee64e66100a36d247182781a40c74b73c3ce485c54f2e3d840297d5863a37eb2b8e849316b8acfbda6447608ebdc86f5c87
-DIST kdiamond-19.08.2.tar.xz 4694124 BLAKE2B 7037fcf7cdb43dbb217326066b30aa47ffd23125f36d00578076d84d7a62a2ef63e65c792a30f25690dc4913f414ee54cf76a7f7e5519287f93484c95a5670b2 SHA512 3626805431c7acf3a00ed0d3a8c1d3e6f0cf7fe5cd4712235e916d06697a61e1433e97deea5a6eb96411ce08df660cbf008a22fe98c2e0489c9f28c2f9755f76
+DIST kdiamond-19.08.3.tar.xz 4694440 BLAKE2B c5026fb0afbde5368cbc6efb658ab692e6e7d941bed40e10279f4027f335345838bc64d804cc2ac2c52b846380355ef069b817aaaa2b932cef7ea1fe227dc39b SHA512 68fd61fd0212a6605ac891b845b763f4fa9c1b6dae7906d67059d85d99fd7f3a4e30e2333e06dc7c1e4fb026f7ebab9d5cc951b5251e25381896cd52f9b7741d
 EBUILD kdiamond-19.04.3.ebuild 792 BLAKE2B 924f6a703f485642675f1f3942c64d5e2e2a3cef485c959f6753e37c808ac7603b5086a44af1ed2e1aa1e126dc8d997f191cc2d1c1f807f8e2539d20e9db894e SHA512 5c2866f5850bfdb7a6b555ae3af3c0e7787ba1755e6119be0df7c357539c179c8df94a87acf813199b8e6c7038c2bfd9e29164a21b73d950c7ac215894e205fa
-EBUILD kdiamond-19.08.2.ebuild 795 BLAKE2B 90b72a902e12eb5734e4df99d2940fed21f30238588ea3fe62dfd4ec38d7fdd530dc06ee37f78c04e1530b260dce6ea0676eeb7f243f1ca5d31eb19acf9aaad2 SHA512 e470a517bd513011463a6cc6174814a44e77f8ca9db08b67520d484187dc49483267244b1c27551eedfd4b43e594f7170c502ef188cbe83be75021babdbebafe
+EBUILD kdiamond-19.08.3.ebuild 1015 BLAKE2B 72792b8e3e0df505ca5de86791e419da18984d3cca3b6c4802072f44157d9f6e9674542901f104be24f4b737ab09bba182a6bdd6e3e10fd270d77750e82fb49b SHA512 7c79fa738356c29c491e92539fcbc6e7c0714c1848b98d77554bc1be56eeecbb850eff5724b0991b9cd6fc8794f3d3ddd34f015db05a62f9809ccd5cee0fea9d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..e0ea1ef57877
--- /dev/null
+++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,24 @@
+From df737a7dd5134ba021dc6228fe815974af4a6bfc Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 8 Sep 2019 21:15:26 +0200
+Subject: GIT_SILENT: QLatin1Literal->QLatin1String
+
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 6afdc2a..5f9f431 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -46,7 +46,7 @@ int main(int argc, char **argv)
+ 
+     qsrand(time(nullptr));
+     KLocalizedString::setApplicationDomain("kdiamond");
+-    KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1Literal(version), i18n(description),
++    KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1String(version), i18n(description),
+                      KAboutLicense::GPL, i18n("(C) 2008-2010 Stefan Majewsky and others"), QStringLiteral("http://games.kde.org/kdiamond"));
+     about.addAuthor(i18n("Stefan Majewsky"), i18n("Original author and current maintainer"), QStringLiteral("majewsky@gmx.net"));
+     about.addAuthor(i18n("Paul Bunbury"), i18n("Gameplay refinement"), QStringLiteral("happysmileman@googlemail.com"));
+-- 
+cgit v1.1
diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..9002776d0d08
--- /dev/null
+++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,33 @@
+From fe17299b2757d3c0106fbfff325440de0830048f Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:39:44 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ src/game-state.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/game-state.cpp b/src/game-state.cpp
+index c0c35d5..b2c2416 100644
+--- a/src/game-state.cpp
++++ b/src/game-state.cpp
+@@ -19,7 +19,7 @@
+ #include "game-state.h"
+ #include "settings.h"
+ 
+-#include <QTime>
++#include <QElapsedTimer>
+ #include <KLocalizedString>
+ #include <KNotification>
+ 
+@@ -32,7 +32,7 @@ public:
+     GameStatePrivate();
+     ~GameStatePrivate();
+ 
+-    QTime m_gameTime, m_pauseTime;
++    QElapsedTimer m_gameTime, m_pauseTime;
+ 
+     Mode m_mode;
+     State m_state;
+-- 
+cgit v1.1
diff --git a/kde-apps/kdiamond/kdiamond-19.08.2.ebuild b/kde-apps/kdiamond/kdiamond-19.08.2.ebuild
deleted file mode 100644
index f07ab4af5ac9..000000000000
--- a/kde-apps/kdiamond/kdiamond-19.08.2.ebuild
+++ /dev/null
@@ -1,30 +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="Single player three-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/kdiamond/
-https://games.kde.org/game.php?game=kdiamond"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(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/kdiamond/kdiamond-19.08.3.ebuild b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
new file mode 100644
index 000000000000..3ec0152cbb2f
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
@@ -0,0 +1,37 @@
+# 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="Single player three-in-a-row game"
+HOMEPAGE="https://kde.org/applications/games/kdiamond/
+https://games.kde.org/game.php?game=kdiamond"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${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 )