gentoo resync : 12.05.2022

4 files changed, 2 insertions, 111 deletions

diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 7fa8830f6257..3519b78aad33 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,8 +1,5 @@
-AUX kholidays-5.90.0-UK-2022-spring-bank-holiday.patch 4481 BLAKE2B d7f7e5f129e2e0c3fc0c13817f7fb5b1af757170654016c34607c584fb68bffee2f898235648d91c0b47fbd3798af0165a362db1a959169544e0b223170a751a SHA512 38869eef2cf8fdd615200e8129099923125ef07c56615316f67a4b8fc683f1ce9719d22d1860c5e61f67e0064f131c15e3d56b7513a3a6c1c8932c730f67a351
-DIST kholidays-5.90.0.tar.xz 234532 BLAKE2B 90f197d1cf98b0012209507fae6af315b57a8721b1c4edc37b7a49559e3b6c1b2ab4f6f7f4b5b78499aca65a66355e86976206449dbbb71966ed4b388c13ee49 SHA512 0517275260f31f8f97ba1e31d9d76007702d9baecc9ba2a4336ea28d74690b84be63f5548644e53f59eafd4f1dbcd61a76bc50f24960de0794a8db4f8e99ed91
 DIST kholidays-5.92.0.tar.xz 235388 BLAKE2B 3ce0840c458522a8d4d407d620ef7f69fea8f0da5f42d33ec896147e436355aeeabc028b823a2e23a339ac31eeece61e381ca8eaa59e9fff5fb2801344766ff3 SHA512 1ec4c5bc513685e7f8834621ce464a003876b4c26ee4ff84db5f13e1cb253fb7e1c04fc7ed1b9ad92dc7990498e8d5d10fe4b3799f33762eabe155296093a3f7
 DIST kholidays-5.93.0.tar.xz 235784 BLAKE2B ea45740a503ae7c00e234ed8838ace29b70e5518c7063ec89e1556abbeb795c29e382ed59d611d3d3f87498850a94d8ae71b3c1a173fb0f14fa261b4239a9eca SHA512 b2921ae46d8d94d018d5b6678e9565de0c2e9ee1062da3ae875c1097fd63271b8b4ae1eaefd652da069080fc0b5b98dbf339b72277a4a2cc2d6ff39592995aaf
