gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 65 deletions

diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index af1b64f6e611..cf234dfb1b20 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,6 +1,3 @@
-AUX kblocks-19.08.3-qt-5.14.patch 843 BLAKE2B 896d0f7007d2bcfa8879ab7cabe359ad84c19a9b4f8d7e2e8409d7f4b21f8dffbdaa88585e88278d54ba3922d6dfc291686f81e350468bed5301c08b11316c25 SHA512 16486f935b3a9118194885c3ad8e78582078c8f19adedb1838625b8cfc20d21fbaa86a64b4ed94c873a8f56b8ffafd7588cd5cda470b58016943561f87c13015
-DIST kblocks-19.08.3.tar.xz 1906952 BLAKE2B 2a6a5c2e774aa371a8c69202fc14bec96da8cf1fb4fd03cf2d295656eb0f05c9d8958e467b1063a91714d6c60a3e9133b94286171c5b177ed09a1c2116c41997 SHA512 e7ea3a5bf2f9b2220db2c6df0df7bf9736cd7a3be10dfbe6cb8189f14f3c21ebe8652568d342611e1d6f2754acc1e6ef3593a33acb7655d9836bfc7240a63a53
-DIST kblocks-19.12.2.tar.xz 1906060 BLAKE2B 0f7aa0519bd6fd4db5b8e6ad246e0031bbff0f96cd91e797da98a01d4f5656f5e0479fb9c452405c630ed3a2d80da594097e31954c238ea6c2bd1e09d82395dd SHA512 15507cee5781c9fdb64ad822e6c2c231fd06842215f2550651ed0243f9d2f049f45ad8c3b0caf78cedf42cce56ae1b9c85bcef7871439d79ae6192b36fd2215d
-EBUILD kblocks-19.08.3.ebuild 891 BLAKE2B 9ffa895d8a1c0390ec25153dc28e8f39dc38b64afc771146dfb729c219f05597aa3fe741fcf7dd9769e5dbb0bc25cd0e5fd36e443ba6178df460d4b4b9009369 SHA512 2e52cc568c8f71c1f7399eb1fa20960cb4a1346c8e7ed4ba861bdfa6ce2f58f02d61cadf0f980786ff66468775485169581cdcc7688a6d4382ab965c41599a1c
-EBUILD kblocks-19.12.2.ebuild 856 BLAKE2B e74b30008902f680ade2331a4a95af86245bedd4a8dceb3e4a596521efe1dc56682a0eaaf0073adc2b4d5250ec2d331d790769df2202ef5b0a7dba5c937f867a SHA512 92e42e43146c74e6e433e91b65875bfba948114e5e9627eb10d154b1b6c45b432a553c91f96dbe7d5dffa6e0bc573b7e505f89ed468fc5903e5b04e6834e5e5f
+DIST kblocks-19.12.3.tar.xz 1907128 BLAKE2B 1824422d671c3a6d8798ffbc910d15bbbf5690d277ab377e95ea34ce55503cd718f50fe4ad602033daf7bf4132bf97433b964167276aba571ef86031b2a810e1 SHA512 ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6
+EBUILD kblocks-19.12.3.ebuild 853 BLAKE2B 7297b10a9f6ed12cd7ac7f6ddc9fb6a3faf3ba3613b0664344d384971c92a5d4aa545c3e248c1cef07c6b68812ff170a773a22a6f30c05f2aa024fac8cd67155 SHA512 e9d32dcfa966e4bd6b0765282e1ff6ec35aa879aa8096958332426877cad5ab0b46927d5f9f22c91c7b5944af36d72ab3c5304ed15a44b0062dc61957a9848b8
 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
deleted file mode 100644
index b4c67d8a7e40..000000000000
--- a/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.3.ebuild b/kde-apps/kblocks/kblocks-19.08.3.ebuild
deleted file mode 100644
index 9c2b106d0b3c..000000000000
--- a/kde-apps/kblocks/kblocks-19.08.3.ebuild
+++ /dev/null
@@ -1,35 +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 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 )
diff --git a/kde-apps/kblocks/kblocks-19.12.2.ebuild b/kde-apps/kblocks/kblocks-19.12.3.ebuild
index a8fd6c80411d..c766cb03dfda 100644
--- a/kde-apps/kblocks/kblocks-19.12.2.ebuild
+++ b/kde-apps/kblocks/kblocks-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.kblocks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="