1 |
commit: bc6d2bc7660077a54e30a7cf63f9d35ddfef245b |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 09:48:59 2018 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 10:00:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6d2bc7 |
7 |
|
8 |
sys-libs/timezone-data: version bump to 2018e |
9 |
|
10 |
sys-libs/timezone-data/Manifest | 2 + |
11 |
sys-libs/timezone-data/timezone-data-2018e.ebuild | 169 ++++++++++++++++++++++ |
12 |
2 files changed, 171 insertions(+) |
13 |
|
14 |
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest |
15 |
index c5c0ad8cfaf..6d850b6c4fa 100644 |
16 |
--- a/sys-libs/timezone-data/Manifest |
17 |
+++ b/sys-libs/timezone-data/Manifest |
18 |
@@ -1,6 +1,8 @@ |
19 |
DIST tzcode2017c.tar.gz 219346 BLAKE2B 2ac64949343520c074718b33d42f73653fc2d355a1eb9ffc4ea1f59f33f8a06642bfed9778f99333c49bfb6226b10a263d078b04e2fd3de2a0d1cd35fb1f180e SHA512 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb |
20 |
DIST tzcode2018c.tar.gz 223876 BLAKE2B d0eaf4094c786a71d0ea4bbcf974044790f2631afa6ac5512cd2e787d400b5cf2dd3f2fcd5312f354dd1e57dc500d0134723d55a9ed94037128fc7ca9c29280d SHA512 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 |
21 |
DIST tzcode2018d.tar.gz 229888 BLAKE2B e18ccab84b22014900f07d8a2c11f86e0bd8bc06fdf85202de456dbbad5319cb4a15663d78e75fa2c2f5fc7aa27725afc3c1f49ff543cf9a56b5f66f877e43e8 SHA512 e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930 |
22 |
+DIST tzcode2018e.tar.gz 231732 BLAKE2B 5e73cd4d005413e3be56dfa01b5d023a6f07a37f84c0c2ac2eb126319fb8c34f435541b79f7f9776d3ef155e5db026ce8818a555687061fbf466220cb27c7343 SHA512 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 |
23 |
DIST tzdata2017c.tar.gz 335571 BLAKE2B 466eefacd5600d15685d973b16d98053b3610efd9a1a9c7c7f1f384dcde8950d037c25ef065a85876433f9e9483fa72c46bb28f9c4225c7fe38a6376ada91132 SHA512 feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c |
24 |
DIST tzdata2018c.tar.gz 341074 BLAKE2B b2aff97cd4e9e094e4de93245e80b04c8aa4764199320beaf02633d16e230fa75908e5f088e67d837d91c7cc6b7a2757f90815fb7a439f35a73d9f59954a7016 SHA512 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 |
25 |
DIST tzdata2018d.tar.gz 351271 BLAKE2B 3d3abb8e5e96537cff8d6bd36c815bf3f19907806feba7cebbe010ca927e72358ded91120514baf15cabb311b50139e28b74674a7adafabc192de5a154ccca59 SHA512 ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b |
26 |
+DIST tzdata2018e.tar.gz 353953 BLAKE2B eaa18546434f71541567de75df17e03f8b7e4b5397e2b22e41d3ba51ba26dfe08a311926329737d9175df5e3a554ba06237cb12ff80a93a7ca441ceb7cd02710 SHA512 d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae |
27 |
|
28 |
diff --git a/sys-libs/timezone-data/timezone-data-2018e.ebuild b/sys-libs/timezone-data/timezone-data-2018e.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..d10a3eaf43e |
31 |
--- /dev/null |
32 |
+++ b/sys-libs/timezone-data/timezone-data-2018e.ebuild |
33 |
@@ -0,0 +1,169 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+ |
39 |
+inherit toolchain-funcs flag-o-matic |
40 |
+ |
41 |
+code_ver=${PV} |
42 |
+data_ver=${PV} |
43 |
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
44 |
+HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
45 |
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
46 |
+ http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
47 |
+ |
48 |
+LICENSE="BSD public-domain" |
49 |
+SLOT="0" |
50 |
+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" |
51 |
+IUSE="nls leaps_timezone elibc_FreeBSD" |
52 |
+ |
53 |
+DEPEND="nls? ( virtual/libintl )" |
54 |
+RDEPEND="${DEPEND} |
55 |
+ !sys-libs/glibc[vanilla(+)]" |
56 |
+ |
57 |
+S=${WORKDIR} |
58 |
+ |
59 |
+src_prepare() { |
60 |
+ default |
61 |
+ tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
62 |
+} |
63 |
+ |
64 |
+src_configure() { |
65 |
+ tc-export CC |
66 |
+ |
67 |
+ append-lfs-flags #471102 |
68 |
+ |
69 |
+ if use elibc_FreeBSD || use elibc_Darwin ; then |
70 |
+ append-cppflags -DSTD_INSPIRED #138251 |
71 |
+ fi |
72 |
+ |
73 |
+ append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' |
74 |
+ LDLIBS="" |
75 |
+ if use nls ; then |
76 |
+ # See if an external libintl is available. #154181 #578424 |
77 |
+ local c="${T}/test" |
78 |
+ echo 'main(){}' > "${c}.c" |
79 |
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then |
80 |
+ LDLIBS+=" -lintl" |
81 |
+ fi |
82 |
+ fi |
83 |
+} |
84 |
+ |
85 |
+_emake() { |
86 |
+ emake \ |
87 |
+ REDO=$(usex leaps_timezone posix_right posix_only) \ |
88 |
+ TZDATA_TEXT= \ |
89 |
+ TOPDIR="${EPREFIX}" \ |
90 |
+ ZICDIR='$(TOPDIR)/usr/bin' \ |
91 |
+ "$@" |
92 |
+} |
93 |
+ |
94 |
+src_compile() { |
95 |
+ _emake \ |
96 |
+ AR="$(tc-getAR)" \ |
97 |
+ cc="$(tc-getCC)" \ |
98 |
+ RANLIB="$(tc-getRANLIB)" \ |
99 |
+ CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ |
100 |
+ LDFLAGS="${LDFLAGS}" \ |
101 |
+ LDLIBS="${LDLIBS}" |
102 |
+ if tc-is-cross-compiler ; then |
103 |
+ _emake -C "${S}"-native \ |
104 |
+ AR="$(tc-getBUILD_AR)" \ |
105 |
+ cc="$(tc-getBUILD_CC)" \ |
106 |
+ RANLIB="$(tc-getBUILD_RANLIB)" \ |
107 |
+ CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ |
108 |
+ LDFLAGS="${BUILD_LDFLAGS}" \ |
109 |
+ LDLIBS="${LDLIBS}" \ |
110 |
+ zic |
111 |
+ fi |
112 |
+} |
113 |
+ |
114 |
+src_test() { |
115 |
+ # VALIDATE_ENV is used for extended/web based tests. Punt on them. |
116 |
+ emake -j1 check VALIDATE_ENV=true |
117 |
+} |
118 |
+ |
119 |
+src_install() { |
120 |
+ local zic="" |
121 |
+ tc-is-cross-compiler && zic="zic=${S}-native/zic" |
122 |
+ _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" |
123 |
+ rm -rf "${D}/nukeit" "${ED}/etc" || die |
124 |
+ # Delete man pages installed by man-pages package. |
125 |
+ rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die |
126 |
+ dodoc CONTRIBUTING README NEWS *.html |
127 |
+} |
128 |
+ |
129 |
+get_TIMEZONE() { |
130 |
+ local tz src="${EROOT}etc/timezone" |
131 |
+ if [[ -e ${src} ]] ; then |
132 |
+ tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
133 |
+ else |
134 |
+ tz="FOOKABLOIE" |
135 |
+ fi |
136 |
+ [[ -z ${tz} ]] && return 1 || echo "${tz}" |
137 |
+} |
138 |
+ |
139 |
+pkg_preinst() { |
140 |
+ local tz=$(get_TIMEZONE) |
141 |
+ if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then |
142 |
+ eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" |
143 |
+ eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" |
144 |
+ eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" |
145 |
+ eerror "be using right/xxx for the system timezone as it breaks programs." |
146 |
+ die "Please fix your timezone setting" |
147 |
+ fi |
148 |
+ |
149 |
+ # Trim the symlink by hand to avoid portage's automatic protection checks. |
150 |
+ rm -f "${EROOT}"/usr/share/zoneinfo/posix |
151 |
+ |
152 |
+ if has_version "<=${CATEGORY}/${PN}-2015c" ; then |
153 |
+ elog "Support for accessing posix/ and right/ directly has been dropped to match" |
154 |
+ elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." |
155 |
+ elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" |
156 |
+ elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" |
157 |
+ fi |
158 |
+} |
159 |
+ |
160 |
+configure_tz_data() { |
161 |
+ # make sure the /etc/localtime file does not get stale #127899 |
162 |
+ local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
163 |
+ |
164 |
+ # If it's a symlink, assume the user knows what they're doing and |
165 |
+ # they're managing it themselves. #511474 |
166 |
+ if [[ -L ${etc_lt} ]] ; then |
167 |
+ einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." |
168 |
+ return 0 |
169 |
+ fi |
170 |
+ |
171 |
+ if ! tz=$(get_TIMEZONE) ; then |
172 |
+ einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." |
173 |
+ return 0 |
174 |
+ fi |
175 |
+ if [[ ${tz} == "FOOKABLOIE" ]] ; then |
176 |
+ elog "You do not have TIMEZONE set in ${src}." |
177 |
+ |
178 |
+ if [[ ! -e ${etc_lt} ]] ; then |
179 |
+ cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
180 |
+ elog "Setting ${etc_lt} to Factory." |
181 |
+ else |
182 |
+ elog "Skipping auto-update of ${etc_lt}." |
183 |
+ fi |
184 |
+ return 0 |
185 |
+ fi |
186 |
+ |
187 |
+ if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
188 |
+ elog "You have an invalid TIMEZONE setting in ${src}" |
189 |
+ elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
190 |
+ tz="Factory" |
191 |
+ fi |
192 |
+ einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
193 |
+ cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
194 |
+} |
195 |
+ |
196 |
+pkg_config() { |
197 |
+ configure_tz_data |
198 |
+} |
199 |
+ |
200 |
+pkg_postinst() { |
201 |
+ configure_tz_data |
202 |
+} |