Gentoo Archives: gentoo-commits

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/
Date: Tue, 05 Jul 2016 18:13:37
Message-Id: 1467742398.4af4225f4fec0aa52f3a70b2a978cca4d2ce0493.djc@gentoo
1 commit: 4af4225f4fec0aa52f3a70b2a978cca4d2ce0493
2 Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 5 18:13:01 2016 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 5 18:13:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af4225f
7
8 sys-libs/timezone-data: version bump to 2016f
9
10 Package-Manager: portage-2.2.28
11
12 sys-libs/timezone-data/Manifest | 2 +
13 sys-libs/timezone-data/timezone-data-2016f.ebuild | 157 ++++++++++++++++++++++
14 2 files changed, 159 insertions(+)
15
16 diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
17 index b67ac22..c8c9a8b 100644
18 --- a/sys-libs/timezone-data/Manifest
19 +++ b/sys-libs/timezone-data/Manifest
20 @@ -1,4 +1,6 @@
21 DIST tzcode2016d.tar.gz 192870 SHA256 a8f33d6f87aef7e109e4769fc7f6e63637d52d07ddf6440a1a50df3d9a34e0ca SHA512 c6f6259a78fadaab293be0a4123c226d1a327588639cfa8dadb5a74bd58552892a0c87cfd3a33888f886f51aff34465c89505f0892e6bcbe24247a9160e7328c WHIRLPOOL 968e1e4d635853d81e3bb522543ca7c216f9110a0d20de612c0b1220fac926325e7b6f2a6381830ecb43e633ba29d66c08ec2c890cd8685793c4d66378022b82
22 DIST tzcode2016e.tar.gz 194647 SHA256 57d8c4fcd5e8a90657d0e298eac5effb1a642119c92308db68d13a4612fa459e SHA512 dcaf615ada96920e60ffb336253f53541861153decc156d41661f43e0bfb128c6c231b0b776bbe3f2176549346275fc5a879074f4977d5141228e58cb33a41c6 WHIRLPOOL e9397b1d4236062a95a46ed463378a295a1959593611536416aeeb8c72c98131cf059d065439f59ae2b40722129b1c2ede7d14dc131ed431042620e54133148d
23 +DIST tzcode2016f.tar.gz 194905 SHA256 72325f384490a310eeb2ea0fab7e6f011a5be19adab2ff9d83bf9d1993b066ed SHA512 97d084f4b0a688fef097dca256083ca9948393848d77c8ee637bdd26f859150cce7d2b26fc1165a3b44b28cc1c9075e10192332261ed68990b4b21a85438b023 WHIRLPOOL fa5b1dcc3c666fda497e715be1c3eb21cd69b080c0b703f6a45883caf05ddd7e06b7aee9a632c62a33b6f1b563b634b5491a24b72d5bd1f5116214f19822823c
24 DIST tzdata2016d.tar.gz 312481 SHA256 d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4 SHA512 f1beb1793c4c7d18f2dadaf4a928b1476f66b400bda0c87b06155c0dd1c4b4a26bb2f37dc17a3676a2bbe9c1e71a5d8b27a171c797a86464b0bc0d13abfb2f99 WHIRLPOOL c6933da933c10bb518fffb5b135bc0d5a717cc955cc75fe36e97e2df08bf07663e493786640def956055cab28e3ea3edfc0b71fa2303788fcafb82312380b060
25 DIST tzdata2016e.tar.gz 313684 SHA256 ba00f899f18dc4048d7fa21f5e1fdef434496084eedc06f6caa15e5ecdb6bd81 SHA512 dace0f6fc87a73879ca3a1b143d7dcf9c50803e23e6b8c91f83711704e28129af776676c547c42f14dee7f1e8e285ce25296e53a52d11f4c8f155b5f80f4beb3 WHIRLPOOL 69f5e70ae836c71c84c3bb1653887b15e2d408fe0927397a8f16f81b13ce1a23e1ad881084eb36b7785b3f129299830d03a5d2722029fdb8eed305c851661b7d
26 +DIST tzdata2016f.tar.gz 313286 SHA256 ed8c951008d12f1db55a11e96fc055718c6571233327d9de16a7f8475e2502b0 SHA512 0472f9516b6c3d83c0a5d0953a5535f4c48d9b9171e125f528188dac512f3556bc1805b7029c4f467a122cbce1beb4e804dd4ae63b259952de3bb217f8e8941d WHIRLPOOL 229b1c1b1bfb1fc8c0bcf33dccf546cd0a0b230161919249372dbe5a4d4d82a1b2bd42e5d3722b62ce8fe31479632bf0ae712aac876901d6acb95959b163f951
27
28 diff --git a/sys-libs/timezone-data/timezone-data-2016f.ebuild b/sys-libs/timezone-data/timezone-data-2016f.ebuild
29 new file mode 100644
30 index 0000000..570028d
31 --- /dev/null
32 +++ b/sys-libs/timezone-data/timezone-data-2016f.ebuild
33 @@ -0,0 +1,157 @@
34 +# Copyright 1999-2016 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +# $Id$
37 +
38 +EAPI="5"
39 +
40 +inherit eutils 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="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
46 +SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
47 + http://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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
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 + epatch "${FILESDIR}"/${PN}-2016c-makefile.patch
62 + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
63 +}
64 +
65 +src_configure() {
66 + tc-export CC
67 +
68 + append-lfs-flags #471102
69 +
70 + if use elibc_FreeBSD || use elibc_Darwin ; then
71 + append-cppflags -DSTD_INSPIRED #138251
72 + fi
73 +
74 + append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
75 + LDLIBS=""
76 + if use nls ; then
77 + # See if an external libintl is available. #154181 #578424
78 + local c="${T}/test"
79 + echo 'main(){}' > "${c}.c"
80 + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
81 + LDLIBS+=" -lintl"
82 + fi
83 + fi
84 +}
85 +
86 +_emake() {
87 + emake \
88 + TOPDIR="${EPREFIX}/usr" \
89 + REDO=$(usex leaps_timezone posix_right posix_only) \
90 + "$@"
91 +}
92 +
93 +src_compile() {
94 + # TOPDIR is used in some utils when compiling.
95 + _emake \
96 + AR="$(tc-getAR)" \
97 + CC="$(tc-getCC)" \
98 + RANLIB="$(tc-getRANLIB)" \
99 + CFLAGS="${CFLAGS} -std=gnu99" \
100 + LDFLAGS="${LDFLAGS}" \
101 + LDLIBS="${LDLIBS}"
102 + if tc-is-cross-compiler ; then
103 + _emake -C "${S}"-native \
104 + CC="$(tc-getBUILD_CC)" \
105 + CFLAGS="${BUILD_CFLAGS}" \
106 + CPPFLAGS="${BUILD_CPPFLAGS}" \
107 + LDFLAGS="${BUILD_LDFLAGS}" \
108 + LDLIBS="${LDLIBS}" \
109 + zic
110 + fi
111 +}
112 +
113 +src_install() {
114 + local zic=""
115 + tc-is-cross-compiler && zic="zic=${S}-native/zic"
116 + _emake install ${zic} DESTDIR="${D}"
117 + dodoc CONTRIBUTING README NEWS Theory
118 + dohtml *.htm
119 +}
120 +
121 +get_TIMEZONE() {
122 + local tz src="${EROOT}etc/timezone"
123 + if [[ -e ${src} ]] ; then
124 + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
125 + else
126 + tz="FOOKABLOIE"
127 + fi
128 + [[ -z ${tz} ]] && return 1 || echo "${tz}"
129 +}
130 +
131 +pkg_preinst() {
132 + local tz=$(get_TIMEZONE)
133 + if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
134 + eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
135 + eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the"
136 + eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not"
137 + eerror "be using right/xxx for the system timezone as it breaks programs."
138 + die "Please fix your timezone setting"
139 + fi
140 +
141 + # Trim the symlink by hand to avoid portage's automatic protection checks.
142 + rm -f "${EROOT}"/usr/share/zoneinfo/posix
143 +
144 + if has_version "<=${CATEGORY}/${PN}-2015c" ; then
145 + elog "Support for accessing posix/ and right/ directly has been dropped to match"
146 + elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
147 + elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post"
148 + elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
149 + fi
150 +}
151 +
152 +pkg_config() {
153 + # make sure the /etc/localtime file does not get stale #127899
154 + local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
155 +
156 + # If it's a symlink, assume the user knows what they're doing and
157 + # they're managing it themselves. #511474
158 + if [[ -L ${etc_lt} ]] ; then
159 + einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
160 + return 0
161 + fi
162 +
163 + if ! tz=$(get_TIMEZONE) ; then
164 + einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
165 + return 0
166 + fi
167 + if [[ ${tz} == "FOOKABLOIE" ]] ; then
168 + elog "You do not have TIMEZONE set in ${src}."
169 +
170 + if [[ ! -e ${etc_lt} ]] ; then
171 + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
172 + elog "Setting ${etc_lt} to Factory."
173 + else
174 + elog "Skipping auto-update of ${etc_lt}."
175 + fi
176 + return 0
177 + fi
178 +
179 + if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
180 + elog "You have an invalid TIMEZONE setting in ${src}"
181 + elog "Your ${etc_lt} has been reset to Factory; enjoy!"
182 + tz="Factory"
183 + fi
184 + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
185 + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
186 +}
187 +
188 +pkg_postinst() {
189 + pkg_config
190 +}