gentoo Easter resync : 12.04.2020

4 files changed, 6 insertions, 32 deletions

diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 3724700d4b23..fd4e88dd5b2a 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,6 +1,5 @@
-AUX kitemviews-5.64.0-qt-5.14.0.patch 606 BLAKE2B c25f20679dfa65b6ee90541f26993e9c27ce237ec18b15a5d256b837c7859e849ef50b17c3f00b9ba22f2ff3f220982fbdbb9fea1fef1890e88810a48adc271c SHA512 223151f25ca55103deed84bc8302d8c96c5b923b699527418a9af84548071f63b9d2ab642816509fa474650ed6807a3d3d082e1247bda9b3dac20c6e2a56075f
-DIST kitemviews-5.64.0.tar.xz 76364 BLAKE2B 0a7c4b9413bac3f77d20b3f039e3d492042744cd38c4f01d437953049e8a20903cba91f81a92c5ce6b0e3601c2282246f4c9788683e6589f00ca06a7bd1b5c5f SHA512 065fd2619e6e849ddc5559926a4e9a47b0b23ba233f74d0d778ac87dff82428eb1cd4527cf69efdfa27a89a4571a7b05d0ffe65c12c195222eeb2a557ecfc528
 DIST kitemviews-5.67.0.tar.xz 76300 BLAKE2B 314aa212a7ef5d5a5cc37a2f76abdf169b8b41d59c8d9dcaf47ab4f33fe522c2f78ba7d63dfa3ecadd25db02f11976a5a363f0ee51a81ab61fef7c842f4957fe SHA512 5b24be12829833393a58fe513d58356031ad73233db0792e278dc0440b467b7aebced4bd67e2ca41cf0ecdae53b24f5ad289be769fd371fc172c84b982ac3603
-EBUILD kitemviews-5.64.0.ebuild 580 BLAKE2B 8d763e3206859ab57afb853b7150821435925f6fa5055332a61e3d37bb41f9678097ad4d82f2d7f5baf6683e35787ff808d2cec6dec1018da49bbf2cdc51c0c7 SHA512 8a6571348a553c38cfd900f4f3534c5521561d07ca4f976e4d6026c8ab893dcac44941f52ee772aee51d172d22fb13e96b2dcdbdd7bd25a1b8200f94fb78d933
-EBUILD kitemviews-5.67.0.ebuild 542 BLAKE2B 10a00af5ffd3099814d2fb441d99168b4fc91b69ac9eed72f3febe13157d2b1d08ebf739a48efd6f08fc8831a458207205705ed4de86130420ec46551c1834e9 SHA512 fa1c6196f6e92602d935ed2c9334e4c7b8292425e67f8f248f12e95f44d71b7f0f85938f9651726beacc98355fc1847a3d224d6a47750158b00f4526ed65ae53
+DIST kitemviews-5.69.0.tar.xz 78708 BLAKE2B 1d216376577d59c7be72f5e796253b8bb9f698efa26ed1da9a6b13554a3e6276cc142e79a52be4ad2b8fffec89c7b41e65840fa6c1a340f6b415dfc29273f2f0 SHA512 8d116d83461980c7b813947b42ff0b679cb72338c34a2cd64211c41fd71e43fdc23d5f4bfe706441c330a2c1b2cd224f7f4795e8ac937bf803e8c0adeb9eca8b
+EBUILD kitemviews-5.67.0.ebuild 539 BLAKE2B c9dbf1129c057d8d309ac48f88e73bd920db52d427d46128315a99107882cd38623cb6d6467b877e8a53c23bef42b6adf52a09a5ae2e854a0e7e1476f2c4ae15 SHA512 9970c740bc43f52d384d20a39621e711cd7a1eea4fcc77176c79ad31433a3da0ca0a26a7e486fb36c2831f2a29c241497d28b88d23b092a727ba7144a22d0452
+EBUILD kitemviews-5.69.0.ebuild 542 BLAKE2B 10a00af5ffd3099814d2fb441d99168b4fc91b69ac9eed72f3febe13157d2b1d08ebf739a48efd6f08fc8831a458207205705ed4de86130420ec46551c1834e9 SHA512 fa1c6196f6e92602d935ed2c9334e4c7b8292425e67f8f248f12e95f44d71b7f0f85938f9651726beacc98355fc1847a3d224d6a47750158b00f4526ed65ae53
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch b/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch
deleted file mode 100644
index a714554ac00f..000000000000
--- a/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 69b9ac0575d905ded79ed013c6e2374d9ebeb841 Mon Sep 17 00:00:00 2001
-From: Roman Gilg <subdiff@gmail.com>
-Date: Fri, 22 Nov 2019 17:48:20 +0100
-Subject: Add missing include for Qt 5.14 build
-
----
- src/kwidgetitemdelegatepool_p.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kwidgetitemdelegatepool_p.h b/src/kwidgetitemdelegatepool_p.h
-index 206ee0e..9d0147b 100644
---- a/src/kwidgetitemdelegatepool_p.h
-+++ b/src/kwidgetitemdelegatepool_p.h
-@@ -24,6 +24,7 @@
- 
- #include <QHash>
- #include <QList>
-+#include <QPersistentModelIndex>
- 
- class QWidget;
- class QStyleOptionViewItem;
--- 
-cgit v1.1
diff --git a/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild
index 1544a75cd0c8..774be223d5d2 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.69.0.ebuild
index 61cdfe5533f9..1544a75cd0c8 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
@@ -22,5 +22,3 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" )