gentoo resync : 16.04.2022

4 files changed, 85 insertions, 3 deletions

diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 4d0390f5bde9..201b5abdfffb 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,8 +1,11 @@
 AUX knewstuff-5.90.0-add-conditional-cache-preference.patch 2827 BLAKE2B cfa37e232f0c534ab6431ec52dd108f66a1d9f1a3a4551e2ea00247112990a13baaa5ba05585a7ab582d3ed98cff87d7fbfe365946f2357ec23ec4bfcff334d0 SHA512 5b20a0218380737fcfd6435ef7aad7e28ee635efe3dcbbd17e8fc9b2f1965b779345ac7420bc6f18140c4b647c25ace119aa7d6ad27ecc038bc488c6bcf2ee80
 AUX knewstuff-5.90.0-ensure-correct-ProvidersUrl.patch 1264 BLAKE2B 7b22f0e173d7460caeb82ec4be514292093e2423bbfae7465f4bf038259ee734ff3960b6a0d41fdc9c03b08dfd738846bf3839a0fdb21a5054531968c3e328d6 SHA512 e45c22952c87234b25915b7039e2e4cca1c920d6fea32ed29a93c6f45940b6a1b09f8d38bba929f55bbdd63d868327436f83b107808e62c6a45f405f90a09324
 AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043ce28f26e14a3803019e71039634fbac095204882c45a43d4f0520d8199c037a4cb291e543ec61c5667e84f52044a50877996f3d SHA512 170f6155f78b1386b4a807bcec1765c9bc8c7aec589a7ed364159597e324eacca390cef63152ddcb9f6d81b175089ece8628c6f861a4e3089cad2978188729b6
+AUX knewstuff-5.92.0-fix-valid-tar-recognition.patch 1123 BLAKE2B 6febe01e614eafc88b1c29c327d0c5906347d8d3db518126c0950134e8764b31d5145501c2068489fa0435b6263bdfc6899a567bfa6f82317b50b56e312cfa13 SHA512 4a216fc24709fb602ed2a7d7ed6d9e9bce66dedd9eb64f41f2d5e3a6363f916602c8adb4588cd3781c0383cb3f4732c332fd82adce8abac76ad2507b8c7be0f0
 DIST knewstuff-5.90.0.tar.xz 1151308 BLAKE2B 3ee001569596c96b7a28696b1be22f5138f7f274ed87b7255d3809a32304b3eacf594ab78627266d8227bb7330fd1e90526b2d93bf4f82c780050bd5d1f7c548 SHA512 d80b743691eb9665e0df196a69db3cee2247bbfe6c34ea5e9511c94558d2e807c9aca867aef6cd4344eaae6f252d9fff6b3e7a31c152b8a8b69b8d54813ede28
 DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
+DIST knewstuff-5.93.0.tar.xz 1155216 BLAKE2B 9aad129dcfa08a6a7258ef4869a9e949e5a182c4e3f5e286a096c7935a08c7c5991b517c24743cc3a0685e27e2ccb069d44431cbc6033b9e6242db547e42e59b SHA512 ed18c8d1dda39db68d2c426936ba4d2576b0b7298dd306ad92101c992fda1420ffd9bfbd54b2bd9ee9afcfda6ca72b68258b46d6f151bc8b99a1c82577fca383
 EBUILD knewstuff-5.90.0-r1.ebuild 1468 BLAKE2B 93a3c9fd4d72de1e1acf0ceac1d885a2827afefa1a9c95a41843e67b5b28a69efd298ce9d4a205fa89ff45d555fd8a3654fa0936d08517fbf6e088c22227040e SHA512 16604d4eb4ac5694a2883a3965b455d4504d4c14dd05795feb668314d657e6315141da109a1143797b3cd18cb889657caf21beef5fee1cf09e73e2330b118d18
-EBUILD knewstuff-5.92.0-r1.ebuild 1324 BLAKE2B 731bada9d972ef39cb1cd95d67de5e453065215729150f7e83d58896e976aee89ed72aafd676960ad4bba1e1050e7aff509f314d8ae65d5fb3ff39fcdf47085f SHA512 3ba5ef975e6fbdf0e485b188780ea472f5a53efa946d4b8e760f481740c805cdc668e3f0756b57b43bcb73b950b754541a9130f6ee65a5490466ba331f31692b
+EBUILD knewstuff-5.92.0-r2.ebuild 1394 BLAKE2B 1318fb123d7151b3f41cff95d595766f42234ca580df20a8c2c3186c80f38ab04c5fe5eaf64edece025a909bab90cfe0c1ba15f338e6bbe607a70f4f5db9a90e SHA512 f1f36df361e0a6a409dd42e8686e53e635b4ab97d4f0ea52154c3e2ed1166ab30717460a6843ecbb93f785e04a05b71ab7747faa153b78900de36cd2766c5ef3
+EBUILD knewstuff-5.93.0.ebuild 1272 BLAKE2B f258e3a95875eb05cea822c7718758107b2a0fd322c28b77863f4274e2e8d2c0cc72216c2fd3a0336687bd05c37a2984249e1ee33da59eeb6c4e625cad1274c5 SHA512 e4f8515a2bae8807080c6f3bf0db0eebf16d2b1f23c75efac5a5ceb6bd291b2ab742ad2b6bdf526498f003e7930b20390dc5d92ea21c3be0ed188736e54be9c2
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
new file mode 100644
index 000000000000..7926b3cee8fa
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
@@ -0,0 +1,27 @@
+From 82f04bff174a4bb307aa9b39aedf271c200b0545 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 7 Mar 2022 21:27:09 +0100
+Subject: [PATCH] Fix certain tars not being recognized as valid archives
+
+KArchive can handle those too.
+
+BUG: 450662
+---
+ src/core/installation.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/installation.cpp b/src/core/installation.cpp
+index c3ba0e15..45694465 100644
+--- a/src/core/installation.cpp
++++ b/src/core/installation.cpp
+@@ -566,6 +566,7 @@ QStringList Installation::installDownloadedFileAndUncompress(const KNSCore::Entr
+                 archive.reset(new KZip(payloadfile));
+                 // clang-format off
+             } else if (mimeType.inherits(QStringLiteral("application/tar"))
++                    || mimeType.inherits(QStringLiteral("application/x-tar")) // BUG 450662
+                     || mimeType.inherits(QStringLiteral("application/x-gzip"))
+                     || mimeType.inherits(QStringLiteral("application/x-bzip"))
+                     || mimeType.inherits(QStringLiteral("application/x-lzma"))
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
new file mode 100644
index 000000000000..44c32f027192
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-KDEBUG-451165.patch"
+	"${FILESDIR}/${P}-fix-valid-tar-recognition.patch" # KDE-bug 450662
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package opds KF5Syndication)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.93.0.ebuild
index 362d3beb80ef..974b65f15605 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.92.0-r1.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.93.0.ebuild
@@ -40,8 +40,6 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-KDEBUG-451165.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package opds KF5Syndication)