gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 101 deletions

diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 79264fe3ba23..74189220e6d4 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,7 +1,3 @@
-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.08.3.tar.xz 4694440 BLAKE2B c5026fb0afbde5368cbc6efb658ab692e6e7d941bed40e10279f4027f335345838bc64d804cc2ac2c52b846380355ef069b817aaaa2b932cef7ea1fe227dc39b SHA512 68fd61fd0212a6605ac891b845b763f4fa9c1b6dae7906d67059d85d99fd7f3a4e30e2333e06dc7c1e4fb026f7ebab9d5cc951b5251e25381896cd52f9b7741d
-DIST kdiamond-19.12.2.tar.xz 4694440 BLAKE2B 5ad158a177aae9d7a4a29f1971d740d868c0034f0188d3da6c8fd0884d632e3ddec9991fea411e213466e8605201fb5a728771d9e52569e6a75283f27a458671 SHA512 561245b56e66a9824bd75e7c7cab5b758b10a0c59da68dcaa053d7d7d0f0addd47352cd8ed31fb55ed272d2ccb476d228bab2bb391dac594db9a4a2147a1be37
-EBUILD kdiamond-19.08.3.ebuild 1012 BLAKE2B 55735ce242777e827a64178ca807231636d0fd2e3b310faf052327f62fb7bfb1ec2c15831204f534c57fa65a1b9f5a0693c5d3c506908929380877357316d1ee SHA512 27a70e84ae0a6bea56e69cb7b3a4efad13a34185d213302b10654d874bc83f61925172bf9a9f0e28d5a900ef95c46d57d24f15816e514049722fb1db20bd01a9
-EBUILD kdiamond-19.12.2.ebuild 971 BLAKE2B f82e9a7686d1fd870d10fc778948703fb8b1b994e7882a5ba7e35fb93e7ec17a9283840b0510d5c2a53e8e67b7c5b05cfe384971ee43987d7210100455938d24 SHA512 98b3813ee253f693db1fbf70d02c797dc788513fb20902940a0e7d18ae763f511d28a4b5530b3e27efb734195a0398581c8b561f7ac3ab781c3e65ca91a02bd3
+DIST kdiamond-19.12.3.tar.xz 4693824 BLAKE2B 042f04eb16e3bb45fbf909fe1f683c26a5d06c20267393157ec21d0bd725e8d7c4a6ca0af14bde6ff2147f35618723b488297adc050a0d1dc90289be46eb3297 SHA512 7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268
+EBUILD kdiamond-19.12.3.ebuild 968 BLAKE2B 5871cc12d21cb815cdc7758c812c0a73ba52c6437342435c08da2ae3780a2debf2917a9edcb129357d09bdf28aa350ccffb99b1ba3761c8a5a8444b0a7e0dffb SHA512 8ef46ae3856cdea03f6ddc925a2bcdc3d82d4026db6df92d66a1ee390712eb596561c5336610145a3e4171669fa7b2677c7b4525d0fbdcc443a4b345e891e061
 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
deleted file mode 100644
index e0ea1ef57877..000000000000
--- a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 9002776d0d08..000000000000
--- a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.3.ebuild b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
deleted file mode 100644
index 2c59f5de0778..000000000000
--- a/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
+++ /dev/null
@@ -1,37 +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="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 )
diff --git a/kde-apps/kdiamond/kdiamond-19.12.2.ebuild b/kde-apps/kdiamond/kdiamond-19.12.3.ebuild
index f502a97a98a6..248f941fda6e 100644
--- a/kde-apps/kdiamond/kdiamond-19.12.2.ebuild
+++ b/kde-apps/kdiamond/kdiamond-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/game.php?game=kdiamond"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="