-EBUILD kholidays-5.90.0-r1.ebuild 722 BLAKE2B 497936524230d4247b1ffa6f6cc949e868055529c37908218782995f18d18a0ef6a252f4955c5d7c737e7b31f25ce06578245c7f8f4ba6e08d46d2116cc0e02d SHA512 1fb9f6a707cb5fbfb24c69d7ad2265f82bf5db3cfce2fcde7694aae7af4a6c24a56900df99c50cbfe8bafcb387b2deba478ddbafc1668d8ec56f087f6f3001d1
-EBUILD kholidays-5.92.0.ebuild 659 BLAKE2B 7610b973f9e73e1786dda9108b9e3b203ea69d368ee381e7e76647e8c333faefed5d87f36438fa381819461012cff0a7dfb69303b7f5aca42cb63d449872720f SHA512 534c02b5d4a7d95f91c367f1ba087820367111c07b58783cd94bbf2f49ce9859104b675ae55e19fe724da759216bddcada78799f0e2293f8b7b186b371c664b4
+EBUILD kholidays-5.92.0.ebuild 656 BLAKE2B 4f29338c5b9ab7d8df9078dd52d997c01f99286a7615f97b63ba8ec312fbad406245db32d8f0f65b87b787cfbacb83dc374fabf31331b06c50a81f71565c57a1 SHA512 a1a8778a75050d53c6ed2476771c4c2504c81b8efc9c9e0359d6d8799b802ad41fa5845ee1ff2179cc7a8819d04a02e8f94e06e2c1bb66fe0c5a5172f47c92fd
 EBUILD kholidays-5.93.0.ebuild 659 BLAKE2B 7610b973f9e73e1786dda9108b9e3b203ea69d368ee381e7e76647e8c333faefed5d87f36438fa381819461012cff0a7dfb69303b7f5aca42cb63d449872720f SHA512 534c02b5d4a7d95f91c367f1ba087820367111c07b58783cd94bbf2f49ce9859104b675ae55e19fe724da759216bddcada78799f0e2293f8b7b186b371c664b4
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
deleted file mode 100644
index 15d630269b40..000000000000
--- a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Sat, 15 Jan 2022 09:54:39 -0500
-Subject: [PATCH] UK holiday change 2022 (Spring bank holiday)
-
-applied to all 3 legal regions
-
-BUG: 448305
-FIXED-IN: 5.91
----
- holidays/plan2/holiday_gb-eaw_en-gb | 5 ++++-
- holidays/plan2/holiday_gb-nir_en-gb | 5 ++++-
- holidays/plan2/holiday_gb-sct_en-gb | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/holidays/plan2/holiday_gb-eaw_en-gb b/holidays/plan2/holiday_gb-eaw_en-gb
-index 64bdee7..4235247 100644
---- a/holidays/plan2/holiday_gb-eaw_en-gb
-+++ b/holidays/plan2/holiday_gb-eaw_en-gb
-@@ -27,8 +27,11 @@ description "National holiday file for England and Wales"
- "Easter Monday"                 public on easter plus 1
- "Royal Wedding"                 public on 29.4.2011
- "Early May Bank Holiday"        public on ((year == 2020) ? [may 8] : [first monday in may])
--"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] :
-+                                           ((year == 2022) ? [june 2] :
-+                                            [last monday in may]))
- "Diamond Jubilee Holiday"       public on 5.6.2012
-+"Platinum Jubilee Holiday"      public on 3.6.2022
- "Summer Bank Holiday"           public on last monday in august
- "Christmas Day"                 public religious on december 25
- "Christmas Day Bank Holiday"    public on ( (([december 25] == [saturday after ([december 25])]) || ([december 25] == [sunday after ([december 25])])) ?
-diff --git a/holidays/plan2/holiday_gb-nir_en-gb b/holidays/plan2/holiday_gb-nir_en-gb
-index 677f290..85c2de6 100644
---- a/holidays/plan2/holiday_gb-nir_en-gb
-+++ b/holidays/plan2/holiday_gb-nir_en-gb
-@@ -33,8 +33,11 @@ description "National holiday file for Northern Ireland"
- "Easter Monday"                             public on easter plus 1
- "Royal Wedding"                             public on 29.4.2011
- "Early May Bank Holiday"                    public on ((year == 2020) ? [may 8] : [first monday in may])
--"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] :
-+                                                       ((year == 2022) ? [june 2] :
-+                                                         [last monday in may]))
- "Diamond Jubilee Holiday"                   public on 5.6.2012
-+"Platinum Jubilee Holiday"                  public on 3.6.2022
- "Battle of the Boyne (Orangemen's Day)"     public on july 12
- "Battle of the Boyne Bank Holiday"          public on ( (([july 12] == [saturday after ([july 12])]) ||
-                                                           ([july 12] == [sunday after ([july 12])])) ?
-diff --git a/holidays/plan2/holiday_gb-sct_en-gb b/holidays/plan2/holiday_gb-sct_en-gb
-index 57d90d6..938d639 100644
---- a/holidays/plan2/holiday_gb-sct_en-gb
-+++ b/holidays/plan2/holiday_gb-sct_en-gb
-@@ -43,6 +43,7 @@ description "National holiday file for Scotland"
- "Royal Wedding"                     public on 29.4.2011
- "Early May Bank Holiday"            public on ((year == 2020) ? [may 8] : [first monday in may])
- "Diamond Jubilee Holiday"           public on 5.6.2012
-+"Platinum Jubilee Holiday"          public on 3.6.2022
- "Christmas Day"                     public religious on december 25
- "Christmas Day Substitute Holiday"  public on ( (([december 25] == [saturday after ([december 25])]) ||
-                                                   ([december 25] == [sunday after ([december 25])])) ?
-@@ -60,7 +61,9 @@ description "National holiday file for Scotland"
- 
- :: Financial
- "Good Friday Bank Holiday"          religious on easter minus 2
--"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] :
-+                                              ((year == 2022) ? [june 2] :
-+                                               [last monday in may]))
- "Summer Bank Holiday"               civil on first monday in august
- "St Andrew's Day Bank Holiday"      civil on ( (([november 30] == [saturday after ([november 30])]) ||
-                                                 ([november 30] == [sunday after ([november 30])])) ?
--- 
-GitLab
-
diff --git a/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild b/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild
deleted file mode 100644
index 503c030791ba..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-UK-2022-spring-bank-holiday.patch" )
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	ecm_src_test
-}
diff --git a/kde-frameworks/kholidays/kholidays-5.92.0.ebuild b/kde-frameworks/kholidays/kholidays-5.92.0.ebuild
index e5ccb350b590..0da2702df9c2 100644
--- a/kde-frameworks/kholidays/kholidays-5.92.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.92.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="