gentoo resync : 12.05.2022

4 files changed, 2 insertions, 96 deletions

diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index f81fcd729570..055c2a5e26a0 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,8 +1,5 @@
-AUX frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch 1824 BLAKE2B 2e073af31b99cd6b5f9273953d6bf31e797ade0f4ea5e2c189ba0b40a1f4d32390ccfb0ea3988d22f7d888a7ec0f00c504f447043f0aeb90eae9e1bc5e56afa1 SHA512 2e5abc183359fa8246dbc146b3726726db59a8c5665ba59d0e647fda8bbdd53f7f5ba483f0ebcaef42eb7e506ee5f886ee58169a5d946da3f0c6614522ce632b
-DIST frameworkintegration-5.90.0.tar.xz 1758208 BLAKE2B c8a7a11677ca77032be1ef1491ba5d8efa356caf6e7704b240a50baec7119b64ba85d4d183692164a1de58ee42c8d92686c9abe3d14af0bd8493ff747d9ddb7f SHA512 4f27d8aa453ab5d08e410db4c93bd86386159bb3e82a65cff0c4264ec3467f916a761e7cc0f68365c3f821cce8c84ff6277afb975a967fe26ed7a545155defca
 DIST frameworkintegration-5.92.0.tar.xz 1758268 BLAKE2B 7f72908f93158f42c2e90488aa037bb7dd9146e333b504a9034c8b5c6898fb5a6357a62fc81c237f8be9b854d05c97ce4352d28aa4f28ba1674d26b0098c7e41 SHA512 3445749f4ee10493a798433a7b5630dc22701c98c3f81c7e2236cffea9f9576ce8123006e5123698e5d648771ea77bff848453b188b1a6e791aab08184cebecc
 DIST frameworkintegration-5.93.0.tar.xz 1758280 BLAKE2B 9bc1d3e711ea548a561b81850e50c0e920b87cbf4a47506e1f4a7beca067030eaff50c857c59493198e98cf91673bc3e531fc35bc5c935573c8ba9d0202cb480 SHA512 679cecf3852965d0f746a44ece7ac993328d8133745c9c7a9afc05855e9f3497964a558e08d69b6baf7ca700b01611a1dd6c13d4ef145a3cd92b9459f5f753c0
-EBUILD frameworkintegration-5.90.0-r1.ebuild 1080 BLAKE2B 7bff5263119e086f390f65659ffdc6c3c860167182595cec7fe3a7ef1051bdd4c3e7039d6be874421c37b1dd9b0b93eda704286b46746be23bcba979611b2dc4 SHA512 2569c800510260354e6fa24b84355a3bacc5de44f2252aa8e5c76ebe618962d788ae91e204074b04438ec842aef379c1b8b31e231f85956100ab6fb21af0e639
-EBUILD frameworkintegration-5.92.0.ebuild 999 BLAKE2B 162cb174d0b228e88e6e4760e652b8c790f68e61c870096ef93066e752335c3891e11c83dcbd9075cf112cf08bfbea5d831c07468dd062c615641685a0ba8c8b SHA512 5d8abca32f749aac23098dfa46c3bda961e62956f6aa5c70a3090b55948f05a72b859e5f3b804dd52476a0b766649b7e104260af0c3c69490984510f49458930
+EBUILD frameworkintegration-5.92.0.ebuild 996 BLAKE2B d2f05b2db8e364c0da4b2b4e007df850778ef1d771f5ac98b631237ea2e434347dafcac288ca9dc1872b6382bb5be54ca9a71367f35db26a0d37e287e1d880d0 SHA512 998406eadf4c6218e2984165dbcc36667b19735440f9e11e581dce33251d11e861e60328a45b1e44100b2c8e07d92e59837d54d80f452972b06694ed1bdc5113
 EBUILD frameworkintegration-5.93.0.ebuild 999 BLAKE2B 162cb174d0b228e88e6e4760e652b8c790f68e61c870096ef93066e752335c3891e11c83dcbd9075cf112cf08bfbea5d831c07468dd062c615641685a0ba8c8b SHA512 5d8abca32f749aac23098dfa46c3bda961e62956f6aa5c70a3090b55948f05a72b859e5f3b804dd52476a0b766649b7e104260af0c3c69490984510f49458930
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch b/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch
deleted file mode 100644
index fabbee1e1d65..000000000000
--- a/kde-frameworks/frameworkintegration/files/frameworkintegration-5.90.0-fix-install-KNS-items-w-deps.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 675802e706a737c008aa74600ac804b06db52140 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Tue, 11 Jan 2022 06:42:03 +0100
-Subject: [PATCH] Fix wrong porting of KNSCore::Engine::configSearchLocations
-
-The `KNSCore::Engine::availableConfigFiles` method returns the file names, but
-the code still assumed that the directories where the file is contained is returned.
-Consequently the knsrc files would never be found.
-
-BUG: 448237
----
- src/kpackage-install-handlers/kns/main.cpp | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/kpackage-install-handlers/kns/main.cpp b/src/kpackage-install-handlers/kns/main.cpp
-index 9978844..a2b530e 100644
---- a/src/kpackage-install-handlers/kns/main.cpp
-+++ b/src/kpackage-install-handlers/kns/main.cpp
-@@ -70,17 +70,16 @@ int main(int argc, char **argv)
-     Q_ASSERT(url.scheme() == QLatin1String("kns"));
- 
-     QString knsname;
--    for (const auto &location : KNSCore::Engine::availableConfigFiles()) {
--        QString candidate = location + QLatin1Char('/') + url.host();
--        if (QFile::exists(candidate)) {
--            knsname = candidate;
--            break;
--        }
--    }
-+    const QStringList availableConfigFiles = KNSCore::Engine::availableConfigFiles();
-+    auto knsNameIt = std::find_if(availableConfigFiles.begin(), availableConfigFiles.end(), [&url](const QString &availableFile) {
-+        return availableFile.endsWith(QLatin1String("/") + url.host());
-+    });
- 
--    if (knsname.isEmpty()) {
-+    if (knsNameIt == availableConfigFiles.end()) {
-         qWarning() << "couldn't find knsrc file for" << url.host();
-         return 1;
-+    } else {
-+        knsname = *knsNameIt;
-     }
- 
-     const auto pathParts = url.path().split(QLatin1Char('/'), Qt::SkipEmptyParts);
--- 
-GitLab
-
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.90.0-r1.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.90.0-r1.ebuild
deleted file mode 100644
index c6796756026a..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# requires running Plasma environment
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/knewstuff-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-install-KNS-items-w-deps.patch ) # KDE-bug 448237
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
index 035cdd529c64..f5f785f09565 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires running Plasma environment