From 9dddb457fde2eec376ee22b569c9f7abfa9a4645 Mon Sep 17 00:00:00 2001 From: mischief Date: Wed, 27 May 2015 12:35:03 -0700 Subject: [PATCH 1/2] sys-libs/timezone-data: sync with upstream stable ebuild --- .../sys-libs/timezone-data/Manifest | 4 +- .../files/timezone-data-2013d-makefile.patch | 95 ----------- .../files/timezone-data-2015a-makefile.patch | 113 +++++++++++++ .../timezone-data/timezone-data-2013d.ebuild | 61 ------- .../timezone-data/timezone-data-2015b.ebuild | 155 ++++++++++++++++++ 5 files changed, 270 insertions(+), 158 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2013d.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest index cc446706b9..f9eee3cbc7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest @@ -1,2 +1,2 @@ -DIST tzcode2013d.tar.gz 138198 SHA256 2d9eb90c94644cddb74a490d1184ef9f88efcaa7a2b1bf88be0ee9eeeab707b6 SHA512 228648a2b7dd7f1e434c79e3a6d9cf7df04dfe22566a42c7ab8633a64953971df30c9e30eb28842ed22e10af99d03db9be59e7957f1fee0733a489166f77889a WHIRLPOOL 4604647c029a2a8cabfa886d93ed2c2ca4cdd7614dcb3225e73d8f526ce1921fe96977bf0bd472f55ea88916c3109c525a477e7610998be9e296ba29b66eb300 -DIST tzdata2013d.tar.gz 218918 SHA256 cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04 SHA512 dc4220c8c2113d899b8901561a1335eb4de31881622fd78f2470c625689efe08d50575aeb927d688fd5d24739f1d64222d40221091ff25f9ad61a65f0ca039d0 WHIRLPOOL 3f71d25aaa22ae7bb56e23eda33a24250706450cf2af7bd0a70a80d9a54ab3d1d60e09530a87bd5f4b3fa013570eaa742a69b8cdae9b6cc42912d12938caf706 +DIST tzcode2015b.tar.gz 183630 SHA256 e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76 SHA512 d9b56c8ec98d9158d10cf80df0181864c467a4387b8ced5701f466c40885ea524bc1d49b0e17c0a18d8006a423da1c1b9a7e74626c4a916dd37cbb85e04b2b0a WHIRLPOOL 9e57737318d00470a6315cda75ed0cc3b4bb7f57de4c60b0d3b527be12164ec7c390f285dde23102c764e2ff6b9473d2e4762642f7a3e716e746bcacb931eaad +DIST tzdata2015b.tar.gz 293482 SHA256 556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62 SHA512 767782b87e62a8f7a4dbcae595d16a54197c9e04ca974d7016d11f90ebaf2537b804d111f204af9052c68d4670afe0af0af9e5b150867a357fc199bb541368d0 WHIRLPOOL e6d7bd671dd17c44b9d51744bda2283b42d5e4b9b673e693976af2f52f2a03a9571d6604a30b88701ed11f69a3a797429c72274126c0f45e5a4b9637b589a632 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch deleted file mode 100644 index eb52f87f60..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch +++ /dev/null @@ -1,95 +0,0 @@ - - Fix up default paths - - Support env DESTDIR / LDFLAGS / CFLAGS / CC - - Use awk instead of nawk - - Don't build/install libtz.a - - Don't install man-pages provided by sys-apps/man-pages - - Move zic zdump to sbin and tzselect to bin ala glibc - - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc - - Install leaps zoneinfo into zoneinfo/right/ ala glibc - - Disable broken web test - - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh - - Flags to the linking are passed as LDFLAGS, not LFLAGS - - LDFLAGS was missed for the 'date' target - ---- a/Makefile -+++ b/Makefile -@@ -46,5 +46,5 @@ - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory -@@ -52,5 +52,5 @@ - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # Types to try, as an alternative to time_t. int64_t should be first. -@@ -59,5 +59,5 @@ - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . -@@ -67,5 +67,5 @@ - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. -@@ -293,6 +293,8 @@ - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c -@@ -335,11 +337,13 @@ - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -+ -mkdir $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. - -mkdir $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 -@@ -351,6 +355,4 @@ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -@@ -392,7 +394,7 @@ - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two -@@ -422,5 +424,5 @@ - chmod +x $@ - --check: check_character_set check_tables check_web -+check: check_character_set check_tables - - check_character_set: $(ENCHILADA) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch new file mode 100644 index 0000000000..2153d76498 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch @@ -0,0 +1,113 @@ + - Fix up default paths + - Support env CC + - Don't build/install libtz.a + - Don't install man-pages provided by sys-apps/man-pages + - Move zic, zdump to sbin and tzselect to bin ala glibc + - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc + - Install leaps zoneinfo into zoneinfo/right/ ala glibc + - Do not run network based unittests + +--- a/Makefile ++++ b/Makefile +@@ -45,21 +45,21 @@ POSIXRULES= America/New_York + + # Everything gets put in subdirectories of. . . + +-TOPDIR= /usr/local ++TOPDIR= /usr + + # "Compiled" time zone information is placed in the "TZDIR" directory + # (and subdirectories). + # Use an absolute path name for TZDIR unless you're just testing the software. + + TZDIR_BASENAME= zoneinfo +-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) ++TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) + + # Types to try, as an alternative to time_t. int64_t should be first. + TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t + + # The "tzselect", "zic", and "zdump" commands get installed in. . . + +-ETCDIR= $(TOPDIR)/etc ++SBINDIR= $(TOPDIR)/sbin + + # If you "make INSTALL", the "date" command gets installed in. . . + +@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin + + # Manual pages go in subdirectories of. . . + +-MANDIR= $(TOPDIR)/man ++MANDIR= $(TOPDIR)/share/man + + # Library functions are put in an archive in LIBDIR. + +@@ -298,8 +298,10 @@ GZIPFLAGS= -9n + + ############################################################################### + +-cc= cc +-CC= $(cc) -DTZDIR=\"$(TZDIR)\" ++CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" ++ifeq ($(NLS),1) ++CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++endif + + AR= ar + +@@ -352,17 +354,14 @@ ALL: all date + install: all $(DATA) $(REDO) $(MANS) + mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ +- $(DESTDIR)$(LIBDIR) \ ++ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 + $(ZIC) -y $(YEARISTYPE) \ + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. +- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. ++ cp zic zdump $(DESTDIR)$(SBINDIR)/. ++ cp tzselect $(DESTDIR)$(BINDIR)/. +- cp libtz.a $(DESTDIR)$(LIBDIR)/. +- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. +- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. + + INSTALL: ALL install date.1 + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 +@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA) + # to using them, or vice versa. + right_posix: right_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-leaps +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ ln -s . $(DESTDIR)$(TZDIR)/right || \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ ln -s . $(DESTDIR)$(TZDIR)/posix || \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) + + posix_packrat: posix_only backzone +@@ -440,7 +442,7 @@ tzselect: tzselect.ksh + chmod +x $@ + + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables + + check_character_set: $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2013d.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2013d.ebuild deleted file mode 100644 index f1c3e7de03..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2013d.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013d.ebuild,v 1.4 2014/01/18 02:22:57 vapier Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -code_ver=${PV} -data_ver=${PV} -DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" -HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" -SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz - http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz - ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz - ftp://munnari.oz.au/pub/tzcode${code_ver}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="nls elibc_FreeBSD elibc_glibc" - -RDEPEND="!/dev/null ; then + # In case of a failed upgrade, clean up the symlinks #506570 + if [ -L .gentoo-upgrade ] ; then + rm -rf posix .gentoo-upgrade + fi + if [ -d posix ] ; then + rm -rf .gentoo-upgrade #487192 + mv posix .gentoo-upgrade || die + ln -s .gentoo-upgrade posix || die + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2015a-makefile.patch + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +_emake() { + emake \ + TOPDIR="${EPREFIX}/usr" \ + REDO=$(usex right_timezone posix_right posix_only) \ + "$@" +} + +src_compile() { + local LDLIBS + tc-export CC + if use elibc_FreeBSD || use elibc_Darwin ; then + append-cppflags -DSTD_INSPIRED #138251 + fi + export NLS=$(usex nls 1 0) + if use nls && ! use elibc_glibc ; then + LDLIBS+=" -lintl" #154181 + fi + # TOPDIR is used in some utils when compiling. + _emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS} -std=gnu99" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="${LDLIBS}" + if tc-is-cross-compiler ; then + _emake -C "${S}"-native \ + CC="$(tc-getBUILD_CC)" \ + CFLAGS="${BUILD_CFLAGS}" \ + CPPFLAGS="${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic + fi +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + _emake install ${zic} DESTDIR="${D}" + dodoc CONTRIBUTING README NEWS Theory + dohtml *.htm + + # install the symlink by hand to not break existing timezones + if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then + dosym . /usr/share/zoneinfo/posix + fi +} + +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 ! use right_timezone && [[ ${tz} == right/* ]] ; then + eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." + die "Please fix your USE or timezone" + fi +} + +pkg_config() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" + + tz=$(get_TIMEZONE) || return 0 + if [[ ${tz} == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in ${src}." + + if [[ ! -e ${etc_lt} ]] ; then + # if /etc/localtime is a symlink somewhere, assume they + # know what they're doing and they're managing it themselves + if [[ ! -L ${etc_lt} ]] ; then + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" + elog "Setting ${etc_lt} to Factory." + else + elog "Assuming your ${etc_lt} symlink is what you want; skipping update." + fi + else + elog "Skipping auto-update of ${etc_lt}." + fi + return 0 + fi + + if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then + elog "You have an invalid TIMEZONE setting in ${src}" + elog "Your ${etc_lt} has been reset to Factory; enjoy!" + tz="Factory" + fi + if [[ -L ${etc_lt} ]]; then + einfo "Skipping symlinked ${etc_lt}" + else + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + fi +} + +pkg_postinst() { + rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & + pkg_config + wait +} + From d593bb95370f53ae2fa92c44bb6efcf1c5c61766 Mon Sep 17 00:00:00 2001 From: mischief Date: Wed, 27 May 2015 12:47:43 -0700 Subject: [PATCH 2/2] sys-libs/timezone-data: remove code that sets /etc/localtime we set leave /etc/localtime unset so that the default timezone is UTC. fixes #1265 --- ...b.ebuild => timezone-data-2015b-r1.ebuild} | 58 +------------------ 1 file changed, 1 insertion(+), 57 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/{timezone-data-2015b.ebuild => timezone-data-2015b-r1.ebuild} (62%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b-r1.ebuild similarity index 62% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b-r1.ebuild index 4d3b793751..8d362a0462 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2015b-r1.ebuild @@ -93,63 +93,7 @@ src_install() { fi } -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 ! use right_timezone && [[ ${tz} == right/* ]] ; then - eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." - die "Please fix your USE or timezone" - fi -} - -pkg_config() { - # make sure the /etc/localtime file does not get stale #127899 - local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" - - tz=$(get_TIMEZONE) || return 0 - if [[ ${tz} == "FOOKABLOIE" ]] ; then - elog "You do not have TIMEZONE set in ${src}." - - if [[ ! -e ${etc_lt} ]] ; then - # if /etc/localtime is a symlink somewhere, assume they - # know what they're doing and they're managing it themselves - if [[ ! -L ${etc_lt} ]] ; then - cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" - elog "Setting ${etc_lt} to Factory." - else - elog "Assuming your ${etc_lt} symlink is what you want; skipping update." - fi - else - elog "Skipping auto-update of ${etc_lt}." - fi - return 0 - fi - - if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then - elog "You have an invalid TIMEZONE setting in ${src}" - elog "Your ${etc_lt} has been reset to Factory; enjoy!" - tz="Factory" - fi - if [[ -L ${etc_lt} ]]; then - einfo "Skipping symlinked ${etc_lt}" - else - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" - fi -} - pkg_postinst() { - rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & - pkg_config - wait + rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade }