1 |
commit: 0dffa8881be7dc4fa6a27aca18eef4391bed1a7d |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 02:14:57 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 02:19:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dffa888 |
7 |
|
8 |
sys-libs/timezone-data: drop old |
9 |
|
10 |
sys-libs/timezone-data/Manifest | 8 -- |
11 |
.../files/timezone-data-2015a-makefile.patch | 113 --------------- |
12 |
sys-libs/timezone-data/metadata.xml | 4 - |
13 |
sys-libs/timezone-data/timezone-data-2015a.ebuild | 154 --------------------- |
14 |
sys-libs/timezone-data/timezone-data-2015b.ebuild | 154 --------------------- |
15 |
.../timezone-data/timezone-data-2015c-r1.ebuild | 143 ------------------- |
16 |
sys-libs/timezone-data/timezone-data-2015c.ebuild | 154 --------------------- |
17 |
sys-libs/timezone-data/timezone-data-2015d.ebuild | 143 ------------------- |
18 |
8 files changed, 873 deletions(-) |
19 |
|
20 |
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest |
21 |
index 61338b4..8b21912 100644 |
22 |
--- a/sys-libs/timezone-data/Manifest |
23 |
+++ b/sys-libs/timezone-data/Manifest |
24 |
@@ -1,12 +1,4 @@ |
25 |
-DIST tzcode2015a.tar.gz 182993 SHA256 885bab11f286852f34030d7a86ede7d4126319ca74b8ee22be8ca7c17d72dd19 SHA512 80d3bd3aeb70e21552a599c6203670fe742ca8d270c3fc430a3045d8e8a6610ebfe74941532c0791d5a99d6e4bf5fbdf62918de57d377d3fd26e7f7f786c66a4 WHIRLPOOL de4d9ea9611cc47e71f6e64fc4b0f6c45e5b3c995268d6244ed58fdc9b5e6d896c0e3ce1299e04ae018681523dc1e57f2dfcd0fb7f03423a93282123eb8a0376 |
26 |
-DIST tzcode2015b.tar.gz 183630 SHA256 e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76 SHA512 d9b56c8ec98d9158d10cf80df0181864c467a4387b8ced5701f466c40885ea524bc1d49b0e17c0a18d8006a423da1c1b9a7e74626c4a916dd37cbb85e04b2b0a WHIRLPOOL 9e57737318d00470a6315cda75ed0cc3b4bb7f57de4c60b0d3b527be12164ec7c390f285dde23102c764e2ff6b9473d2e4762642f7a3e716e746bcacb931eaad |
27 |
-DIST tzcode2015c.tar.gz 184278 SHA256 7feeb1a60dff8b179c884f6e3aa7684606f4eaeb7f7ecc61a6bb81e3e38af42e SHA512 01f57e27c1031434e7da8876f30084dfef9dbe36988539c857f71f86c0ab1995f82c9fe5dad32ded12185c53433b7f1a0553d8848a2d97529981021ffd70dfb1 WHIRLPOOL b2dff9985ad6845ad368a35e471890e99c69f03cf6d92da9d0da362af1d0545e30485a7be1ca159444d49c148c2f1588b8fa3fd1161859cfa566365fb45ba341 |
28 |
-DIST tzcode2015d.tar.gz 184178 SHA256 221af54ec5c42eaf0101159ffe1256a883d1c14c46228d42774c656a56317128 SHA512 2cb4faced839d02e6313a7aacca4d2dfe6454186d9864ee4aa034f7280442e6a751cec2285bde2d5712962b733e107a46f2282469f6510b42d93972d6c34424a WHIRLPOOL d5760e6530f65a4aac86258cbec62b27c86952d0f5896fbc1f567af6aef025e453f455ba94805069706981ecd4806a22e09581dd38cfba18f892343eb2038e3d |
29 |
DIST tzcode2015e.tar.gz 185129 SHA256 b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0 SHA512 fdc568a68f4876b967b39e21fa53f063dc5756e886e2a273cc046d5a014eb517e9c91eb6e03d18c94a89ce48578868aed710790415c500188fce4e4add0ce7ca WHIRLPOOL d3fde26e0b0ebe98d7de0c2a666a79dd6020e471b647de2b61a89dc1eeba61e8928c7dcb2e1b15d867e8e81b5e33321a288a2b94e713deaf5579e00b6082e7b8 |
30 |
DIST tzcode2015f.tar.gz 180742 SHA256 0c95e0a42bb61141f790f4f5f204b954d7654c894aa54a594a215d6f38de84ae SHA512 5cfbebde8a0be57e8388a7b6d35aeba99130a72c1a41f9bbd5d5864511a473aa5e9320ab21055b4383e64b3b9d7682c0d30377ce8407619987be672436014710 WHIRLPOOL c657f8d6a77cd96f6fed296bc905fd5690abe47f7cf25d99ea6802d61cee619c75e70ea006a77a0680d4c46ea43f8fb509bbb32b7ecc0323996e44b462e17845 |
31 |
-DIST tzdata2015a.tar.gz 292131 SHA256 c52490917d00a8e7fc9b5f0b1b65ef6ec76d612b5b20c81bf86a04147af18e4c SHA512 ff36feb437238ba42fe67257e81ade0a2179d11f6c6449146e28e4b6553c62348b4131af75e440b4467109c9edba13e25ddaf701f2fcebb2a258b4ac9b57293c WHIRLPOOL 22d42c60e87948c691255282aea9e4c9d69b46db8c19ef1c06a262b5e6054e45fec39c5fa8d1dc24ad121ed70bd3dfa24ea61fe97961938b733262238d74b5bb |
32 |
-DIST tzdata2015b.tar.gz 293482 SHA256 556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62 SHA512 767782b87e62a8f7a4dbcae595d16a54197c9e04ca974d7016d11f90ebaf2537b804d111f204af9052c68d4670afe0af0af9e5b150867a357fc199bb541368d0 WHIRLPOOL e6d7bd671dd17c44b9d51744bda2283b42d5e4b9b673e693976af2f52f2a03a9571d6604a30b88701ed11f69a3a797429c72274126c0f45e5a4b9637b589a632 |
33 |
-DIST tzdata2015c.tar.gz 294353 SHA256 860fac5f5f57f7a2dfc1ba682dbd1f5c0f0b597f761571277b6ed6561e22365a SHA512 ca89c2041c8420e7b154660e227211b60ba20e8d70b6870b5c0a149838c588d13065202b1266c59caf22a99df2387da95ac04049b9ecb7939cd406c7f007a73e WHIRLPOOL e5806b47d3082b260837c675ac267a99ec45549070c66b5cbd6a51b7fe57802a555bfd54918093e83447089d965fe2459c5e9c6ea12c333080add280b012182f |
34 |
-DIST tzdata2015d.tar.gz 296131 SHA256 8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531 SHA512 37b5aa3c5e0d601c8b20fac08d7267c398a836e4190ef85625d5e86a806ba1baceb2315ba81a9a6c854eae4fce40e9c8f90cf5adade3f48ad443f77c221d8983 WHIRLPOOL c42972f20c8815557a9545f73bf3ff3b10a0148168a229641cb8e436da8ec337c5fc968acacfbd4d5beeae0fb183c5b6d54fe4240539352a9c3ce2b2f2318824 |
35 |
DIST tzdata2015e.tar.gz 296773 SHA256 ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f SHA512 86498190a20c5c67827aa75f7e9c6aa6c19d58a88a70425ce70d5ae7cea42dc7386eb2867fa455fcfcdedc6a105ad70fbbdc7c27c7a58a51bd21d76a135983ce WHIRLPOOL aaf2f2009f451beaf178d1ee622ebacdd04f1795e07a606b61620cac8faf74a63e1ea3f75ef58b846a6093922cba9df764ed1929e70d1f0be5181fdc25901282 |
36 |
DIST tzdata2015f.tar.gz 298815 SHA256 959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d SHA512 d86e6c9e4c6d9cd5de30762723d7a90ac697feeb6dd1f04649f6a35e4e1dc638261c32066db4aeafa767ac339ccd100c38dde044ceadd61e95cb3d39c27f977e WHIRLPOOL 0b56e3ae620bed60d37abb195e8c4add8f5a00114422e91f2e533fce8c0091bdd681ff5c682e929e5af45202afde838fcc1ae14b7865f6f83a126c647e56d6a4 |
37 |
|
38 |
diff --git a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch |
39 |
deleted file mode 100644 |
40 |
index 2153d76..0000000 |
41 |
--- a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch |
42 |
+++ /dev/null |
43 |
@@ -1,113 +0,0 @@ |
44 |
- - Fix up default paths |
45 |
- - Support env CC |
46 |
- - Don't build/install libtz.a |
47 |
- - Don't install man-pages provided by sys-apps/man-pages |
48 |
- - Move zic, zdump to sbin and tzselect to bin ala glibc |
49 |
- - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc |
50 |
- - Install leaps zoneinfo into zoneinfo/right/ ala glibc |
51 |
- - Do not run network based unittests |
52 |
- |
53 |
---- a/Makefile |
54 |
-+++ b/Makefile |
55 |
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York |
56 |
- |
57 |
- # Everything gets put in subdirectories of. . . |
58 |
- |
59 |
--TOPDIR= /usr/local |
60 |
-+TOPDIR= /usr |
61 |
- |
62 |
- # "Compiled" time zone information is placed in the "TZDIR" directory |
63 |
- # (and subdirectories). |
64 |
- # Use an absolute path name for TZDIR unless you're just testing the software. |
65 |
- |
66 |
- TZDIR_BASENAME= zoneinfo |
67 |
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) |
68 |
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) |
69 |
- |
70 |
- # Types to try, as an alternative to time_t. int64_t should be first. |
71 |
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t |
72 |
- |
73 |
- # The "tzselect", "zic", and "zdump" commands get installed in. . . |
74 |
- |
75 |
--ETCDIR= $(TOPDIR)/etc |
76 |
-+SBINDIR= $(TOPDIR)/sbin |
77 |
- |
78 |
- # If you "make INSTALL", the "date" command gets installed in. . . |
79 |
- |
80 |
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin |
81 |
- |
82 |
- # Manual pages go in subdirectories of. . . |
83 |
- |
84 |
--MANDIR= $(TOPDIR)/man |
85 |
-+MANDIR= $(TOPDIR)/share/man |
86 |
- |
87 |
- # Library functions are put in an archive in LIBDIR. |
88 |
- |
89 |
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n |
90 |
- |
91 |
- ############################################################################### |
92 |
- |
93 |
--cc= cc |
94 |
--CC= $(cc) -DTZDIR=\"$(TZDIR)\" |
95 |
-+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" |
96 |
-+ifeq ($(NLS),1) |
97 |
-+CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" |
98 |
-+endif |
99 |
- |
100 |
- AR= ar |
101 |
- |
102 |
-@@ -352,17 +354,14 @@ ALL: all date |
103 |
- install: all $(DATA) $(REDO) $(MANS) |
104 |
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ |
105 |
-- $(DESTDIR)$(LIBDIR) \ |
106 |
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \ |
107 |
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ |
108 |
- $(DESTDIR)$(MANDIR)/man8 |
109 |
- $(ZIC) -y $(YEARISTYPE) \ |
110 |
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
111 |
- cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. |
112 |
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. |
113 |
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/. |
114 |
-+ cp tzselect $(DESTDIR)$(BINDIR)/. |
115 |
-- cp libtz.a $(DESTDIR)$(LIBDIR)/. |
116 |
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a |
117 |
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. |
118 |
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. |
119 |
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. |
120 |
- |
121 |
- INSTALL: ALL install date.1 |
122 |
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 |
123 |
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA) |
124 |
- # to using them, or vice versa. |
125 |
- right_posix: right_only leapseconds |
126 |
- rm -fr $(DESTDIR)$(TZDIR)-leaps |
127 |
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ |
128 |
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ |
129 |
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \ |
130 |
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ |
131 |
- -L leapseconds $(TDATA) |
132 |
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ |
133 |
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ |
134 |
- -L /dev/null $(TDATA) |
135 |
- |
136 |
- posix_right: posix_only leapseconds |
137 |
- rm -fr $(DESTDIR)$(TZDIR)-posix |
138 |
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ |
139 |
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ |
140 |
-+ ln -s . $(DESTDIR)$(TZDIR)/posix || \ |
141 |
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ |
142 |
- -L /dev/null $(TDATA) |
143 |
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ |
144 |
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ |
145 |
- -L leapseconds $(TDATA) |
146 |
- |
147 |
- posix_packrat: posix_only backzone |
148 |
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh |
149 |
- chmod +x $@ |
150 |
- |
151 |
- check: check_character_set check_white_space check_links check_sorted \ |
152 |
-- check_tables check_web |
153 |
-+ check_tables |
154 |
- |
155 |
- check_character_set: $(ENCHILADA) |
156 |
- LC_ALL=en_US.utf8 && export LC_ALL && \ |
157 |
|
158 |
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml |
159 |
index 5417711..96d5c97 100644 |
160 |
--- a/sys-libs/timezone-data/metadata.xml |
161 |
+++ b/sys-libs/timezone-data/metadata.xml |
162 |
@@ -12,9 +12,5 @@ |
163 |
when counting seconds since the epoch (while POSIX does not) as they are |
164 |
based on the TAI (International Atomic Time) clock |
165 |
</flag> |
166 |
- <flag name='right_timezone'> |
167 |
- Install the set of "right" timezones; these timezones include leap seconds |
168 |
- when counting seconds since the epoch (while posix does not) |
169 |
- </flag> |
170 |
</use> |
171 |
</pkgmetadata> |
172 |
|
173 |
diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild |
174 |
deleted file mode 100644 |
175 |
index 8ddb089..0000000 |
176 |
--- a/sys-libs/timezone-data/timezone-data-2015a.ebuild |
177 |
+++ /dev/null |
178 |
@@ -1,154 +0,0 @@ |
179 |
-# Copyright 1999-2015 Gentoo Foundation |
180 |
-# Distributed under the terms of the GNU General Public License v2 |
181 |
-# $Id$ |
182 |
- |
183 |
-EAPI="4" |
184 |
- |
185 |
-inherit eutils toolchain-funcs flag-o-matic |
186 |
- |
187 |
-code_ver=${PV} |
188 |
-data_ver=${PV} |
189 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
190 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
191 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
192 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
193 |
- |
194 |
-LICENSE="BSD public-domain" |
195 |
-SLOT="0" |
196 |
-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" |
197 |
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc" |
198 |
- |
199 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
200 |
- |
201 |
-S=${WORKDIR} |
202 |
- |
203 |
-pkg_setup() { |
204 |
- # Deal with the case where older timezone-data installed a |
205 |
- # dir here, but newer one installs symlinks. Portage will |
206 |
- # barf when you try to transition file types. |
207 |
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then |
208 |
- # In case of a failed upgrade, clean up the symlinks #506570 |
209 |
- if [ -L .gentoo-upgrade ] ; then |
210 |
- rm -rf posix .gentoo-upgrade |
211 |
- fi |
212 |
- if [ -d posix ] ; then |
213 |
- rm -rf .gentoo-upgrade #487192 |
214 |
- mv posix .gentoo-upgrade || die |
215 |
- ln -s .gentoo-upgrade posix || die |
216 |
- fi |
217 |
- fi |
218 |
-} |
219 |
- |
220 |
-src_prepare() { |
221 |
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch |
222 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
223 |
-} |
224 |
- |
225 |
-_emake() { |
226 |
- emake \ |
227 |
- TOPDIR="${EPREFIX}/usr" \ |
228 |
- REDO=$(usex right_timezone posix_right posix_only) \ |
229 |
- "$@" |
230 |
-} |
231 |
- |
232 |
-src_compile() { |
233 |
- local LDLIBS |
234 |
- tc-export CC |
235 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
236 |
- append-cppflags -DSTD_INSPIRED #138251 |
237 |
- fi |
238 |
- export NLS=$(usex nls 1 0) |
239 |
- if use nls && ! use elibc_glibc ; then |
240 |
- LDLIBS+=" -lintl" #154181 |
241 |
- fi |
242 |
- # TOPDIR is used in some utils when compiling. |
243 |
- _emake \ |
244 |
- AR="$(tc-getAR)" \ |
245 |
- CC="$(tc-getCC)" \ |
246 |
- RANLIB="$(tc-getRANLIB)" \ |
247 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
248 |
- LDFLAGS="${LDFLAGS}" \ |
249 |
- LDLIBS="${LDLIBS}" |
250 |
- if tc-is-cross-compiler ; then |
251 |
- _emake -C "${S}"-native \ |
252 |
- CC="$(tc-getBUILD_CC)" \ |
253 |
- CFLAGS="${BUILD_CFLAGS}" \ |
254 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
255 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
256 |
- LDLIBS="${LDLIBS}" \ |
257 |
- zic |
258 |
- fi |
259 |
-} |
260 |
- |
261 |
-src_install() { |
262 |
- local zic="" |
263 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
264 |
- _emake install ${zic} DESTDIR="${D}" |
265 |
- dodoc CONTRIBUTING README NEWS Theory |
266 |
- dohtml *.htm |
267 |
- |
268 |
- # install the symlink by hand to not break existing timezones |
269 |
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then |
270 |
- dosym . /usr/share/zoneinfo/posix |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-get_TIMEZONE() { |
275 |
- local tz src="${EROOT}etc/timezone" |
276 |
- if [[ -e ${src} ]] ; then |
277 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
278 |
- else |
279 |
- tz="FOOKABLOIE" |
280 |
- fi |
281 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
282 |
-} |
283 |
- |
284 |
-pkg_preinst() { |
285 |
- local tz=$(get_TIMEZONE) |
286 |
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then |
287 |
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." |
288 |
- die "Please fix your USE or timezone" |
289 |
- fi |
290 |
-} |
291 |
- |
292 |
-pkg_config() { |
293 |
- # make sure the /etc/localtime file does not get stale #127899 |
294 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
295 |
- |
296 |
- tz=$(get_TIMEZONE) || return 0 |
297 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
298 |
- elog "You do not have TIMEZONE set in ${src}." |
299 |
- |
300 |
- if [[ ! -e ${etc_lt} ]] ; then |
301 |
- # if /etc/localtime is a symlink somewhere, assume they |
302 |
- # know what they're doing and they're managing it themselves |
303 |
- if [[ ! -L ${etc_lt} ]] ; then |
304 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
305 |
- elog "Setting ${etc_lt} to Factory." |
306 |
- else |
307 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
308 |
- fi |
309 |
- else |
310 |
- elog "Skipping auto-update of ${etc_lt}." |
311 |
- fi |
312 |
- return 0 |
313 |
- fi |
314 |
- |
315 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
316 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
317 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
318 |
- tz="Factory" |
319 |
- fi |
320 |
- if [[ -L ${etc_lt} ]]; then |
321 |
- einfo "Skipping symlinked ${etc_lt}" |
322 |
- else |
323 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
324 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
325 |
- fi |
326 |
-} |
327 |
- |
328 |
-pkg_postinst() { |
329 |
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & |
330 |
- pkg_config |
331 |
- wait |
332 |
-} |
333 |
|
334 |
diff --git a/sys-libs/timezone-data/timezone-data-2015b.ebuild b/sys-libs/timezone-data/timezone-data-2015b.ebuild |
335 |
deleted file mode 100644 |
336 |
index 8ddb089..0000000 |
337 |
--- a/sys-libs/timezone-data/timezone-data-2015b.ebuild |
338 |
+++ /dev/null |
339 |
@@ -1,154 +0,0 @@ |
340 |
-# Copyright 1999-2015 Gentoo Foundation |
341 |
-# Distributed under the terms of the GNU General Public License v2 |
342 |
-# $Id$ |
343 |
- |
344 |
-EAPI="4" |
345 |
- |
346 |
-inherit eutils toolchain-funcs flag-o-matic |
347 |
- |
348 |
-code_ver=${PV} |
349 |
-data_ver=${PV} |
350 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
351 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
352 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
353 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
354 |
- |
355 |
-LICENSE="BSD public-domain" |
356 |
-SLOT="0" |
357 |
-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" |
358 |
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc" |
359 |
- |
360 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
361 |
- |
362 |
-S=${WORKDIR} |
363 |
- |
364 |
-pkg_setup() { |
365 |
- # Deal with the case where older timezone-data installed a |
366 |
- # dir here, but newer one installs symlinks. Portage will |
367 |
- # barf when you try to transition file types. |
368 |
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then |
369 |
- # In case of a failed upgrade, clean up the symlinks #506570 |
370 |
- if [ -L .gentoo-upgrade ] ; then |
371 |
- rm -rf posix .gentoo-upgrade |
372 |
- fi |
373 |
- if [ -d posix ] ; then |
374 |
- rm -rf .gentoo-upgrade #487192 |
375 |
- mv posix .gentoo-upgrade || die |
376 |
- ln -s .gentoo-upgrade posix || die |
377 |
- fi |
378 |
- fi |
379 |
-} |
380 |
- |
381 |
-src_prepare() { |
382 |
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch |
383 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
384 |
-} |
385 |
- |
386 |
-_emake() { |
387 |
- emake \ |
388 |
- TOPDIR="${EPREFIX}/usr" \ |
389 |
- REDO=$(usex right_timezone posix_right posix_only) \ |
390 |
- "$@" |
391 |
-} |
392 |
- |
393 |
-src_compile() { |
394 |
- local LDLIBS |
395 |
- tc-export CC |
396 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
397 |
- append-cppflags -DSTD_INSPIRED #138251 |
398 |
- fi |
399 |
- export NLS=$(usex nls 1 0) |
400 |
- if use nls && ! use elibc_glibc ; then |
401 |
- LDLIBS+=" -lintl" #154181 |
402 |
- fi |
403 |
- # TOPDIR is used in some utils when compiling. |
404 |
- _emake \ |
405 |
- AR="$(tc-getAR)" \ |
406 |
- CC="$(tc-getCC)" \ |
407 |
- RANLIB="$(tc-getRANLIB)" \ |
408 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
409 |
- LDFLAGS="${LDFLAGS}" \ |
410 |
- LDLIBS="${LDLIBS}" |
411 |
- if tc-is-cross-compiler ; then |
412 |
- _emake -C "${S}"-native \ |
413 |
- CC="$(tc-getBUILD_CC)" \ |
414 |
- CFLAGS="${BUILD_CFLAGS}" \ |
415 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
416 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
417 |
- LDLIBS="${LDLIBS}" \ |
418 |
- zic |
419 |
- fi |
420 |
-} |
421 |
- |
422 |
-src_install() { |
423 |
- local zic="" |
424 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
425 |
- _emake install ${zic} DESTDIR="${D}" |
426 |
- dodoc CONTRIBUTING README NEWS Theory |
427 |
- dohtml *.htm |
428 |
- |
429 |
- # install the symlink by hand to not break existing timezones |
430 |
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then |
431 |
- dosym . /usr/share/zoneinfo/posix |
432 |
- fi |
433 |
-} |
434 |
- |
435 |
-get_TIMEZONE() { |
436 |
- local tz src="${EROOT}etc/timezone" |
437 |
- if [[ -e ${src} ]] ; then |
438 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
439 |
- else |
440 |
- tz="FOOKABLOIE" |
441 |
- fi |
442 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
443 |
-} |
444 |
- |
445 |
-pkg_preinst() { |
446 |
- local tz=$(get_TIMEZONE) |
447 |
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then |
448 |
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." |
449 |
- die "Please fix your USE or timezone" |
450 |
- fi |
451 |
-} |
452 |
- |
453 |
-pkg_config() { |
454 |
- # make sure the /etc/localtime file does not get stale #127899 |
455 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
456 |
- |
457 |
- tz=$(get_TIMEZONE) || return 0 |
458 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
459 |
- elog "You do not have TIMEZONE set in ${src}." |
460 |
- |
461 |
- if [[ ! -e ${etc_lt} ]] ; then |
462 |
- # if /etc/localtime is a symlink somewhere, assume they |
463 |
- # know what they're doing and they're managing it themselves |
464 |
- if [[ ! -L ${etc_lt} ]] ; then |
465 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
466 |
- elog "Setting ${etc_lt} to Factory." |
467 |
- else |
468 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
469 |
- fi |
470 |
- else |
471 |
- elog "Skipping auto-update of ${etc_lt}." |
472 |
- fi |
473 |
- return 0 |
474 |
- fi |
475 |
- |
476 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
477 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
478 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
479 |
- tz="Factory" |
480 |
- fi |
481 |
- if [[ -L ${etc_lt} ]]; then |
482 |
- einfo "Skipping symlinked ${etc_lt}" |
483 |
- else |
484 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
485 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
486 |
- fi |
487 |
-} |
488 |
- |
489 |
-pkg_postinst() { |
490 |
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & |
491 |
- pkg_config |
492 |
- wait |
493 |
-} |
494 |
|
495 |
diff --git a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild b/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild |
496 |
deleted file mode 100644 |
497 |
index 0ba7909..0000000 |
498 |
--- a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild |
499 |
+++ /dev/null |
500 |
@@ -1,143 +0,0 @@ |
501 |
-# Copyright 1999-2015 Gentoo Foundation |
502 |
-# Distributed under the terms of the GNU General Public License v2 |
503 |
-# $Id$ |
504 |
- |
505 |
-EAPI="4" |
506 |
- |
507 |
-inherit eutils toolchain-funcs flag-o-matic |
508 |
- |
509 |
-code_ver=${PV} |
510 |
-data_ver=${PV} |
511 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
512 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
513 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
514 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
515 |
- |
516 |
-LICENSE="BSD public-domain" |
517 |
-SLOT="0" |
518 |
-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" |
519 |
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc" |
520 |
- |
521 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
522 |
- |
523 |
-S=${WORKDIR} |
524 |
- |
525 |
-src_prepare() { |
526 |
- epatch "${FILESDIR}"/${PN}-2015c-makefile.patch |
527 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
528 |
-} |
529 |
- |
530 |
-_emake() { |
531 |
- emake \ |
532 |
- TOPDIR="${EPREFIX}/usr" \ |
533 |
- REDO=$(usex leaps_timezone posix_right posix_only) \ |
534 |
- "$@" |
535 |
-} |
536 |
- |
537 |
-src_compile() { |
538 |
- local LDLIBS |
539 |
- tc-export CC |
540 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
541 |
- append-cppflags -DSTD_INSPIRED #138251 |
542 |
- fi |
543 |
- export NLS=$(usex nls 1 0) |
544 |
- if use nls && ! use elibc_glibc ; then |
545 |
- LDLIBS+=" -lintl" #154181 |
546 |
- fi |
547 |
- # TOPDIR is used in some utils when compiling. |
548 |
- _emake \ |
549 |
- AR="$(tc-getAR)" \ |
550 |
- CC="$(tc-getCC)" \ |
551 |
- RANLIB="$(tc-getRANLIB)" \ |
552 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
553 |
- LDFLAGS="${LDFLAGS}" \ |
554 |
- LDLIBS="${LDLIBS}" |
555 |
- if tc-is-cross-compiler ; then |
556 |
- _emake -C "${S}"-native \ |
557 |
- CC="$(tc-getBUILD_CC)" \ |
558 |
- CFLAGS="${BUILD_CFLAGS}" \ |
559 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
560 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
561 |
- LDLIBS="${LDLIBS}" \ |
562 |
- zic |
563 |
- fi |
564 |
-} |
565 |
- |
566 |
-src_install() { |
567 |
- local zic="" |
568 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
569 |
- _emake install ${zic} DESTDIR="${D}" |
570 |
- dodoc CONTRIBUTING README NEWS Theory |
571 |
- dohtml *.htm |
572 |
-} |
573 |
- |
574 |
-get_TIMEZONE() { |
575 |
- local tz src="${EROOT}etc/timezone" |
576 |
- if [[ -e ${src} ]] ; then |
577 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
578 |
- else |
579 |
- tz="FOOKABLOIE" |
580 |
- fi |
581 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
582 |
-} |
583 |
- |
584 |
-pkg_preinst() { |
585 |
- local tz=$(get_TIMEZONE) |
586 |
- if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then |
587 |
- eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" |
588 |
- eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" |
589 |
- eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" |
590 |
- eerror "be using right/xxx for the system timezone as it breaks programs." |
591 |
- die "Please fix your timezone setting" |
592 |
- fi |
593 |
- |
594 |
- # Trim the symlink by hand to avoid portage's automatic protection checks. |
595 |
- rm -f "${EROOT}"/usr/share/zoneinfo/posix |
596 |
- |
597 |
- if has_version "<=${CATEGORY}/${PN}-2015c" ; then |
598 |
- elog "Support for accessing posix/ and right/ directly has been dropped to match" |
599 |
- elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." |
600 |
- elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" |
601 |
- elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" |
602 |
- fi |
603 |
-} |
604 |
- |
605 |
-pkg_config() { |
606 |
- # make sure the /etc/localtime file does not get stale #127899 |
607 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
608 |
- |
609 |
- tz=$(get_TIMEZONE) || return 0 |
610 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
611 |
- elog "You do not have TIMEZONE set in ${src}." |
612 |
- |
613 |
- if [[ ! -e ${etc_lt} ]] ; then |
614 |
- # if /etc/localtime is a symlink somewhere, assume they |
615 |
- # know what they're doing and they're managing it themselves |
616 |
- if [[ ! -L ${etc_lt} ]] ; then |
617 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
618 |
- elog "Setting ${etc_lt} to Factory." |
619 |
- else |
620 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
621 |
- fi |
622 |
- else |
623 |
- elog "Skipping auto-update of ${etc_lt}." |
624 |
- fi |
625 |
- return 0 |
626 |
- fi |
627 |
- |
628 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
629 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
630 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
631 |
- tz="Factory" |
632 |
- fi |
633 |
- if [[ -L ${etc_lt} ]]; then |
634 |
- einfo "Skipping symlinked ${etc_lt}" |
635 |
- else |
636 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
637 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
638 |
- fi |
639 |
-} |
640 |
- |
641 |
-pkg_postinst() { |
642 |
- pkg_config |
643 |
-} |
644 |
|
645 |
diff --git a/sys-libs/timezone-data/timezone-data-2015c.ebuild b/sys-libs/timezone-data/timezone-data-2015c.ebuild |
646 |
deleted file mode 100644 |
647 |
index f0f999a..0000000 |
648 |
--- a/sys-libs/timezone-data/timezone-data-2015c.ebuild |
649 |
+++ /dev/null |
650 |
@@ -1,154 +0,0 @@ |
651 |
-# Copyright 1999-2015 Gentoo Foundation |
652 |
-# Distributed under the terms of the GNU General Public License v2 |
653 |
-# $Id$ |
654 |
- |
655 |
-EAPI="4" |
656 |
- |
657 |
-inherit eutils toolchain-funcs flag-o-matic |
658 |
- |
659 |
-code_ver=${PV} |
660 |
-data_ver=${PV} |
661 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
662 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
663 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
664 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
665 |
- |
666 |
-LICENSE="BSD public-domain" |
667 |
-SLOT="0" |
668 |
-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" |
669 |
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc" |
670 |
- |
671 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
672 |
- |
673 |
-S=${WORKDIR} |
674 |
- |
675 |
-pkg_setup() { |
676 |
- # Deal with the case where older timezone-data installed a |
677 |
- # dir here, but newer one installs symlinks. Portage will |
678 |
- # barf when you try to transition file types. |
679 |
- if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then |
680 |
- # In case of a failed upgrade, clean up the symlinks #506570 |
681 |
- if [ -L .gentoo-upgrade ] ; then |
682 |
- rm -rf posix .gentoo-upgrade |
683 |
- fi |
684 |
- if [ -d posix ] ; then |
685 |
- rm -rf .gentoo-upgrade #487192 |
686 |
- mv posix .gentoo-upgrade || die |
687 |
- ln -s .gentoo-upgrade posix || die |
688 |
- fi |
689 |
- fi |
690 |
-} |
691 |
- |
692 |
-src_prepare() { |
693 |
- epatch "${FILESDIR}"/${PN}-2015a-makefile.patch |
694 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
695 |
-} |
696 |
- |
697 |
-_emake() { |
698 |
- emake \ |
699 |
- TOPDIR="${EPREFIX}/usr" \ |
700 |
- REDO=$(usex right_timezone posix_right posix_only) \ |
701 |
- "$@" |
702 |
-} |
703 |
- |
704 |
-src_compile() { |
705 |
- local LDLIBS |
706 |
- tc-export CC |
707 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
708 |
- append-cppflags -DSTD_INSPIRED #138251 |
709 |
- fi |
710 |
- export NLS=$(usex nls 1 0) |
711 |
- if use nls && ! use elibc_glibc ; then |
712 |
- LDLIBS+=" -lintl" #154181 |
713 |
- fi |
714 |
- # TOPDIR is used in some utils when compiling. |
715 |
- _emake \ |
716 |
- AR="$(tc-getAR)" \ |
717 |
- CC="$(tc-getCC)" \ |
718 |
- RANLIB="$(tc-getRANLIB)" \ |
719 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
720 |
- LDFLAGS="${LDFLAGS}" \ |
721 |
- LDLIBS="${LDLIBS}" |
722 |
- if tc-is-cross-compiler ; then |
723 |
- _emake -C "${S}"-native \ |
724 |
- CC="$(tc-getBUILD_CC)" \ |
725 |
- CFLAGS="${BUILD_CFLAGS}" \ |
726 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
727 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
728 |
- LDLIBS="${LDLIBS}" \ |
729 |
- zic |
730 |
- fi |
731 |
-} |
732 |
- |
733 |
-src_install() { |
734 |
- local zic="" |
735 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
736 |
- _emake install ${zic} DESTDIR="${D}" |
737 |
- dodoc CONTRIBUTING README NEWS Theory |
738 |
- dohtml *.htm |
739 |
- |
740 |
- # install the symlink by hand to not break existing timezones |
741 |
- if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then |
742 |
- dosym . /usr/share/zoneinfo/posix |
743 |
- fi |
744 |
-} |
745 |
- |
746 |
-get_TIMEZONE() { |
747 |
- local tz src="${EROOT}etc/timezone" |
748 |
- if [[ -e ${src} ]] ; then |
749 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
750 |
- else |
751 |
- tz="FOOKABLOIE" |
752 |
- fi |
753 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
754 |
-} |
755 |
- |
756 |
-pkg_preinst() { |
757 |
- local tz=$(get_TIMEZONE) |
758 |
- if ! use right_timezone && [[ ${tz} == right/* ]] ; then |
759 |
- eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." |
760 |
- die "Please fix your USE or timezone" |
761 |
- fi |
762 |
-} |
763 |
- |
764 |
-pkg_config() { |
765 |
- # make sure the /etc/localtime file does not get stale #127899 |
766 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
767 |
- |
768 |
- tz=$(get_TIMEZONE) || return 0 |
769 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
770 |
- elog "You do not have TIMEZONE set in ${src}." |
771 |
- |
772 |
- if [[ ! -e ${etc_lt} ]] ; then |
773 |
- # if /etc/localtime is a symlink somewhere, assume they |
774 |
- # know what they're doing and they're managing it themselves |
775 |
- if [[ ! -L ${etc_lt} ]] ; then |
776 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
777 |
- elog "Setting ${etc_lt} to Factory." |
778 |
- else |
779 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
780 |
- fi |
781 |
- else |
782 |
- elog "Skipping auto-update of ${etc_lt}." |
783 |
- fi |
784 |
- return 0 |
785 |
- fi |
786 |
- |
787 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
788 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
789 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
790 |
- tz="Factory" |
791 |
- fi |
792 |
- if [[ -L ${etc_lt} ]]; then |
793 |
- einfo "Skipping symlinked ${etc_lt}" |
794 |
- else |
795 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
796 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
797 |
- fi |
798 |
-} |
799 |
- |
800 |
-pkg_postinst() { |
801 |
- rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & |
802 |
- pkg_config |
803 |
- wait |
804 |
-} |
805 |
|
806 |
diff --git a/sys-libs/timezone-data/timezone-data-2015d.ebuild b/sys-libs/timezone-data/timezone-data-2015d.ebuild |
807 |
deleted file mode 100644 |
808 |
index 0ba7909..0000000 |
809 |
--- a/sys-libs/timezone-data/timezone-data-2015d.ebuild |
810 |
+++ /dev/null |
811 |
@@ -1,143 +0,0 @@ |
812 |
-# Copyright 1999-2015 Gentoo Foundation |
813 |
-# Distributed under the terms of the GNU General Public License v2 |
814 |
-# $Id$ |
815 |
- |
816 |
-EAPI="4" |
817 |
- |
818 |
-inherit eutils toolchain-funcs flag-o-matic |
819 |
- |
820 |
-code_ver=${PV} |
821 |
-data_ver=${PV} |
822 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
823 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
824 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
825 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
826 |
- |
827 |
-LICENSE="BSD public-domain" |
828 |
-SLOT="0" |
829 |
-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" |
830 |
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc" |
831 |
- |
832 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
833 |
- |
834 |
-S=${WORKDIR} |
835 |
- |
836 |
-src_prepare() { |
837 |
- epatch "${FILESDIR}"/${PN}-2015c-makefile.patch |
838 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
839 |
-} |
840 |
- |
841 |
-_emake() { |
842 |
- emake \ |
843 |
- TOPDIR="${EPREFIX}/usr" \ |
844 |
- REDO=$(usex leaps_timezone posix_right posix_only) \ |
845 |
- "$@" |
846 |
-} |
847 |
- |
848 |
-src_compile() { |
849 |
- local LDLIBS |
850 |
- tc-export CC |
851 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
852 |
- append-cppflags -DSTD_INSPIRED #138251 |
853 |
- fi |
854 |
- export NLS=$(usex nls 1 0) |
855 |
- if use nls && ! use elibc_glibc ; then |
856 |
- LDLIBS+=" -lintl" #154181 |
857 |
- fi |
858 |
- # TOPDIR is used in some utils when compiling. |
859 |
- _emake \ |
860 |
- AR="$(tc-getAR)" \ |
861 |
- CC="$(tc-getCC)" \ |
862 |
- RANLIB="$(tc-getRANLIB)" \ |
863 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
864 |
- LDFLAGS="${LDFLAGS}" \ |
865 |
- LDLIBS="${LDLIBS}" |
866 |
- if tc-is-cross-compiler ; then |
867 |
- _emake -C "${S}"-native \ |
868 |
- CC="$(tc-getBUILD_CC)" \ |
869 |
- CFLAGS="${BUILD_CFLAGS}" \ |
870 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
871 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
872 |
- LDLIBS="${LDLIBS}" \ |
873 |
- zic |
874 |
- fi |
875 |
-} |
876 |
- |
877 |
-src_install() { |
878 |
- local zic="" |
879 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
880 |
- _emake install ${zic} DESTDIR="${D}" |
881 |
- dodoc CONTRIBUTING README NEWS Theory |
882 |
- dohtml *.htm |
883 |
-} |
884 |
- |
885 |
-get_TIMEZONE() { |
886 |
- local tz src="${EROOT}etc/timezone" |
887 |
- if [[ -e ${src} ]] ; then |
888 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
889 |
- else |
890 |
- tz="FOOKABLOIE" |
891 |
- fi |
892 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
893 |
-} |
894 |
- |
895 |
-pkg_preinst() { |
896 |
- local tz=$(get_TIMEZONE) |
897 |
- if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then |
898 |
- eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" |
899 |
- eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" |
900 |
- eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" |
901 |
- eerror "be using right/xxx for the system timezone as it breaks programs." |
902 |
- die "Please fix your timezone setting" |
903 |
- fi |
904 |
- |
905 |
- # Trim the symlink by hand to avoid portage's automatic protection checks. |
906 |
- rm -f "${EROOT}"/usr/share/zoneinfo/posix |
907 |
- |
908 |
- if has_version "<=${CATEGORY}/${PN}-2015c" ; then |
909 |
- elog "Support for accessing posix/ and right/ directly has been dropped to match" |
910 |
- elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." |
911 |
- elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" |
912 |
- elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" |
913 |
- fi |
914 |
-} |
915 |
- |
916 |
-pkg_config() { |
917 |
- # make sure the /etc/localtime file does not get stale #127899 |
918 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
919 |
- |
920 |
- tz=$(get_TIMEZONE) || return 0 |
921 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
922 |
- elog "You do not have TIMEZONE set in ${src}." |
923 |
- |
924 |
- if [[ ! -e ${etc_lt} ]] ; then |
925 |
- # if /etc/localtime is a symlink somewhere, assume they |
926 |
- # know what they're doing and they're managing it themselves |
927 |
- if [[ ! -L ${etc_lt} ]] ; then |
928 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
929 |
- elog "Setting ${etc_lt} to Factory." |
930 |
- else |
931 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
932 |
- fi |
933 |
- else |
934 |
- elog "Skipping auto-update of ${etc_lt}." |
935 |
- fi |
936 |
- return 0 |
937 |
- fi |
938 |
- |
939 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
940 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
941 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
942 |
- tz="Factory" |
943 |
- fi |
944 |
- if [[ -L ${etc_lt} ]]; then |
945 |
- einfo "Skipping symlinked ${etc_lt}" |
946 |
- else |
947 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
948 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
949 |
- fi |
950 |
-} |
951 |
- |
952 |
-pkg_postinst() { |
953 |
- pkg_config |
954 |
-} |