gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 124 deletions

diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 4140eb79dd2d..0f0430c2d34b 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,7 +1,3 @@
-AUX katomic-19.08.3-qt-5.14-1.patch 1864 BLAKE2B 5ba599090cb8e63a3831f9529ebf556504413b3b9c7a095667c03cdc3d1e105cc87fa42d0a1a4ad69da58c7f315de18d20577c709b65ab633e6dce94fa874130 SHA512 518bb34a1707faf57f5919d05e738e26eecec1f8e74a633c2f966f2320c250b158ad0bd7c270677cd59abe3b5c43fd60e60eea6b9811cb66d3c12fff28b01306
-AUX katomic-19.08.3-qt-5.14-2.patch 983 BLAKE2B ee718aa69afab72ce2f70aa9155edbce5f77224f8d995daa5ea47ac26d24c7ac81fc68ee6e921998a7fb3a1fce793b79247fb5512d4d0e8abb7a285c1eba3a0a SHA512 288ef44bb2d8da8f412239f9ef996de2b00e35e12afa93830be7796249d2e8efe85802c25eed610f044ff8f409734bcc5b4c9d40b1b35429c03a5645ee5975bb
-DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
-DIST katomic-19.12.2.tar.xz 1423212 BLAKE2B 6b9ceaca417334624cc9eb0237ee1de7c2211bbfc301434dbcf02f81faa3290248b1af30bbf943aa4b533fc8d380126e72e4e0e15dee87315e33ff6252550ed2 SHA512 6ade67b594ef3444c4a936e51dae93c4d0d2828f52b8704eb51c0af4dab784b9820a575bc30c99caff94c8e55e8de2326dbb8d1ff62d4ee88da48b11e3ef78fc
-EBUILD katomic-19.08.3.ebuild 945 BLAKE2B 5372dec4f1c5a114db20af2c57199b5df0a0b2bd146138cd368afa7bb98c758c02bb72acff2df441894c26c2d9aec00e938e49caca130e3f6cea29f870d396c8 SHA512 cac8c1197629fbe115232efdbaea696eca3344cc2fe0b18a06e6ab87e63a284104fc03f0da5097122115d6ef3cab2b7944d8e16d7270af61cf78cf20d87c168b
-EBUILD katomic-19.12.2.ebuild 900 BLAKE2B 2ec716f9cbad892030ac30c5e1c565414fe0425c41c6e144417d6b18eb1b1424c7f656e2f641e571481f6d8c0d301474ea83738cd9cdfc161ff7ed57c85f3c4a SHA512 3562d3281d941dfbafb789d2543a3780c401b634d9b2205b0906a706d2ae2d4498f0f1228bd0bba9e762a092dace1f670199a3d81e5c35c466fcd6f28014cb1e
+DIST katomic-19.12.3.tar.xz 1423176 BLAKE2B a561565d20e89333d77cee1eda74f615c3a66a2cc2dc170fa3cd64015fddd825ac3d930ce2aa890079a3d4fe4c00fb83f822d58c057fc70ff8a61fdb61cef16f SHA512 32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411
+EBUILD katomic-19.12.3.ebuild 897 BLAKE2B 131ae9cf47801af23fea4a0d980bda0a0d2b5095bf8e5bbae35acefc52d9cc34e3e050c04414ec5ee978aa9d714e47c7ddaa2d20e93b96ef26e0fec76de837d6 SHA512 a72253ec33d54a8263cc645b8a36397fe8c258b497e112401bfb8bd91118168b2cd857f61bb5281089fa66cc90b4916db62d3d1ddb1d55066437e6bdc9017210
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
deleted file mode 100644
index 6dc49d2e100b..000000000000
--- a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8e1a20b26d60976afdc068f7203cf35147b94a85 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 19 Sep 2019 07:16:58 +0200
-Subject: Make it compile without deprecated method
-
----
- levelset.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/levelset.cpp b/levelset.cpp
-index 5e001c1..98e4b6d 100644
---- a/levelset.cpp
-+++ b/levelset.cpp
-@@ -176,13 +176,12 @@ const LevelData* LevelSet::levelData(int levelNum) const
- const LevelData* LevelSet::readLevel(int levelNum) const
- {
-     KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
--    QString key;
- 
-     QList<LevelData::Element> elements;
- 
-     for (int j = 0; j < FIELD_SIZE; j++)
-     {
--        key.sprintf("feld_%02d", j);
-+        const QString key = QString::asprintf("feld_%02d", j);
-         QString line = config.readEntry(key,QString());
- 
-         for (int i = 0; i < FIELD_SIZE; i++)
-@@ -227,14 +226,13 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
-     Molecule* mol = new Molecule();
-     KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
- 
--    QString key;
- 
-     atom current;
- 
-     int atom_index = 1;
-     QString value;
-     while (true) {
--        key.sprintf("atom_%c", int2atom(atom_index));
-+        const QString key = QString::asprintf("atom_%c", int2atom(atom_index));
-         value = config.readEntry(key,QString());
-         if (value.isEmpty())
-             break;
-@@ -259,7 +257,7 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
-     int max_i = -1;
-     for (int j = 0; j < MOLECULE_SIZE; j++) {
- 
--        key.sprintf("mole_%d", j);
-+        const QString key = QString::asprintf("mole_%d", j);
-         line = config.readEntry(key,QString());
- 
-         int max_non_null_i = -1;
--- 
-cgit v1.1
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
deleted file mode 100644
index 42bc21731226..000000000000
--- a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d8cf83cf8554914ea357920473ff4c722cf794bf Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 31 Oct 2019 13:30:42 +0100
-Subject: Make it compile against 5.15. This enum was unused
-
----
- gamewidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gamewidget.cpp b/gamewidget.cpp
-index d70213b..3639847 100644
---- a/gamewidget.cpp
-+++ b/gamewidget.cpp
-@@ -58,7 +58,7 @@ GameWidget::GameWidget ( const QString& levelSet, QWidget *parent )
-     // TODO uncomment DontSavePainterState optimization back after this bug in Qt 4.6 preview will be
-     // fixed (darktears promised it will get fixed in 4.6.0 release). Bug is about wrong coordinates
-     // for QPainter passed to QGS::drawForeground() function
--    m_view->setOptimizationFlags( QGraphicsView::DontClipPainter |
-+    m_view->setOptimizationFlags( 
-             //QGraphicsView::DontSavePainterState |
-             QGraphicsView::DontAdjustForAntialiasing );
- 
--- 
-cgit v1.1
diff --git a/kde-apps/katomic/katomic-19.08.3.ebuild b/kde-apps/katomic/katomic-19.08.3.ebuild
deleted file mode 100644
index e00914a2bb0a..000000000000
--- a/kde-apps/katomic/katomic-19.08.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-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/knewstuff-${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/katomic/katomic-19.12.2.ebuild b/kde-apps/katomic/katomic-19.12.3.ebuild
index 685d1b98ba15..f66d072455c5 100644
--- a/kde-apps/katomic/katomic-19.12.2.ebuild
+++ b/kde-apps/katomic/katomic-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/game.php?game=katomic"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="