4 files changed, 11 insertions, 101 deletions
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 893f2195abc5..76730573f3af 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,6 +1,5 @@
-AUX kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch 2896 BLAKE2B 0e19645ee2543003f1e6d6f68461695451e37986abc3f68fc518c69622fed24232461f2cf8ddbae6f84e3112619482f340e0e0addc863448ad3d65f8810cede3 SHA512 3e33aca5dddbdefee8d048d1413955eeaf93137192ddabb21f933c7971ad919beaa3ebc6dc00c11fa47cac19de9a552ce097f2cf308796c2ade7b2329a4984aa
-DIST kwidgetsaddons-5.54.0.tar.xz 2187048 BLAKE2B fba80432f00154ed4811d70b693d13d3dfee5c5dcebd3a3c8b3403ed5119e0289f10efdb8579be302ae2c2b6bb17853f20ac4c337fe78dbe042ee2cace00f8a4 SHA512 e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8
 DIST kwidgetsaddons-5.57.0.tar.xz 2188204 BLAKE2B f429b6a13a656cb4b847609dcf2f190d2069355a09515593072b71cb628346eab2803daff6571a2906223c0d818cf18f606b10037cdd26d0f097d1936b55dcff SHA512 d6d3196f6d06f46b5f1707ba7baab0c9171202282a36d73fc47e0505b1db78ee743f181e6486390813620a33d07febab9af7a74c48945dd4148a8788d8a18c40
-EBUILD kwidgetsaddons-5.54.0-r1.ebuild 588 BLAKE2B 3dc2442341f749d8413387536041915e6133cad219b7c2f84e777b3a43a82a33804b9c64aeacec10d5f5569925a136aa684e6834033eb7264695f123a82ca14a SHA512 98896491cafb9a8da8ba225757e44c5cece079512d5401b789f6db0cf30a55a9330cbdb979f7769abc3b8383a754e1c4e45b5e8993ad5c06581a131eb0f567e9
-EBUILD kwidgetsaddons-5.57.0.ebuild 534 BLAKE2B e2ff95d423efe4753b68a9d09e4dfe30d087e4ef04b5eccaa1c301fc648bbd494d17deff26a21d4ccf6f990616e4a99a0240e588d60a992933658f3ec8e01e34 SHA512 babccea1b264a1ee23d2389e9bd9e7a210479fd1255352abb6ced1e532d8129385321901b75bf694f144f9ac6b2387aab1648ca6842cf305ce92d4099893474e
+DIST kwidgetsaddons-5.58.0.tar.xz 2192020 BLAKE2B a8015b3d24946957663fc8ff38a3e536d5026825aa2efca624b9756e3c97750c122e62bc9ae4d3e9727f6e395677d05fb1c8bfe0537f6fc1e06e2a9e98b1c678 SHA512 987512048c1ec90bed7252783fc82165a4e30dedfd2d2e3b3407febb624aef30a3969b5a0e78586b1ec0c811a1671620a2dc0f311f48946143c7c2d74322dcd1
+EBUILD kwidgetsaddons-5.57.0.ebuild 532 BLAKE2B d881e8a5e594df0e144dcb0234cc1d69f83b0fcf85cac7ac85fbcf1a6239a77b36e24a468f432e34b9419aac98b2832451cbfea80d207d41b8844c511d78b06b SHA512 ff0e32731ec7961c1d96471b8004f74b512a1b51012988d65e7cddc0d53c7d95b0d3b8e0d1a6bb0045d8f17cc9b95fbffe94361859c9f9aaf611355876852ec3
+EBUILD kwidgetsaddons-5.58.0.ebuild 534 BLAKE2B e2ff95d423efe4753b68a9d09e4dfe30d087e4ef04b5eccaa1c301fc648bbd494d17deff26a21d4ccf6f990616e4a99a0240e588d60a992933658f3ec8e01e34 SHA512 babccea1b264a1ee23d2389e9bd9e7a210479fd1255352abb6ced1e532d8129385321901b75bf694f144f9ac6b2387aab1648ca6842cf305ce92d4099893474e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
deleted file mode 100644
index 38c89728b52e..000000000000
--- a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
-Date: Thu, 10 Jan 2019 09:19:33 -0700
-Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3)
-
-Summary:
-This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility.
-
-CCBUG: 402730
-
-FIXED-IN: 5.54
-
-Test Plan:
-Before:
-{F6520054}
-After:
-{F6520058}
-
-Reviewers: ngraham, #frameworks, #vdg, #plasma
-
-Reviewed By: ngraham, #vdg
-
-Subscribers: cfeck, filipf, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D17907
----
- src/ktitlewidget.cpp | 29 -----------------------------
- 1 file changed, 29 deletions(-)
-
-diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp
-index 7a34bc2..d8b0517 100644
---- a/src/ktitlewidget.cpp
-+++ b/src/ktitlewidget.cpp
-@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e)
-     if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange
-                                            || e->type() == QEvent::ApplicationFontChange) {
-         d->textLabel->setStyleSheet(d->textStyleSheet());
--        //Qt stylesheet doesn't support lighter font-weight
--        QFont font(d->textLabel->font());
--        if (d->level <= 4) {
--            font.setWeight(QFont::Light);
--            font.setStyleName(QStringLiteral("Light"));
--        } else {
--            font.setWeight(QFont::Normal);
--            font.setStyleName(QStringLiteral("Regular"));
--        }
--        d->textLabel->setFont(font);
-         d->commentLabel->setStyleSheet(d->commentStyleSheet());
-     }
- }
-@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment)
- 
-     if (!Qt::mightBeRichText(text)) {
-         d->textLabel->setStyleSheet(d->textStyleSheet());
--        //Qt stylesheet doesn't support lighter font-weight
--        QFont font(d->textLabel->font());
--        if (d->level <= 4) {
--            font.setWeight(QFont::Light);
--            font.setStyleName(QStringLiteral("Light"));
--        } else {
--            font.setWeight(QFont::Normal);
--            font.setStyleName(QStringLiteral("Regular"));
--        }
--        d->textLabel->setFont(font);
-     }
- 
-     d->textLabel->setText(text);
-@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level)
-     d->level = level;
- 
-     d->textLabel->setStyleSheet(d->textStyleSheet());
--    //Qt stylesheet doesn't support lighter font-weight
--    QFont font(d->textLabel->font());
--    if (d->level <= 4) {
--        font.setWeight(QFont::Light);
--        font.setStyleName(QStringLiteral("Light"));
--    } else {
--        font.setWeight(QFont::Normal);
--        font.setStyleName(QStringLiteral("Regular"));
--    }
- }
- 
- int KTitleWidget::level()
--- 
-cgit v1.1
-
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
index a9bce23a9f9a..6f1b218a318d 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.57.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.58.0.ebuild
index 237b69f603b0..a9bce23a9f9a 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.58.0.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" )
+RDEPEND="${DEPEND}"
 
 src_test() {
 	# bug 650216, 653186