gentoo resync : 20.03.2022

4 files changed, 34 insertions, 4 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 759b34dc16b2..66bc2cc40ff6 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +1,7 @@
 AUX dolphin-21.08.1-port-to-KTerminalLauncherJob.patch 3579 BLAKE2B efcff49c7089d419f8c62b93fe0a5ef6459055a1a761b34c0bb40c20bf3c5a17daa1c1e77974158733573f479125f0c53985ba38547d07090f15f65907fa41c2 SHA512 35b21983204583aef7dd980faecb8c33eb88f50841f8b9996c3f2784393cc1d9cff85e57581cd3c380bd62dc51802979be9882c4d4d1102799a0038f734176f9
+AUX dolphin-21.08.3-fix-ProvidersUrl.patch 940 BLAKE2B 276ed217e986cfc3df675bcbedfd7bb1458d91588b8ec5759f6a036bb5dfd519cd8a570a97eb219aad56edcf828c8eaa412a9ade86b26a876fed965a8184f6d4 SHA512 a56b1d8917d8839b75a1357cf7e77e2e0039bf733f1ec802967df7a07957c4b632f3df736569093eb733eac2f3942da13b33bc409d789f7c759a63b4777f0a12
 DIST dolphin-21.08.3.tar.xz 5327496 BLAKE2B 864016bdb3b30c181eeb158ad0b418c27556f8e0d1bcd2da495cc387667a99e655abcd320a352157156443ab91bd2b1820dce7cb10a4b8d226b5b07dcb46b167 SHA512 918be8ff9ac01ce9e9f0f575a31e70687b24edc08f022cc991922a136bda5900f5cc431b056d2aac8349858e3b9592c365b1cfa8e4bbf01f86eb7be8cbca751e
-DIST dolphin-21.12.1.tar.xz 5338928 BLAKE2B 0772a1dfa8cc73d27f3ca26862ebbb7d6bb5e6129b43f781f501f8bb796486c16ad25d11937ddd400620ef1398cf9e70793753306924e192fd7d246e4cb68f26 SHA512 e73cbe271199859f2b474daeb0a7a08cde4fefe5851e729be3ca6554d25b4a18ad135155dd510e6c7c5f598a6e56f7dc964672f947ae605a1af77949ef975c7f
-EBUILD dolphin-21.08.3.ebuild 3196 BLAKE2B 3fed89ba33ecfb9ce3874d7744cbbba87d60a9791b9696c9b1520cc3704e5e40f76e2982ed34dd45036fede9ca8453fb1ea15b2ff6b7d3601627df38fdc8ab70 SHA512 0e33f63b889672fbb955e4fe7a8bfa1e9b76fbd887f82bfbcecde0c1a990f9de0ed2d7846115afc4d843caf9e28c1c13336679e82a5814aea6d2d6e4a8a4ffa3
-EBUILD dolphin-21.12.1.ebuild 3105 BLAKE2B aeb85e25f132a914f57564c087e4497162dd7e219ccb8f844c2eda4976c0d1e76569b24506051aa0a91f67852bbc8ecedbb046ad1bd7f2f8e6f911685c73290b SHA512 2be186f9631ebf4d31e4b2faea596b15ae2a074bea8f7a6f0dde76cafb0f86914efcec00a0f032d61cec83c5f241658323cd4aa15bb2c1c6fe5f9bc94c9d7a8c
+DIST dolphin-21.12.3.tar.xz 5346076 BLAKE2B 847a4abc0359cf4a45655746e3020b880550aaaadcbae190bac89bf77328f684932500b8ddf89a7c99b7680c2d3ddec9a8d288db03b4873146a7f89b29a64855 SHA512 bfd52cd88b205f375858c26062d278e8e619026a34d93d370d0913feaac3eb65bae2456c118d9f8f35f52c5982b7daaef8ba4012e4b8fdf27c8c435866ad1e0b
+EBUILD dolphin-21.08.3-r1.ebuild 3322 BLAKE2B 313ed40bf9696b806f17a65778979ffa7a77fbe852aeff727919f768423849d3d2d762316752e83699f61497c4e183812ba0f77f46301aafebba585bd75eeeb9 SHA512 860b6fb994af8d5bb4d868ca2214bc846572604b4b291ac5ef0d12e4cf704944c9a6a9b13a087e5e2f4c09a7e5a8557f356e4680e5419758b3fc2d2774848a25
+EBUILD dolphin-21.12.3.ebuild 3105 BLAKE2B aeb85e25f132a914f57564c087e4497162dd7e219ccb8f844c2eda4976c0d1e76569b24506051aa0a91f67852bbc8ecedbb046ad1bd7f2f8e6f911685c73290b SHA512 2be186f9631ebf4d31e4b2faea596b15ae2a074bea8f7a6f0dde76cafb0f86914efcec00a0f032d61cec83c5f241658323cd4aa15bb2c1c6fe5f9bc94c9d7a8c
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-21.08.3.ebuild b/kde-apps/dolphin/dolphin-21.08.3-r1.ebuild
index 9160d9e3ad2d..d4a96ad6d8a2 100644
--- a/kde-apps/dolphin/dolphin-21.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.08.3-r1.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
@@ -63,6 +63,8 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-21.08.1-port-to-KTerminalLauncherJob.patch" # KDE-bug 441072
+	# https://mail.kde.org/pipermail/distributions/2022-February/001128.html
+	"${FILESDIR}/${PN}-21.08.3-fix-ProvidersUrl.patch"
 )
 
 src_configure() {
diff --git a/kde-apps/dolphin/dolphin-21.12.1.ebuild b/kde-apps/dolphin/dolphin-21.12.3.ebuild
index 6a6c282d9542..6a6c282d9542 100644
--- a/kde-apps/dolphin/dolphin-21.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-21.12.3.ebuild
diff --git a/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
new file mode 100644
index 000000000000..74472fd0943d
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.08.3-fix-ProvidersUrl.patch
@@ -0,0 +1,27 @@
+From d0898592a17d14fc8d48fc5cba71f3d57f0a1856 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Thu, 30 Dec 2021 07:31:41 +1300
+Subject: [PATCH] Use the CDN based endpoint rather than the legacy endpoint
+ which hits our download redirector.
+
+CCMAIL: distributions@kde.org
+
+(cherry picked from commit 694e4e24526c5f55e162ad9288782e7c82cac38f)
+---
+ src/settings/contextmenu/servicemenu.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/contextmenu/servicemenu.knsrc b/src/settings/contextmenu/servicemenu.knsrc
+index 59d459895..4374082c7 100644
+--- a/src/settings/contextmenu/servicemenu.knsrc
++++ b/src/settings/contextmenu/servicemenu.knsrc
+@@ -1,5 +1,5 @@
+ [KNewStuff3]
+-ProvidersUrl=https://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
+ Categories=Dolphin Service Menus
+ TargetDir=servicemenu-download
+ Uncompress=never
+-- 
+GitLab
+