commit: 5d72037a546f4eb5897c355b530d47b89234a1b7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 2 06:29:01 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 2 06:33:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d72037a
sys-libs/timezone-data: backport Asia/Almaty fix This fixes tests from yesterday onwards. Closes: https://bugs.gentoo.org/925950 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/timezone-data-2024a-AsiaAlmaty.patch | 34 ++++++++++++++++++++++ ...-2024a.ebuild => timezone-data-2024a-r1.ebuild} | 10 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sys-libs/timezone-data/files/timezone-data-2024a-AsiaAlmaty.patch b/sys-libs/timezone-data/files/timezone-data-2024a-AsiaAlmaty.patch new file mode 100644 index 000000000000..994a2304f8bd --- /dev/null +++ b/sys-libs/timezone-data/files/timezone-data-2024a-AsiaAlmaty.patch @@ -0,0 +1,34 @@ +https://github.com/eggert/tz/commit/59d4a1ba633f020e09765ff272120ac1a21fc028 + +From 59d4a1ba633f020e09765ff272120ac1a21fc028 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <egg...@cs.ucla.edu> +Date: Thu, 29 Feb 2024 23:20:23 -0800 +Subject: [PATCH] Asia/Almaty matches Asia/Tashkent from now on +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This pacifies ‘make check_now’. +* NEWS: Mention this. +* zonenow.tab: Remove Asia/Almaty. +--- a/zonenow.tab ++++ b/zonenow.tab +@@ -199,7 +199,7 @@ XX +2518+05518 Asia/Dubai Russia; Caucasus; Persian Gulf; Seychelles; Réunion + XX +3431+06912 Asia/Kabul Afghanistan + # + # +05 +-XX +4120+06918 Asia/Tashkent Russia; west Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives ++XX +4120+06918 Asia/Tashkent Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives + # + # +05 - PKT + XX +2452+06703 Asia/Karachi Pakistan ("PKT") +@@ -215,8 +215,6 @@ XX +2743+08519 Asia/Kathmandu Nepal + # + # +06 + XX +2343+09025 Asia/Dhaka Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos +-# +06 until 2024-03-01; then +05 +-XX +4315+07657 Asia/Almaty Kazakhstan (except western areas) + # + # +06:30 + XX +1647+09610 Asia/Yangon Myanmar; Cocos + diff --git a/sys-libs/timezone-data/timezone-data-2024a.ebuild b/sys-libs/timezone-data/timezone-data-2024a-r1.ebuild similarity index 97% rename from sys-libs/timezone-data/timezone-data-2024a.ebuild rename to sys-libs/timezone-data/timezone-data-2024a-r1.ebuild index 61f6c34d928a..224790cf1918 100644 --- a/sys-libs/timezone-data/timezone-data-2024a.ebuild +++ b/sys-libs/timezone-data/timezone-data-2024a-r1.ebuild @@ -9,8 +9,10 @@ MY_CODE_VER=${PV} MY_DATA_VER=${PV} DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" HOMEPAGE="https://www.iana.org/time-zones"; -SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER}.tar.gz - https://www.iana.org/time-zones/repository/releases/tzcode${MY_CODE_VER}.tar.gz"; +SRC_URI=" + https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER}.tar.gz + https://www.iana.org/time-zones/repository/releases/tzcode${MY_CODE_VER}.tar.gz +" LICENSE="BSD public-domain" SLOT="0" @@ -23,6 +25,10 @@ RDEPEND=" !sys-libs/glibc[vanilla(+)] " +PATCHES=( + "${FILESDIR}"/${P}-AsiaAlmaty.patch +) + src_unpack() { mkdir "${S}" && cd "${S}" || die default
