gentoo resync : 12.05.2022

4 files changed, 6 insertions, 35 deletions

diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 03238c2c37e1..18cd1333cdcc 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,6 +1,5 @@
-AUX kapptemplate-21.08.3-fix-ProvidersUrl.patch 869 BLAKE2B 8d00bc3d357205c2f6d228001465f02ed3a0d5c8107e3b549f3b828f6133dbed33c61a015c4be3af90975efb70de76f49849cb5d5ab1f90245184fef2e0c348c SHA512 3044dfd827d0fd0fe179716bdf40463c17e642b171b292b551bd2b349805bb788697a2a49ae0c548954d62ca6b9009384e13963e153e52c364469b54b57e02d0
-DIST kapptemplate-21.08.3.tar.xz 334020 BLAKE2B a06de0cfa85046d2936b02f971ea0940db2bea03f4b200e4e6d4db256e12b79c923f655d2402fca7a8625ab116bfae24bfed153ca384b19af0649b12759286af SHA512 433160d8fb6722eaa78483a4665855dd1d3f268f5fb8aaae98ca25f556736ea9b9a07eabaedd41010719e4bb37f85369e6ff8cfe61664ba2eb831e387c05fd0b
 DIST kapptemplate-21.12.3.tar.xz 335200 BLAKE2B d0fc6df0c79542d5c49a2a162c041980f180217bbd4b045bb80ecb1296173bc6834681e2c7e72e8feea10a804df872da6a73c905c08960c5bd8e811b313d6c33 SHA512 c12a5c83b028924ad79f86c74f6f4f78465085d05973b3babd1578d6cbcf7c117e993ab2710d8d03a9c43b11efad637b9d57497923e05f59d2c816755ed1a507
-EBUILD kapptemplate-21.08.3-r1.ebuild 969 BLAKE2B e70a5aaf47d0e21b2553708be0d36df3d865186312d9c06cb4ac13f4316c17fedca2a48127c6596bd32491dc9a3ee97cc0e716e53627948ebfeb051f356b1b72 SHA512 a263926508e1c5505373a6d1ef535e36eea5f36ecf22b2510bc05b0e1c663686b7035b7bf510611bac3871024dd917e1626838a6387b2e587eb6d9d64ddd1f41
-EBUILD kapptemplate-21.12.3.ebuild 842 BLAKE2B aaad7044fe231236ed5f565ce819fd9c1c4406a970255193a061947c1c6b8c31f24d95f038b2f091e938cfbdb1a051e59eee59169cdfed6960b1535a5156e9f0 SHA512 b300de2b6a18a4b912c926f00dea7076212f86e79059ea9e291b99f27d4218b8fb0c0091931fa7a1b0e5239840e85a3ca1977dec771c4658f1890d9b4e58d37e
+DIST kapptemplate-22.04.0.tar.xz 334496 BLAKE2B 0616fb11e46bebbfac9212d3eafb395757370158f0b510f50999dd9b9f958ad1751801ae83e4c0f05dfaafbf428d3459a520b0ef0dac071d689b09138b3eea0e SHA512 5a3e392c41c8e6e30224bcfee41ffab52023858f4609db9a8a0194a6fbdf0dc8ab87e19ed0979172b879408544b456648926aadfc43b4429ccb7bf4d3b63b746
+EBUILD kapptemplate-21.12.3.ebuild 841 BLAKE2B 8c241355d4cb352936371c4a2f1ad2df8dbaf5cf2ab88aa5cc62db7c2c753f1ccfa5491f2bfd8fd4fc20a3aaff85ae5fec1a858d78d383d99c1128133d6b15ab SHA512 8ea04cf55f7627dde0e98e9f9eacd7403f2ee6d4bae30c47c257dab8e55ebcfb481114b5c59b5510579f9dcf3f0e87ead55d5cef9c24bee34ab8585b814eaac0
+EBUILD kapptemplate-22.04.0.ebuild 844 BLAKE2B 01890a670dfe2f177e85cc11e9de917848d83e8bbb94c3c34a1a674ed92066464a2918d991a8a5bd69be49f730562f8375db4423e983eb1d5c9ced85f97ac8c0 SHA512 7868bdc53479031f79731f8660da98f6093ebc868692b0757ed0eeeaf9f6e46b8077885eafe860a00babf2657a4f7f409ee74898990fac5287384b3e0d49ccd8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kapptemplate/files/kapptemplate-21.08.3-fix-ProvidersUrl.patch b/kde-apps/kapptemplate/files/kapptemplate-21.08.3-fix-ProvidersUrl.patch
deleted file mode 100644
index aef236203b06..000000000000
--- a/kde-apps/kapptemplate/files/kapptemplate-21.08.3-fix-ProvidersUrl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 14c554ba403fded7a22b1c231e02f552da344670 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Tue, 8 Feb 2022 11:55:58 +0100
-Subject: [PATCH] Use the CDN based endpoint rather than the legacy endpoint
-
----
- src/application/kapptemplate.knsrc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/application/kapptemplate.knsrc b/src/application/kapptemplate.knsrc
-index 76bcc7f..9ddd3a7 100644
---- a/src/application/kapptemplate.knsrc
-+++ b/src/application/kapptemplate.knsrc
-@@ -33,7 +33,7 @@ Name[x-test]=xxApplication Templates (SDK)xx
- Name[zh_CN]=应用程序模板 (SDK)
- Name[zh_TW]=應用程式範本 (SDK)
- 
--ProvidersUrl=http://download.kde.org/ocs/providers.xml
-+ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
- Categories=KDE App Template
- TargetDir=kdevappwizard/templates
- Uncompress=never
--- 
-GitLab
-
diff --git a/kde-apps/kapptemplate/kapptemplate-21.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-21.12.3.ebuild
index 763bab51a930..191430049b77 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.12.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-21.08.3-r1.ebuild b/kde-apps/kapptemplate/kapptemplate-22.04.0.ebuild
index 8ef34766d118..7afdaaae2895 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.08.3-r1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-22.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -30,6 +30,3 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-# https://mail.kde.org/pipermail/distributions/2022-February/001124.html
-PATCHES=( "${FILESDIR}/${P}-fix-ProvidersUrl.patch" )