mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-08 18:27:07 -08:00
sys-libs/timezone-data: drop 2024a-r1, 2024b
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,4 +1 @@
|
||||
DIST tzcode2024a.tar.gz 301595 BLAKE2B f3b8d1e7735ad858d071df564a8e11ac4d252b97a5729fa6c282112ff3903f7d35897735920b4466a926ef647dc283356879134046805411c694efd3fd89b282 SHA512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c
|
||||
DIST tzdata2024a.tar.gz 451270 BLAKE2B 5ec49bbce704411a1d8b3f018b0d8f6c7de24c5600e0cb6c61a7ee29b4a49b1e502d23b40bce6584ea0aa9b66327321608cbabb994071ec4ca2b3a496aa2d621 SHA512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236
|
||||
DIST tzdb-2024b.tar.lz 544381 BLAKE2B 7e9e7d88aa25813c461bd9a9653fcb5e9b212bd07f7c6d5632a75e7f2200af121382ffe98bdf2a88f21b88e1fcebb3fee1bdc39322fe65520084144065d3445f SHA512 72446e5cf445515512437c8deaae3063b093aab9620d6441cafaa9b3b71603c857f7ba53557579595788bbc901cd6142404b4db6b0e9f2b23d57b2b3cbc837a8
|
||||
DIST tzdb-2025a.tar.lz 548434 BLAKE2B cccd37ca71bfde7e56ed5138be5a610ec9d5ca59658b90e5e2a10af9221ed6d09b24b106bef46b04bbc97bff74b6e97a1f800c078a523aa32c13416a33264df2 SHA512 1e8c4e141158d63ca5c39babc9d18c32df14e2e59bc7649a7fed8c3e577f7b175bafa43883cf351139ff198515f5f8c22b1418e2ac7efb7f837faa8f61d2574d
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
https://github.com/eggert/tz/commit/59d4a1ba633f020e09765ff272120ac1a21fc028
|
||||
|
||||
From 59d4a1ba633f020e09765ff272120ac1a21fc028 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@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
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
https://github.com/eggert/tz/commit/926b507fa5c3192b1b68fab5910cbd3ba9377c97
|
||||
|
||||
From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 5 Sep 2024 14:36:02 -0700
|
||||
Subject: [PATCH] "Apr", not "April", in IN column
|
||||
|
||||
* northamerica (Rule): Use "Apr", not "April", in the IN column.
|
||||
Both forms are valid, but "Apr" is more consistent.
|
||||
Problem reported by Howard Hinnant.
|
||||
--- a/northamerica
|
||||
+++ b/northamerica
|
||||
@@ -2631,7 +2631,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
-Rule Mexico 1931 only - April 30 0:00 1:00 D
|
||||
+Rule Mexico 1931 only - Apr 30 0:00 1:00 D
|
||||
Rule Mexico 1931 only - Oct 1 0:00 0 S
|
||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
||||
|
||||
@@ -1,202 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs flag-o-matic
|
||||
|
||||
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
|
||||
"
|
||||
|
||||
LICENSE="BSD public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="nls leaps-timezone zic-slim"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-libs/glibc[vanilla(+)]
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-AsiaAlmaty.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
mkdir "${S}" && cd "${S}" || die
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# check_web contacts validator.w3.org
|
||||
sed -i -e 's/check_tables check_web/check_tables/g' \
|
||||
Makefile || die "Failed to disable check_web"
|
||||
|
||||
if tc-is-cross-compiler ; then
|
||||
cp -pR "${S}" "${S}"-native || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
# bug #471102
|
||||
append-lfs-flags
|
||||
|
||||
if use elibc_Darwin ; then
|
||||
# bug #138251
|
||||
append-cppflags -DSTD_INSPIRED
|
||||
fi
|
||||
|
||||
append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
|
||||
|
||||
# Upstream default is 'slim', but it breaks quite a few programs
|
||||
# that parse /etc/localtime directly: bug #747538.
|
||||
append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
|
||||
|
||||
LDLIBS=""
|
||||
if use nls ; then
|
||||
# See if an external libintl is available. bug #154181, bug #578424
|
||||
local c="${T}/test"
|
||||
echo 'int main(){}' > "${c}.c" || die
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
|
||||
LDLIBS+=" -lintl"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
_emake() {
|
||||
emake \
|
||||
REDO=$(usex leaps-timezone posix_right posix_only) \
|
||||
TOPDIR="${EPREFIX}" \
|
||||
ZICDIR='$(TOPDIR)/usr/bin' \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CC RANLIB
|
||||
|
||||
_emake \
|
||||
CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
LDLIBS="${LDLIBS}"
|
||||
|
||||
if tc-is-cross-compiler ; then
|
||||
_emake -C "${S}"-native \
|
||||
AR="$(tc-getBUILD_AR)" \
|
||||
CC="$(tc-getBUILD_CC)" \
|
||||
RANLIB="$(tc-getBUILD_RANLIB)" \
|
||||
CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
LDLIBS="${LDLIBS}" \
|
||||
zic
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# VALIDATE_ENV is used for extended/web based tests. Punt on them.
|
||||
emake check VALIDATE_ENV=true
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local zic=""
|
||||
tc-is-cross-compiler && zic="zic=${S}-native/zic"
|
||||
_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
|
||||
rm -rf "${D}/nukeit" "${ED}/etc" || die
|
||||
|
||||
insinto /usr/share/zoneinfo
|
||||
doins "${S}"/leap-seconds.list
|
||||
|
||||
# Delete man pages installed by man-pages package.
|
||||
rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
|
||||
dodoc CONTRIBUTING README NEWS *.html
|
||||
}
|
||||
|
||||
get_TIMEZONE() {
|
||||
local tz src="${EROOT}/etc/timezone"
|
||||
if [[ -e ${src} ]] ; then
|
||||
tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
|
||||
else
|
||||
tz="FOOKABLOIE"
|
||||
fi
|
||||
|
||||
[[ -z ${tz} ]] && return 1 || echo "${tz}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local tz=$(get_TIMEZONE)
|
||||
if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
|
||||
eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
|
||||
eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
|
||||
eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
|
||||
eerror "be using right/xxx for the system timezone as it breaks programs."
|
||||
die "Please fix your timezone setting"
|
||||
fi
|
||||
|
||||
# Trim the symlink by hand to avoid portage's automatic protection checks.
|
||||
rm -f "${EROOT}"/usr/share/zoneinfo/posix
|
||||
}
|
||||
|
||||
configure_tz_data() {
|
||||
# Make sure the /etc/localtime file does not get stale, bug #127899
|
||||
local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
|
||||
|
||||
# If it's a symlink, assume the user knows what they're doing and
|
||||
# they're managing it themselves, bug #511474
|
||||
if [[ -L "${etc_lt}" ]] ; then
|
||||
einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! tz=$(get_TIMEZONE) ; then
|
||||
einfo "Assuming your empty ${src} file is what you want; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "${tz}" == "FOOKABLOIE" ]] ; then
|
||||
einfo "You do not have a timezone set in ${src}; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
|
||||
|
||||
if [[ ! -e ${tzpath} ]]; then
|
||||
ewarn "The timezone specified in ${src} is not valid!"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ -f ${etc_lt} ]]; then
|
||||
# If a regular file already exists, copy over it.
|
||||
ewarn "Found a regular file at ${etc_lt}."
|
||||
ewarn "Some software may expect a symlink instead."
|
||||
ewarn "You may convert it to a symlink by removing the file and running:"
|
||||
ewarn " emerge --config sys-libs/timezone-data"
|
||||
einfo "Copying ${tzpath} to ${etc_lt}."
|
||||
cp -f "${tzpath}" "${etc_lt}"
|
||||
else
|
||||
# Otherwise, create a symlink and remove the timezone file.
|
||||
tzpath="../usr/share/zoneinfo/${tz}"
|
||||
einfo "Linking ${tzpath} at ${etc_lt}."
|
||||
if ln -snf "${tzpath}" "${etc_lt}"; then
|
||||
einfo "Removing ${src}."
|
||||
rm -f "${src}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
configure_tz_data
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
configure_tz_data
|
||||
}
|
||||
@@ -1,192 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs flag-o-matic unpacker
|
||||
|
||||
DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
|
||||
HOMEPAGE="https://www.iana.org/time-zones"
|
||||
SRC_URI="
|
||||
https://data.iana.org/time-zones/releases/tzdb-${PV}.tar.lz
|
||||
"
|
||||
S="${WORKDIR}"/tzdb-${PV}
|
||||
|
||||
LICENSE="BSD public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="nls leaps-timezone zic-slim"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-libs/glibc[vanilla(+)]
|
||||
"
|
||||
BDEPEND="$(unpacker_src_uri_depends)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-April-short.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if tc-is-cross-compiler ; then
|
||||
cp -pR "${S}" "${S}"-native || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
# bug #471102
|
||||
append-lfs-flags
|
||||
|
||||
if use elibc_Darwin ; then
|
||||
# bug #138251
|
||||
append-cppflags -DSTD_INSPIRED
|
||||
fi
|
||||
|
||||
append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
|
||||
|
||||
# Upstream default is 'slim', but it breaks quite a few programs
|
||||
# that parse /etc/localtime directly: bug #747538.
|
||||
append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
|
||||
|
||||
LDLIBS=""
|
||||
if use nls ; then
|
||||
# See if an external libintl is available. bug #154181, bug #578424
|
||||
local c="${T}/test"
|
||||
echo 'int main(){}' > "${c}.c" || die
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
|
||||
LDLIBS+=" -lintl"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
_emake() {
|
||||
emake \
|
||||
REDO=$(usex leaps-timezone posix_right posix_only) \
|
||||
TOPDIR="${EPREFIX}" \
|
||||
ZICDIR='$(TOPDIR)/usr/bin' \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CC RANLIB
|
||||
|
||||
_emake \
|
||||
CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
LDLIBS="${LDLIBS}"
|
||||
|
||||
if tc-is-cross-compiler ; then
|
||||
_emake -C "${S}"-native \
|
||||
AR="$(tc-getBUILD_AR)" \
|
||||
CC="$(tc-getBUILD_CC)" \
|
||||
RANLIB="$(tc-getBUILD_RANLIB)" \
|
||||
CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
LDLIBS="${LDLIBS}" \
|
||||
zic
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# CURL is used for extended/web based tests. Punt on them.
|
||||
emake check CURL=:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local zic=""
|
||||
tc-is-cross-compiler && zic="zic=${S}-native/zic"
|
||||
_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
|
||||
rm -rf "${D}/nukeit" "${ED}/etc" || die
|
||||
|
||||
insinto /usr/share/zoneinfo
|
||||
doins "${S}"/leap-seconds.list
|
||||
|
||||
# Delete man pages installed by man-pages package.
|
||||
rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
|
||||
dodoc CONTRIBUTING README NEWS *.html
|
||||
}
|
||||
|
||||
get_TIMEZONE() {
|
||||
local tz src="${EROOT}/etc/timezone"
|
||||
if [[ -e ${src} ]] ; then
|
||||
tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
|
||||
else
|
||||
tz="FOOKABLOIE"
|
||||
fi
|
||||
|
||||
[[ -z ${tz} ]] && return 1 || echo "${tz}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local tz=$(get_TIMEZONE)
|
||||
if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
|
||||
eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
|
||||
eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
|
||||
eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
|
||||
eerror "be using right/xxx for the system timezone as it breaks programs."
|
||||
die "Please fix your timezone setting"
|
||||
fi
|
||||
|
||||
# Trim the symlink by hand to avoid portage's automatic protection checks.
|
||||
rm -f "${EROOT}"/usr/share/zoneinfo/posix
|
||||
}
|
||||
|
||||
configure_tz_data() {
|
||||
# Make sure the /etc/localtime file does not get stale, bug #127899
|
||||
local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
|
||||
|
||||
# If it's a symlink, assume the user knows what they're doing and
|
||||
# they're managing it themselves, bug #511474
|
||||
if [[ -L "${etc_lt}" ]] ; then
|
||||
einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! tz=$(get_TIMEZONE) ; then
|
||||
einfo "Assuming your empty ${src} file is what you want; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "${tz}" == "FOOKABLOIE" ]] ; then
|
||||
einfo "You do not have a timezone set in ${src}; skipping update."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
|
||||
|
||||
if [[ ! -e ${tzpath} ]]; then
|
||||
ewarn "The timezone specified in ${src} is not valid!"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ -f ${etc_lt} ]]; then
|
||||
# If a regular file already exists, copy over it.
|
||||
ewarn "Found a regular file at ${etc_lt}."
|
||||
ewarn "Some software may expect a symlink instead."
|
||||
ewarn "You may convert it to a symlink by removing the file and running:"
|
||||
ewarn " emerge --config sys-libs/timezone-data"
|
||||
einfo "Copying ${tzpath} to ${etc_lt}."
|
||||
cp -f "${tzpath}" "${etc_lt}"
|
||||
else
|
||||
# Otherwise, create a symlink and remove the timezone file.
|
||||
tzpath="../usr/share/zoneinfo/${tz}"
|
||||
einfo "Linking ${tzpath} at ${etc_lt}."
|
||||
if ln -snf "${tzpath}" "${etc_lt}"; then
|
||||
einfo "Removing ${src}."
|
||||
rm -f "${src}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
configure_tz_data
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
configure_tz_data
|
||||
}
|
||||
Reference in New Issue
Block a user