From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67837158090 for ; Sat, 7 May 2022 05:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8790FE0801; Sat, 7 May 2022 05:28:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 615A8E07FE for ; Sat, 7 May 2022 05:28:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68771341954 for ; Sat, 7 May 2022 05:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1D4E450 for ; Sat, 7 May 2022 05:28:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651901309.c93c5e0edf1385e353386f8af573f22f50edc632.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kholidays/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch X-VCS-Directories: kde-frameworks/kholidays/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c93c5e0edf1385e353386f8af573f22f50edc632 X-VCS-Branch: master Date: Sat, 7 May 2022 05:28:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4d17d8f-0e8b-4a03-a35c-2b906a269721 X-Archives-Hash: c65dfaa3f29c896ce51371f11691c293 commit: c93c5e0edf1385e353386f8af573f22f50edc632 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu May 5 18:24:28 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 7 05:28:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93c5e0e kde-frameworks/kholidays: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Sam James gentoo.org> ...lidays-5.90.0-UK-2022-spring-bank-holiday.patch | 75 ---------------------- 1 file changed, 75 deletions(-) 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 -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 -