gentoo resync : 18.11.2019

4 files changed, 62 insertions, 30 deletions

diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 7c4bab51e35a..3f18924d9d52 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,6 @@
+AUX kblocks-19.08.3-qt-5.14.patch 843 BLAKE2B 896d0f7007d2bcfa8879ab7cabe359ad84c19a9b4f8d7e2e8409d7f4b21f8dffbdaa88585e88278d54ba3922d6dfc291686f81e350468bed5301c08b11316c25 SHA512 16486f935b3a9118194885c3ad8e78582078c8f19adedb1838625b8cfc20d21fbaa86a64b4ed94c873a8f56b8ffafd7588cd5cda470b58016943561f87c13015
 DIST kblocks-19.04.3.tar.xz 1920560 BLAKE2B edf6f563d8a2057d713d420375ec0bb981f13dae196e04f7d03ec2fffa740833d904eef234a3be667da06bbd959532e007902cc3e41dbd21ba611d4a86387275 SHA512 6b8e904cb9ad0b4ef30e3272f8c9d75f34e6377130a31adfd384f43b7a651994a375a4fd7db9d7159025edd45fbc705c181056cebff287d68877269840a6b180
-DIST kblocks-19.08.2.tar.xz 1908852 BLAKE2B d0c2d1aed3978466b9d312cdf2b9520702b019f8bc572627ba18592c14a69fbc020e5a47e4ddb9e505f327a1f0cd02985b7e96bb4657f9b0b4050fc0e9120340 SHA512 369d447665908bbdf47e7363d47312cd916bfcd89cb0354be6c15e9a749632d229bce3d8084a2b497cc7dcdd49e4b35cc313a3c8dabd82d93a994e43612e4cf2
+DIST kblocks-19.08.3.tar.xz 1906952 BLAKE2B 2a6a5c2e774aa371a8c69202fc14bec96da8cf1fb4fd03cf2d295656eb0f05c9d8958e467b1063a91714d6c60a3e9133b94286171c5b177ed09a1c2116c41997 SHA512 e7ea3a5bf2f9b2220db2c6df0df7bf9736cd7a3be10dfbe6cb8189f14f3c21ebe8652568d342611e1d6f2754acc1e6ef3593a33acb7655d9836bfc7240a63a53
 EBUILD kblocks-19.04.3.ebuild 683 BLAKE2B c4f9270dd638dc39f2fbe6692fb0a84e18864cbd6693b438c34933ddb2aa17a3699dbe584ea353de1b1026fa68edc3756fc06784e77948ba46304cf39ccfdbd6 SHA512 fb8c730be0c2849d0978606fe5bb20e266841ade6be6c5e662d9257b0fb6b61b05194e5648ff7d85f289c688118423a248352653b8ab34ac4d901821ca5d9586
-EBUILD kblocks-19.08.2.ebuild 686 BLAKE2B e6eb7da9aa9d0c98377be5ea1ec57f32e47ee424f5fe25c7f3a60b942910c81417160d515095f524b568829c035c0d46faa0d4d910c2f03286ec720347cc839a SHA512 e51622f874dcd3c9fb1bc1619e8d5c9738752d64ebf2158d0753a2a7db6e94db645a9739765f6ee1562d07af4446ca33343dbb91b5b10536124615889e5edbc2
+EBUILD kblocks-19.08.3.ebuild 894 BLAKE2B cca3d4871ab128402383fc4204cfa104c54952deba06bc9af661ae00470467f784fdbaf87dad3a5dc2e1cc281aba0ff0db9a1ab7687d14837d85a2e2bfa674a8 SHA512 ef5fc232fc4a562c50b63e0e1a62aa3731db2f373eda43038e218c7de4453ef66d254708267e9662a190e9dd46324dfbf5bc2d759364655899b584765e31d9fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch b/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..b4c67d8a7e40
--- /dev/null
+++ b/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 2f2d2f28fae9fb779fb5f8ae139c6ca28ccc83d0 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:34:23 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ KBlocksView.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/KBlocksView.cpp b/KBlocksView.cpp
+index a16d672..2ad0686 100644
+--- a/KBlocksView.cpp
++++ b/KBlocksView.cpp
+@@ -21,7 +21,7 @@ KBlocksView::KBlocksView(KBlocksScene *scene, QWidget *parent): QGraphicsView(sc
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setFrameStyle(QFrame::NoFrame);
+ 
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState /*|
+                           QGraphicsView::DontAdjustForAntialiasing*/);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kblocks/kblocks-19.08.2.ebuild b/kde-apps/kblocks/kblocks-19.08.2.ebuild
deleted file mode 100644
index 6ffa35e36306..000000000000
--- a/kde-apps/kblocks/kblocks-19.08.2.ebuild
+++ /dev/null
@@ -1,28 +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 Tetris-like KDE game"
-HOMEPAGE="https://kde.org/applications/games/kblocks/"
-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 ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/kblocks-19.08.3.ebuild b/kde-apps/kblocks/kblocks-19.08.3.ebuild
new file mode 100644
index 000000000000..495a2a812802
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-19.08.3.ebuild
@@ -0,0 +1,35 @@
+# 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 Tetris-like KDE game"
+HOMEPAGE="https://kde.org/applications/games/kblocks/"
+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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )