Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kholidays/files/
Date: Sat, 07 May 2022 05:28:48
Message-Id: 1651901309.c93c5e0edf1385e353386f8af573f22f50edc632.sam@gentoo
1 commit: c93c5e0edf1385e353386f8af573f22f50edc632
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu May 5 18:24:28 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat May 7 05:28:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93c5e0e
7
8 kde-frameworks/kholidays: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 ...lidays-5.90.0-UK-2022-spring-bank-holiday.patch | 75 ----------------------
15 1 file changed, 75 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 15d630269b40..000000000000
20 --- a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
21 +++ /dev/null
22 @@ -1,75 +0,0 @@
23 -From f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 Mon Sep 17 00:00:00 2001
24 -From: Allen Winter <winter@×××.org>
25 -Date: Sat, 15 Jan 2022 09:54:39 -0500
26 -Subject: [PATCH] UK holiday change 2022 (Spring bank holiday)
27 -
28 -applied to all 3 legal regions
29 -
30 -BUG: 448305
31 -FIXED-IN: 5.91
32 ----
33 - holidays/plan2/holiday_gb-eaw_en-gb | 5 ++++-
34 - holidays/plan2/holiday_gb-nir_en-gb | 5 ++++-
35 - holidays/plan2/holiday_gb-sct_en-gb | 5 ++++-
36 - 3 files changed, 12 insertions(+), 3 deletions(-)
37 -
38 -diff --git a/holidays/plan2/holiday_gb-eaw_en-gb b/holidays/plan2/holiday_gb-eaw_en-gb
39 -index 64bdee7..4235247 100644
40 ---- a/holidays/plan2/holiday_gb-eaw_en-gb
41 -+++ b/holidays/plan2/holiday_gb-eaw_en-gb
42 -@@ -27,8 +27,11 @@ description "National holiday file for England and Wales"
43 - "Easter Monday" public on easter plus 1
44 - "Royal Wedding" public on 29.4.2011
45 - "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may])
46 --"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : [last monday in may])
47 -+"Spring Bank Holiday" public on ((year == 2012) ? [june 4] :
48 -+ ((year == 2022) ? [june 2] :
49 -+ [last monday in may]))
50 - "Diamond Jubilee Holiday" public on 5.6.2012
51 -+"Platinum Jubilee Holiday" public on 3.6.2022
52 - "Summer Bank Holiday" public on last monday in august
53 - "Christmas Day" public religious on december 25
54 - "Christmas Day Bank Holiday" public on ( (([december 25] == [saturday after ([december 25])]) || ([december 25] == [sunday after ([december 25])])) ?
55 -diff --git a/holidays/plan2/holiday_gb-nir_en-gb b/holidays/plan2/holiday_gb-nir_en-gb
56 -index 677f290..85c2de6 100644
57 ---- a/holidays/plan2/holiday_gb-nir_en-gb
58 -+++ b/holidays/plan2/holiday_gb-nir_en-gb
59 -@@ -33,8 +33,11 @@ description "National holiday file for Northern Ireland"
60 - "Easter Monday" public on easter plus 1
61 - "Royal Wedding" public on 29.4.2011
62 - "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may])
63 --"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : [last monday in may])
64 -+"Spring Bank Holiday" public on ((year == 2012) ? [june 4] :
65 -+ ((year == 2022) ? [june 2] :
66 -+ [last monday in may]))
67 - "Diamond Jubilee Holiday" public on 5.6.2012
68 -+"Platinum Jubilee Holiday" public on 3.6.2022
69 - "Battle of the Boyne (Orangemen's Day)" public on july 12
70 - "Battle of the Boyne Bank Holiday" public on ( (([july 12] == [saturday after ([july 12])]) ||
71 - ([july 12] == [sunday after ([july 12])])) ?
72 -diff --git a/holidays/plan2/holiday_gb-sct_en-gb b/holidays/plan2/holiday_gb-sct_en-gb
73 -index 57d90d6..938d639 100644
74 ---- a/holidays/plan2/holiday_gb-sct_en-gb
75 -+++ b/holidays/plan2/holiday_gb-sct_en-gb
76 -@@ -43,6 +43,7 @@ description "National holiday file for Scotland"
77 - "Royal Wedding" public on 29.4.2011
78 - "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may])
79 - "Diamond Jubilee Holiday" public on 5.6.2012
80 -+"Platinum Jubilee Holiday" public on 3.6.2022
81 - "Christmas Day" public religious on december 25
82 - "Christmas Day Substitute Holiday" public on ( (([december 25] == [saturday after ([december 25])]) ||
83 - ([december 25] == [sunday after ([december 25])])) ?
84 -@@ -60,7 +61,9 @@ description "National holiday file for Scotland"
85 -
86 - :: Financial
87 - "Good Friday Bank Holiday" religious on easter minus 2
88 --"Spring Bank Holiday" civil on ((year == 2012) ? [june 4] : [last monday in may])
89 -+"Spring Bank Holiday" civil on ((year == 2012) ? [june 4] :
90 -+ ((year == 2022) ? [june 2] :
91 -+ [last monday in may]))
92 - "Summer Bank Holiday" civil on first monday in august
93 - "St Andrew's Day Bank Holiday" civil on ( (([november 30] == [saturday after ([november 30])]) ||
94 - ([november 30] == [sunday after ([november 30])])) ?
95 ---
96 -GitLab
97 -