gentoo resync : 20.03.2022

4 files changed, 6 insertions, 131 deletions

diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 6ee3d9c8e5c7..79caf67bed65 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,6 +1,5 @@
-AUX kiconthemes-5.88.0-fix-icon-preference.patch 4893 BLAKE2B 7e9c434d7655eefa4ae7d4d7ce1baf3190af483ae7768439edae73fdc31effb1c341ff21a43e3ed0788d4d554952dd76cdc1057d4656537e7b66346f147a2a0c SHA512 a6da4f4ef94f7e4b6754f1b03f8454898aa8e59a9bf104a23b5a2289627b08f9b6f451a123630718e9fe9dfd57d482cac87596a404e58bcf31a2432b68ebd6f3
-DIST kiconthemes-5.88.0.tar.xz 223284 BLAKE2B 374935539c45468dd60364701ad2ca9ba1b7bc5852692a4299d74efd99fe615913626e42525deeebc5ea27ae44aab7795ffbaefa2978f3a214c3a3359e1cc664 SHA512 56bb3da876cfe7bc4999730ae91c9e71001aff63c904c4bdeb5989b6465c981b848af36942a5a5979e08af0b654c9e403210b037cab7b085d14281ed769650c9
 DIST kiconthemes-5.90.0.tar.xz 225884 BLAKE2B 9697b1cda2520807b6b21e9210a6e436cfa9cbba25ce3a05c339c94dacf1687700d8ed59c806e222e811df166856217b5080d311a44eedf375b252e048bb7d64 SHA512 91a281df7c0336b1358969d0c6ef2899679e1b0088d74f5ad5c02ddcc9d0e0bfc71ea6fe13eec6ba6668996128ef6d175b94ae46388327534a28f851eae99998
