Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/
Date: Fri, 19 Jul 2019 16:32:02
Message-Id: 1563553909.cf33424d3e464e680f72bb4ae274f21fd1a3d38b.whissi@gentoo
1 commit: cf33424d3e464e680f72bb4ae274f21fd1a3d38b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 19 16:29:14 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 19 16:31:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf33424d
7
8 sys-libs/timezone-data: bump to v2019b
9
10 Package-Manager: Portage-2.3.68, Repoman-2.3.16
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sys-libs/timezone-data/Manifest | 2 +
14 sys-libs/timezone-data/timezone-data-2019b.ebuild | 178 ++++++++++++++++++++++
15 2 files changed, 180 insertions(+)
16
17 diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
18 index f29939567ec..f776d8ad1b2 100644
19 --- a/sys-libs/timezone-data/Manifest
20 +++ b/sys-libs/timezone-data/Manifest
21 @@ -1,4 +1,6 @@
22 DIST tzcode2018i.tar.gz 242962 BLAKE2B 682a23c324b6d8e1a0d63c6140c82ca3a24017c0972e7f915ecad5e0838f8f57743ffa2c5d9cc9744739a0e7d791ddb21947618cd11635767800ac99307c9548 SHA512 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
23 DIST tzcode2019a.tar.gz 246449 BLAKE2B c54b72baf1c2471e96fa7f68693e047b71a80e0f2c116e14b42ac561c45c3e84bf7324a4fbc124b70ac5470e9a3b224e708a9864092f35070d7c592e65cbd7c9 SHA512 7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5
24 +DIST tzcode2019b.tar.gz 251196 BLAKE2B 73ed8d44675a25e0497b77cc20ca3cc5b137297e48ce679cb6e8d809f4f25d73631064e0f1c2d917b986baa10bad9369bac42d583573519e7f3a94c864b18886 SHA512 bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f
25 DIST tzdata2018i.tar.gz 377009 BLAKE2B fa28fdac145756368d4760c418742efd558e63fd9900fc4649971b683b162df5e566c6214a79ec46b48fc65af488a7e0e95ddb6176a4f9adb5b39bc634426143 SHA512 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
26 DIST tzdata2019a.tar.gz 378961 BLAKE2B f8ab67f1fac34ab81fa9995cd70399728e6755303354e29e90ef8c3c513806c2849f5332d170f52f99554ba387ea2cf2667cf70be6b85b68e25061d93879e3cd SHA512 d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa
27 +DIST tzdata2019b.tar.gz 384667 BLAKE2B c045d137cbb09e1109916dfdb1265ceb560d589ded9b05aa0cfe75f5fcb19057ded4d4f12f47c895020ed02bc4138de995eadac497eb3663579b094164d7e3ad SHA512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
28
29 diff --git a/sys-libs/timezone-data/timezone-data-2019b.ebuild b/sys-libs/timezone-data/timezone-data-2019b.ebuild
30 new file mode 100644
31 index 00000000000..07d15cc4959
32 --- /dev/null
33 +++ b/sys-libs/timezone-data/timezone-data-2019b.ebuild
34 @@ -0,0 +1,178 @@
35 +# Copyright 1999-2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI="7"
39 +
40 +inherit toolchain-funcs flag-o-matic
41 +
42 +code_ver=${PV}
43 +data_ver=${PV}
44 +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
45 +HOMEPAGE="https://www.iana.org/time-zones"
46 +SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
47 + https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
48 +
49 +LICENSE="BSD public-domain"
50 +SLOT="0"
51 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
52 +IUSE="nls leaps_timezone elibc_FreeBSD"
53 +
54 +DEPEND="nls? ( virtual/libintl )"
55 +RDEPEND="${DEPEND}
56 + !sys-libs/glibc[vanilla(+)]"
57 +
58 +S=${WORKDIR}
59 +
60 +src_prepare() {
61 + default
62 +
63 + # check_web contacts validator.w3.org
64 + sed -i -e 's/check_tables check_web/check_tables/g' \
65 + Makefile || die "Failed to disable check_web"
66 +
67 + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
68 +}
69 +
70 +src_configure() {
71 + tc-export CC
72 +
73 + append-lfs-flags #471102
74 +
75 + if use elibc_FreeBSD || use elibc_Darwin ; then
76 + append-cppflags -DSTD_INSPIRED #138251
77 + fi
78 +
79 + append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
80 + LDLIBS=""
81 + if use nls ; then
82 + # See if an external libintl is available. #154181 #578424
83 + local c="${T}/test"
84 + echo 'main(){}' > "${c}.c"
85 + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
86 + LDLIBS+=" -lintl"
87 + fi
88 + fi
89 +}
90 +
91 +_emake() {
92 + emake \
93 + REDO=$(usex leaps_timezone posix_right posix_only) \
94 + TZDATA_TEXT= \
95 + TOPDIR="${EPREFIX}" \
96 + ZICDIR='$(TOPDIR)/usr/bin' \
97 + "$@"
98 +}
99 +
100 +src_compile() {
101 + _emake \
102 + AR="$(tc-getAR)" \
103 + cc="$(tc-getCC)" \
104 + RANLIB="$(tc-getRANLIB)" \
105 + CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
106 + LDFLAGS="${LDFLAGS}" \
107 + LDLIBS="${LDLIBS}"
108 + if tc-is-cross-compiler ; then
109 + _emake -C "${S}"-native \
110 + AR="$(tc-getBUILD_AR)" \
111 + cc="$(tc-getBUILD_CC)" \
112 + RANLIB="$(tc-getBUILD_RANLIB)" \
113 + CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
114 + LDFLAGS="${BUILD_LDFLAGS}" \
115 + LDLIBS="${LDLIBS}" \
116 + zic
117 + fi
118 +}
119 +
120 +src_test() {
121 + # VALIDATE_ENV is used for extended/web based tests. Punt on them.
122 + emake -j1 check VALIDATE_ENV=true
123 +}
124 +
125 +src_install() {
126 + local zic=""
127 + tc-is-cross-compiler && zic="zic=${S}-native/zic"
128 + _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
129 + rm -rf "${D}/nukeit" "${ED}/etc" || die
130 +
131 + insinto /usr/share/zoneinfo
132 + doins "${S}"/leap-seconds.list
133 +
134 + # Delete man pages installed by man-pages package.
135 + rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
136 + dodoc CONTRIBUTING README NEWS *.html
137 +}
138 +
139 +get_TIMEZONE() {
140 + local tz src="${EROOT}etc/timezone"
141 + if [[ -e ${src} ]] ; then
142 + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
143 + else
144 + tz="FOOKABLOIE"
145 + fi
146 + [[ -z ${tz} ]] && return 1 || echo "${tz}"
147 +}
148 +
149 +pkg_preinst() {
150 + local tz=$(get_TIMEZONE)
151 + if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
152 + eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
153 + eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
154 + eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
155 + eerror "be using right/xxx for the system timezone as it breaks programs."
156 + die "Please fix your timezone setting"
157 + fi
158 +
159 + # Trim the symlink by hand to avoid portage's automatic protection checks.
160 + rm -f "${EROOT}"/usr/share/zoneinfo/posix
161 +
162 + if has_version "<=${CATEGORY}/${PN}-2015c" ; then
163 + elog "Support for accessing posix/ and right/ directly has been dropped to match"
164 + elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
165 + elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
166 + elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
167 + fi
168 +}
169 +
170 +configure_tz_data() {
171 + # make sure the /etc/localtime file does not get stale #127899
172 + local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
173 +
174 + # If it's a symlink, assume the user knows what they're doing and
175 + # they're managing it themselves. #511474
176 + if [[ -L ${etc_lt} ]] ; then
177 + einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
178 + return 0
179 + fi
180 +
181 + if ! tz=$(get_TIMEZONE) ; then
182 + einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
183 + return 0
184 + fi
185 + if [[ ${tz} == "FOOKABLOIE" ]] ; then
186 + elog "You do not have TIMEZONE set in ${src}."
187 +
188 + if [[ ! -e ${etc_lt} ]] ; then
189 + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
190 + elog "Setting ${etc_lt} to Factory."
191 + else
192 + elog "Skipping auto-update of ${etc_lt}."
193 + fi
194 + return 0
195 + fi
196 +
197 + if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
198 + elog "You have an invalid TIMEZONE setting in ${src}"
199 + elog "Your ${etc_lt} has been reset to Factory; enjoy!"
200 + tz="Factory"
201 + fi
202 + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
203 + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
204 +}
205 +
206 +pkg_config() {
207 + configure_tz_data
208 +}
209 +
210 +pkg_postinst() {
211 + configure_tz_data
212 +}