commit:     0fa0806eeefd33f5e076ef487fe93b25026d2855
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 12:34:13 2018 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 12:34:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa0806e

sys-libs/timezone-data: Version bump to 2018d

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sys-libs/timezone-data/Manifest                   |   2 +
 sys-libs/timezone-data/timezone-data-2018d.ebuild | 169 ++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 70a5bdded0e..c5c0ad8cfaf 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,6 @@
 DIST tzcode2017c.tar.gz 219346 BLAKE2B 
2ac64949343520c074718b33d42f73653fc2d355a1eb9ffc4ea1f59f33f8a06642bfed9778f99333c49bfb6226b10a263d078b04e2fd3de2a0d1cd35fb1f180e
 SHA512 
0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb
 DIST tzcode2018c.tar.gz 223876 BLAKE2B 
d0eaf4094c786a71d0ea4bbcf974044790f2631afa6ac5512cd2e787d400b5cf2dd3f2fcd5312f354dd1e57dc500d0134723d55a9ed94037128fc7ca9c29280d
 SHA512 
21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2
+DIST tzcode2018d.tar.gz 229888 BLAKE2B 
e18ccab84b22014900f07d8a2c11f86e0bd8bc06fdf85202de456dbbad5319cb4a15663d78e75fa2c2f5fc7aa27725afc3c1f49ff543cf9a56b5f66f877e43e8
 SHA512 
e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930
 DIST tzdata2017c.tar.gz 335571 BLAKE2B 
466eefacd5600d15685d973b16d98053b3610efd9a1a9c7c7f1f384dcde8950d037c25ef065a85876433f9e9483fa72c46bb28f9c4225c7fe38a6376ada91132
 SHA512 
feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
 DIST tzdata2018c.tar.gz 341074 BLAKE2B 
b2aff97cd4e9e094e4de93245e80b04c8aa4764199320beaf02633d16e230fa75908e5f088e67d837d91c7cc6b7a2757f90815fb7a439f35a73d9f59954a7016
 SHA512 
0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
+DIST tzdata2018d.tar.gz 351271 BLAKE2B 
3d3abb8e5e96537cff8d6bd36c815bf3f19907806feba7cebbe010ca927e72358ded91120514baf15cabb311b50139e28b74674a7adafabc192de5a154ccca59
 SHA512 
ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b

diff --git a/sys-libs/timezone-data/timezone-data-2018d.ebuild 
b/sys-libs/timezone-data/timezone-data-2018d.ebuild
new file mode 100644
index 00000000000..5fe7441ecd3
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2018d.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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";
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+IUSE="nls leaps_timezone elibc_FreeBSD"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+       !sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+       default
+       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\"'
+       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) \
+               TZDATA_TEXT= \
+               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 -j1 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
+       # 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 ${etc_lt} file is what you want; 
skipping update."
+               return 0
+       fi
+       if [[ ${tz} == "FOOKABLOIE" ]] ; then
+               elog "You do not have TIMEZONE set in ${src}."
+
+               if [[ ! -e ${etc_lt} ]] ; then
+                       cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+                       elog "Setting ${etc_lt} to Factory."
+               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
+       einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+       cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+       configure_tz_data
+}
+
+pkg_postinst() {
+       configure_tz_data
+}

Reply via email to