gentoo resync : 18.11.2019

5 files changed, 121 insertions, 33 deletions

diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index a43a72eeaf7b..6bbbbc965fae 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,7 @@
+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.04.3.tar.xz 1422248 BLAKE2B afdda00fcb810e4c45ee855e5b1c7731f0f506fc2c9f81563799e21cd7f26678508655f3afc6075f0a3a39137399902bf79133bac6e7cd829754e3128b642ade SHA512 7a65cca9f49004d594b58aa911d46dd8e749da30e1f014804e89d62e95f669584c21064cb902cc1a6e7511c70467216b51f5142fc7f4dcafadb935d2c663e48d
-DIST katomic-19.08.2.tar.xz 1422816 BLAKE2B b6565b13150edfaf50c10494f9573a44ef08c83b458b3970139c1a499c6d54d8f7e9f015eeffa2924b8a87a8c9a2388695fa151879c1e85b3d57132ce42db6a1 SHA512 75b4c1d2a3ca709c639d2cb1aad61ef145c6fbc00141c26ad0ddd3db4dd7d9a07b705b9875b5b84e8c95b28cbad62b7fbcd304abe07bfdc22af82d15f9251fdd
+DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
 EBUILD katomic-19.04.3.ebuild 737 BLAKE2B c5291f36dd283f966aca18347576117a335b1c93ea603b0a88a9b25483ae3972b92b270670f9bb58973b9988119dfdf2a70150b17d264fc72425cbd6b65672e1 SHA512 815bf9103ab2b6d34cdc2e7c96d15f49877466d239155b31b00e4c798e019e1a1f10f9b30be2b5c343c350f52223d7f48f7dbdc985b70412421c7813d0e3cc66
-EBUILD katomic-19.08.2.ebuild 740 BLAKE2B ed50f7f1dd7614f805bd70a5342f204d94f52f486bc93006348f8328176fac0496d187a50b28ae3690669cb079ae2774a83846cb216be98281966cb382351830 SHA512 95ba4db18e2cb2bf99010b09434599cf3080f65b596be1d933c6f1f96a744585c27dd8b0119e2cdac44350c98e605b906ab62f22575e372883774999fbbbd56c
+EBUILD katomic-19.08.3.ebuild 948 BLAKE2B a560ff56ca273715db613e0c16ee500157187704f3c9d08dff7fc407b4f5b537c58ce503510cb1df0cfd61e5fefc0c109215659d25d58c35ab523e851c67e8ed SHA512 6a2a8045c050ca10f2bbc00924da2f63f5326f77467ab055e89da472390dc0813e4d9bc2ed06f398b45edfb221f867f587d69348d09c972ecda87362a0daa6f6
 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
new file mode 100644
index 000000000000..6dc49d2e100b
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 000000000000..42bc21731226
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+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.2.ebuild b/kde-apps/katomic/katomic-19.08.2.ebuild
deleted file mode 100644
index dfef31246f87..000000000000
--- a/kde-apps/katomic/katomic-19.08.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-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 knewstuff)
-	$(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/katomic/katomic-19.08.3.ebuild b/kde-apps/katomic/katomic-19.08.3.ebuild
new file mode 100644
index 000000000000..1038eacef7a2
--- /dev/null
+++ b/kde-apps/katomic/katomic-19.08.3.ebuild
@@ -0,0 +1,38 @@
+# 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 )