commit:     3f0e31f8a68814fbdc7925e08c6f43552a3d2599
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 04:18:41 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 04:18:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0e31f8

sys-libs/timezone-data: version bump to 2021e

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 sys-libs/timezone-data/Manifest                   |   2 +
 sys-libs/timezone-data/timezone-data-2021e.ebuild | 196 ++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 95722eb438f..628049e5ff6 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,2 +1,4 @@
 DIST tzcode2021a.tar.gz 262204 BLAKE2B 
4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328
 SHA512 
bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
+DIST tzcode2021e.tar.gz 273644 BLAKE2B 
3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680
 SHA512 
87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
 DIST tzdata2021a.tar.gz 411892 BLAKE2B 
b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87
 SHA512 
7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
+DIST tzdata2021e.tar.gz 422509 BLAKE2B 
e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75
 SHA512 
c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119

diff --git a/sys-libs/timezone-data/timezone-data-2021e.ebuild 
b/sys-libs/timezone-data/timezone-data-2021e.ebuild
new file mode 100644
index 00000000000..6ff8d12c3bb
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2021e.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+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${data_ver}.tar.gz
+       
https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz";
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 elibc_FreeBSD 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
+
+       append-lfs-flags #471102
+
+       if use elibc_FreeBSD || use elibc_Darwin ; then
+               append-cppflags -DSTD_INSPIRED #138251
+       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. #154181 #578424
+               local c="${T}/test"
+               echo 'main(){}' > "${c}.c"
+               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
+}

Reply via email to