mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
sys-libs/timezone-data: drop 2022c, 2022e
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,6 +1,2 @@
|
||||
DIST tzcode2022c.tar.gz 280190 BLAKE2B 4c66b84da8b1e535b92f8be8f0a1fa32f3b050f3e7676370e3094b5098e7670455e506160f364c61cfba1a919b769da8864a5347f240107c750c723fcc5caa2f SHA512 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
|
||||
DIST tzcode2022e.tar.gz 280713 BLAKE2B 874dca6d7f347276a87a055853617c8943b3b297fd89c80a3e8d6318c81df15af88f8c58bc05d5088359c30aba0d496089df4835f888c3f76cb0ecf6cd231d3a SHA512 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060
|
||||
DIST tzcode2022f.tar.gz 284816 BLAKE2B 3bfcc25323edbdd41aadcbb5c8b0d9179a809a87b22afc9dda88a53c6daab742778956af7aa30722429d34601fb2ad3c4222c48497e0a429926cd05b79b9acfb SHA512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
|
||||
DIST tzdata2022c.tar.gz 432721 BLAKE2B 087a0e728c6052f91142ef11ad2092e573de99d787ed1e8ff62476b870ff2e3d222a19df01ad624cf06e543aa7e40df89dcd888b9e5fd12f8b5af90bdffc9ac9 SHA512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
|
||||
DIST tzdata2022e.tar.gz 433785 BLAKE2B 0c1aa99ac8c8f1a7a10602132da1e61921053ff7ed87449be73c45d23440457f28a2abe4dffd9775c4764e294dd9f92d15d3d401caf07a9d6d046fa27c4148f2 SHA512 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da
|
||||
DIST tzdata2022f.tar.gz 436352 BLAKE2B 8081972005ac84034957bb85013b373df67937c3f811e33c44fad7ecee0f504b946766fdb1f525d0512b9a8d8e727ee3d8d44640ff55bed3fcd1f3fb3c464c17 SHA512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
|
||||
|
||||
@@ -1,200 +0,0 @@
|
||||
# Copyright 1999-2022 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls leaps-timezone zic-slim"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
RDEPEND="${DEPEND}
|
||||
!sys-libs/glibc[vanilla(+)]"
|
||||
|
||||
src_unpack() {
|
||||
mkdir -p "${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"
|
||||
|
||||
tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
|
||||
}
|
||||
|
||||
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 '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() {
|
||||
_emake \
|
||||
AR="$(tc-getAR)" \
|
||||
cc="$(tc-getCC)" \
|
||||
RANLIB="$(tc-getRANLIB)" \
|
||||
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
|
||||
|
||||
if has_version "<=${CATEGORY}/${PN}-2015c" ; then
|
||||
elog "Support for accessing posix/ and right/ directly has been dropped to match"
|
||||
elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
|
||||
elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
|
||||
elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
|
||||
fi
|
||||
}
|
||||
|
||||
configure_tz_data() {
|
||||
# make sure the /etc/localtime file does not get stale #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. #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,197 +0,0 @@
|
||||
# Copyright 1999-2022 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls leaps-timezone zic-slim"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-libs/glibc[vanilla(+)]
|
||||
"
|
||||
|
||||
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 '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() {
|
||||
_emake \
|
||||
AR="$(tc-getAR)" \
|
||||
cc="$(tc-getCC)" \
|
||||
RANLIB="$(tc-getRANLIB)" \
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user