gentoo resync : 20.03.2022

4 files changed, 8 insertions, 53 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 40345d7e9aad..2b3d5fc7a9a8 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,10 +1,9 @@
-AUX ktexteditor-5.88.0-revert-invoke-always.patch 1534 BLAKE2B 836612b2e41a73a7099e4bb775427854901b999f471d02eb2f19ca1e516eaa6f5f35799cd9d038a1a2ac8f7b9e7d6160cd4d42776d471fe49291d2c761ca320f SHA512 41d99f771817daceff02a9589c78d4af6987e819437bbd923ccc8108baf89f40e5fdfc0512bba0a816a778710e41626391ea53087a162f591baef8715e689a84
 AUX ktexteditor-5.90.0-CVE-2022-23853-1.patch 4837 BLAKE2B e5e33538c06f2a8b6e1aa319357f17889ecf58273d6c64c2eca146c9d6dc85d635a0d45177c55cf33f726ed32b3a4ea831277e74d84ac3dab1f23582e991e4cd SHA512 58c0074049e9218cf03d8adfbb60fe57c3d331e1d10c53c289f1288ba078185aff9bcbdb0946d421e01378642b40474649bb589b79b098f3c6929ba92b418ca0
 AUX ktexteditor-5.90.0-CVE-2022-23853-2.patch 2513 BLAKE2B de206fc9fb6e9996b544d74b86614849fb75b44420fedef86a81f325f5137a4adffbb34eebec21f275945ee94835b5bed4921179c4ca515c781ba6b1cfa2d5fe SHA512 9186b4ce88dc4eec04cf4367e04c089c72edc26074dcbea7c7c8755b29ffbb6c33c98c22ad16d763b04320caa0a60eca900e050b98fb3c9cca41517d9a42765d
 AUX ktexteditor-5.90.0-KDEBUG-447972.patch 891 BLAKE2B 460bcc4e9469a0ab8712e0ee7b1dc3b8e4e6b042a595014f7e24ce950455c1adda1463ca8fabedd20e255eb59a663d0cda0f84af65993b80ab58e47ef0a8531a SHA512 81cbfdc26b3e04380f6a2ffe7821a7ce7177df05773af5973c1eab84a42076ed027e911ec3552029a9450564cf35a2850b8c4f2708b1bff68995e9cf87353886
 AUX ktexteditor-5.90.0-revert-5dce70a9.patch 4113 BLAKE2B 7f92be945f002118463b1144116f88ff20fb2ab2d7d3ba51e7db41280900bea435e26b6c99854d040b026994f037996ac407afbcf826bc0f5eaff6135f1bcfcc SHA512 8118a66e4824a90db477f6dd1b7f31f7237b840c270f3464c975f11df4f051b8e9c4f35cb1cefa53ed61164f3eade67491bc32052c658d2e86eae426aab0bd4f
-DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b
 DIST ktexteditor-5.90.0.tar.xz 2340540 BLAKE2B eceb56847e43c7d8e8883bc219228ec365bf85cb5279ef255f59d3005a5e1fb6cbc55309b9791b5cdc088201283a08f5b0ab9c0fd840604c349442e60bfa4a0f SHA512 7c63802a4d904d2e5eff6e3c957e9a94848993898bdd37eb033842d4033985820348d81080a3701db19aef1a5762ebdc8a4a4749c931d79f00c986837faa5837
-EBUILD ktexteditor-5.88.0-r1.ebuild 1671 BLAKE2B 2761849095b4c0f1111a712e1e80a5303c29193699a21b2521faaa139131976048659e08a5e41ceb562b9c95d7b4994496940898c874efc61c81aec81752c722 SHA512 9189838fe20bae11fa9a3687fd8ce4bf80fa0c17fcca9bd4a8b1038ccf2e7a8fb5f37b9695886cb9d53fd211f3d096ea72a6a5140c7fa16915af9af46e636561
-EBUILD ktexteditor-5.90.0-r2.ebuild 1689 BLAKE2B 626f42fb2562f3151e16ca507ec57a3c9e4509ffd55fdb0a295865f20b46e6d21440cadc01a1d2bf460954010a0929364dbb93aaa7b9006b171270c51b29414a SHA512 7fb419ec40b1fb5adc43518dda100ddb5102892e071cbb48f5afa9afbb89de4cc629f978fe78e448ea3bf10ca08fcfbba01a74752895a1ba15a4e2a3d44303aa
+DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
+EBUILD ktexteditor-5.90.0-r2.ebuild 1686 BLAKE2B d25227a128b59ceadf91d08127e6fa4668189be1869f2c82b741c4a50cc4949951cc4cdc4579b652de63a63521de7e51f68cee886057deb9c59ad2e0c97c899d SHA512 f39f4a84c7d60339746b9817e1619d6041c0cc23817bffa86861a5fcf4112d4bf9ebc25e6ace7818c9e4a5399d765a2817f7b496306b47905107afdfe1d5a12b
+EBUILD ktexteditor-5.92.0.ebuild 1521 BLAKE2B 5369b952a0611ed8e1bae5a7425a182988241595eeef627f476a39a742f939c0a410ec0e6d892b7bd2826a2847eb2435be0e1c6b067b5e36a191ec2e5c5fd801 SHA512 b20a89b54095ee48027493bd13dc64f778763f0e847b5bf2ce51aa738bfe7c05360445385287dd12ca67a58b886a8f4ed4d7c6ce757982e28c4a914458495f4e
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
deleted file mode 100644
index 543a2f8e0a65..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3be743ebd34cfb1992d52ffe38ac5512e36aae12 Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-Date: Thu, 11 Nov 2021 11:14:47 +0500
-Subject: [PATCH] Revert "completion: invoke always"
-
-This reverts commit d116503df2ca1b159c13ae77aac88cdb08408659.
----
- src/completion/katecompletionwidget.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/completion/katecompletionwidget.cpp b/src/completion/katecompletionwidget.cpp
-index 3af1f2b5..73a36423 100644
---- a/src/completion/katecompletionwidget.cpp
-+++ b/src/completion/katecompletionwidget.cpp
-@@ -35,7 +35,6 @@
- #include <QToolButton>
- 
- const bool hideAutomaticCompletionOnExactMatch = true;
--const bool invokeCompletionAlways = true;
- 
- // If this is true, the completion-list is navigated up/down when 'tab' is pressed, instead of doing partial completion
- const bool shellLikeTabCompletion = false;
-@@ -418,9 +417,7 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range &word,
-         }
-         if (m_completionRanges.contains(model)) {
-             if (*m_completionRanges[model].range == range) {
--                if (!invokeCompletionAlways) {
--                    continue; // Leave it running as it is
--                }
-+                continue; // Leave it running as it is
-             } else { // delete the range that was used previously
-                 KTextEditor::MovingRange *oldRange = m_completionRanges[model].range;
-                 // qCDebug(LOG_KTE)<<"removing completion range 2";
--- 
-GitLab
-
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
index 4b7520cf0d9f..3c7a77ac1c3a 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+editorconfig"
 
 RESTRICT="test"
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.92.0.ebuild
index 7f4f80bebbc0..76c58654bcfd 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-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,8 +11,8 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+editorconfig git"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+editorconfig"
 
 RESTRICT="test"
 
@@ -42,21 +42,13 @@ DEPEND="
 	=kde-frameworks/sonnet-${PVCUT}*:5
 	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
 	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-revert-invoke-always.patch" # KDE-bug 444883
-)
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package editorconfig EditorConfig)
-		$(cmake_use_find_package git LibGit2)
 	)
 
 	ecm_src_configure