-EBUILD kiconthemes-5.88.0-r1.ebuild 879 BLAKE2B a1390eaf034e8ba68f8b9e47fe0c9c7d5bb327b4bc2774d0210a22fc5a892fec6941e1e796b2d34f1857aed31d3f5a6b37ff2a1d37043b6f4bc0cef622d62085 SHA512 05d42b664403daaa646e96d61fd12ffc2d0e75943e136a85a9d6019f722ad59b725c57a2c0589e0e3e51ecbeb2508a6bb640a4661c2893c87a2269408d85b38d
-EBUILD kiconthemes-5.90.0.ebuild 807 BLAKE2B ea33010297fa7ef2d82f268da6c43b4459d89a896cdea149c56d2571695648a988c06d2af4c539cb15fbf79347715927133c3f1a978cfd00305c0968a20d6cd4 SHA512 4e79a12a827841adb9b2fd9f42370aa057f51e62fda72993ca6cca03f2dbfc3cb9ddc35198fcc4513a9a9b1e0082839d71d83b3693632b203ae60922c503819a
+DIST kiconthemes-5.92.0.tar.xz 226260 BLAKE2B d05388c112934827d5257ea03f20d6936194ea9b8a9d3390a6d34d001efb254e9bcd3a8a8dc3d91edec683f060d73d27c1a8ab21e966994bb939bb4e81d1266f SHA512 b05d414690c0d1c304145c57f8a594879580423efb121cd6597eae5afbcb28e1cfc87bf9e44ef8f9722554e6b8135d299ba90c49a4d50e2ecbe64440806bb199
+EBUILD kiconthemes-5.90.0.ebuild 804 BLAKE2B 4c88a8726459b935943c733977825f2b6e332115ed7245bffb2e3ded7b52f82457a435638715e484f8c24d79f225a80cb02ec653c02a2a11554e2ad85a224f87 SHA512 553dc2e8fddad18c42296ca1a1974f00e61de5b4797313e5fb6af8a1ded0c0f02230cd1f705a98d93e1175ab65c55c27b800d5134abba89aded73dd49af4d9ac
+EBUILD kiconthemes-5.92.0.ebuild 807 BLAKE2B ea33010297fa7ef2d82f268da6c43b4459d89a896cdea149c56d2571695648a988c06d2af4c539cb15fbf79347715927133c3f1a978cfd00305c0968a20d6cd4 SHA512 4e79a12a827841adb9b2fd9f42370aa057f51e62fda72993ca6cca03f2dbfc3cb9ddc35198fcc4513a9a9b1e0082839d71d83b3693632b203ae60922c503819a
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
deleted file mode 100644
index e8b48b468323..000000000000
--- a/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 13181b03eac3c85f0649d5399d8c3037c388928c Mon Sep 17 00:00:00 2001
-From: Jan Blackquill <uhhadd@gmail.com>
-Date: Thu, 25 Nov 2021 14:51:06 -0500
-Subject: [PATCH] KIconLoader: prefer icons from current theme before falling
- back to other themes
-
-BUG: 445804
----
- autotests/kiconloader_unittest.cpp | 25 ++++++++++++++++++++++
- src/kiconloader.cpp                | 34 ++++++------------------------
- 2 files changed, 32 insertions(+), 27 deletions(-)
-
-diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
-index 813215d..c232111 100644
---- a/autotests/kiconloader_unittest.cpp
-+++ b/autotests/kiconloader_unittest.cpp
-@@ -112,6 +112,12 @@ private Q_SLOTS:
-         QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/mimetypes/unknown.png"))));
-         QVERIFY(QFile::copy(QStringLiteral(":/coloredsvgicon.svg"), testIconsDir.filePath(QStringLiteral("breeze/22x22/apps/coloredsvgicon.svg"))));
- 
-+        // prepare some icons for our actions test
-+        // when querying breeze for 'one-two', we expect
-+        // 'one' from breeze instead of oxygen's 'one-two'.
-+        QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("oxygen/22x22/actions/one-two.png"))));
-+        QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/actions/one.png"))));
-+
-         QVERIFY(QFile::setPermissions(breezeThemeFile, QFileDevice::ReadOwner | QFileDevice::WriteOwner));
-         KConfig configFile(breezeThemeFile);
-         KConfigGroup iconThemeGroup = configFile.group("Icon Theme");
-@@ -332,6 +338,25 @@ private Q_SLOTS:
-         QVERIFY(QFile::exists(unknownPath));
-     }
- 
-+    void testCorrectFallback()
-+    {
-+        // we want to prefer icons from the same theme
-+
-+        // so if we have something like:
-+        /*
-+            oxygen:
-+                one-two
-+
-+            breeze:
-+                one
-+        */
-+        // and we ask for 'one-two', we expect to see 'one' from breeze instead
-+        // of 'one-two' from oxygen.
-+        QString path;
-+        KIconLoader::global()->loadIcon(QStringLiteral("one-two"), KIconLoader::Desktop, 24, KIconLoader::DefaultState, QStringList(), &path);
-+        QVERIFY(path.contains("breeze/22x22/actions"));
-+    }
-+
-     void testPathStore()
-     {
-         QString path;
-diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
-index 4d4181d..8a644d4 100644
---- a/src/kiconloader.cpp
-+++ b/src/kiconloader.cpp
-@@ -1021,12 +1021,7 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
- {
-     const_cast<KIconLoaderPrivate *>(this)->initIconThemes();
- 
--    // Do two passes through themeNodes.
--    //
--    // The first pass looks for an exact match in each themeNode one after the other.
--    // If one is found and it is an app icon then return that icon.
--    //
--    // In the next pass (assuming the first pass failed), it looks for
-+    // This looks for the exact match and its
-     // generic fallbacks in each themeNode one after the other.
- 
-     // In theory we should only do this for mimetype icons, not for app icons,
-@@ -1036,22 +1031,17 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
-     // Once everyone uses that to look up mimetype icons, we can kill the fallback code
-     // from this method.
- 
--    for (KIconThemeNode *themeNode : std::as_const(links)) {
--        const QString path = themeNode->theme->iconPathByName(name, size, KIconLoader::MatchBest, scale);
--        if (!path.isEmpty()) {
--            return path;
--        }
--    }
--
--    if (name.endsWith(QLatin1String("-x-generic"))) {
--        return QString(); // no further fallback
--    }
--    bool genericFallback = false;
-+    bool genericFallback = name.endsWith(QLatin1String("-x-generic"));;
-     QString path;
-     for (KIconThemeNode *themeNode : std::as_const(links)) {
-         QString currentName = name;
- 
-         while (!currentName.isEmpty()) {
-+            path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
-+            if (!path.isEmpty()) {
-+                return path;
-+            }
-+
-             if (genericFallback) {
-                 // we already tested the base name
-                 break;
-@@ -1088,16 +1078,6 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
-                     break;
-                 }
-             }
--
--            if (currentName.isEmpty()) {
--                break;
--            }
--
--            // qCDebug(KICONTHEMES) << "Looking up" << currentName;
--            path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
--            if (!path.isEmpty()) {
--                return path;
--            }
-         }
-     }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.90.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.90.0.ebuild
index e2723873952c..2c3961c4a623 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.90.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.90.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # bug 574770
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
index 810f917fbbf5..e2723873952c 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 574770
@@ -30,5 +30,3 @@ DEPEND="
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-icon-preference.patch ) # KDE-bug 445804