1 |
commit: 1b93e446b043f14c6be447b66293760104fe2dc6 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 2 18:46:47 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 2 18:50:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b93e446 |
7 |
|
8 |
sys-libs/timezone: delete old 2015e version |
9 |
|
10 |
sys-libs/timezone-data/Manifest | 2 - |
11 |
sys-libs/timezone-data/timezone-data-2015e.ebuild | 143 ---------------------- |
12 |
2 files changed, 145 deletions(-) |
13 |
|
14 |
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest |
15 |
index 0221b9c..e128561 100644 |
16 |
--- a/sys-libs/timezone-data/Manifest |
17 |
+++ b/sys-libs/timezone-data/Manifest |
18 |
@@ -1,6 +1,4 @@ |
19 |
-DIST tzcode2015e.tar.gz 185129 SHA256 b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0 SHA512 fdc568a68f4876b967b39e21fa53f063dc5756e886e2a273cc046d5a014eb517e9c91eb6e03d18c94a89ce48578868aed710790415c500188fce4e4add0ce7ca WHIRLPOOL d3fde26e0b0ebe98d7de0c2a666a79dd6020e471b647de2b61a89dc1eeba61e8928c7dcb2e1b15d867e8e81b5e33321a288a2b94e713deaf5579e00b6082e7b8 |
20 |
DIST tzcode2015f.tar.gz 180742 SHA256 0c95e0a42bb61141f790f4f5f204b954d7654c894aa54a594a215d6f38de84ae SHA512 5cfbebde8a0be57e8388a7b6d35aeba99130a72c1a41f9bbd5d5864511a473aa5e9320ab21055b4383e64b3b9d7682c0d30377ce8407619987be672436014710 WHIRLPOOL c657f8d6a77cd96f6fed296bc905fd5690abe47f7cf25d99ea6802d61cee619c75e70ea006a77a0680d4c46ea43f8fb509bbb32b7ecc0323996e44b462e17845 |
21 |
DIST tzcode2015g.tar.gz 181695 SHA256 18e402ef24bfad2ded38643c9a7a9a580f940a729cb47d983052fc28ff0c7ec4 SHA512 44da833da3afdb82636a953785372bb4c765e61e40d700da40b46ab70007ebdbde4d480e10b87cbb36c45eaaffcaa6b9894375e2f553b7d16655dc167cd4a11f WHIRLPOOL 7c71471ba122865710ec6c71e443dab7db8fd6f43cf4348dd02438129d9c80dcfb3d6da3cdb3b04efeabcc5debba35a78d0b946b6b9e98caa5d7ddefbbe600e4 |
22 |
-DIST tzdata2015e.tar.gz 296773 SHA256 ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f SHA512 86498190a20c5c67827aa75f7e9c6aa6c19d58a88a70425ce70d5ae7cea42dc7386eb2867fa455fcfcdedc6a105ad70fbbdc7c27c7a58a51bd21d76a135983ce WHIRLPOOL aaf2f2009f451beaf178d1ee622ebacdd04f1795e07a606b61620cac8faf74a63e1ea3f75ef58b846a6093922cba9df764ed1929e70d1f0be5181fdc25901282 |
23 |
DIST tzdata2015f.tar.gz 298815 SHA256 959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d SHA512 d86e6c9e4c6d9cd5de30762723d7a90ac697feeb6dd1f04649f6a35e4e1dc638261c32066db4aeafa767ac339ccd100c38dde044ceadd61e95cb3d39c27f977e WHIRLPOOL 0b56e3ae620bed60d37abb195e8c4add8f5a00114422e91f2e533fce8c0091bdd681ff5c682e929e5af45202afde838fcc1ae14b7865f6f83a126c647e56d6a4 |
24 |
DIST tzdata2015g.tar.gz 300363 SHA256 b923cdbf078491696b17bc8d069c74bce73fabc5774629da2f410c9b31576161 SHA512 ad7de0e3e8753861d260f0fcbcbca327516a4dc826f7659370a7fb979e6154f1a26b23d2609acf6e1790c8c59da0b76c42f4a94bf361409c1460f6a8ffa6f879 WHIRLPOOL 3af55fc43133ef3c03b734d8db35feda760feb5ad3adf0e763337fcf4ad7057231f5a24ddf68fdac9ae4014d31675d6a51c29f14b987118daad7f691f7e3fe98 |
25 |
|
26 |
diff --git a/sys-libs/timezone-data/timezone-data-2015e.ebuild b/sys-libs/timezone-data/timezone-data-2015e.ebuild |
27 |
deleted file mode 100644 |
28 |
index 5a2024a..0000000 |
29 |
--- a/sys-libs/timezone-data/timezone-data-2015e.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,143 +0,0 @@ |
32 |
-# Copyright 1999-2015 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-EAPI="4" |
37 |
- |
38 |
-inherit eutils toolchain-funcs flag-o-matic |
39 |
- |
40 |
-code_ver=${PV} |
41 |
-data_ver=${PV} |
42 |
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
43 |
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
44 |
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
45 |
- http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" |
46 |
- |
47 |
-LICENSE="BSD public-domain" |
48 |
-SLOT="0" |
49 |
-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" |
50 |
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc" |
51 |
- |
52 |
-RDEPEND="!sys-libs/glibc[vanilla(+)]" |
53 |
- |
54 |
-S=${WORKDIR} |
55 |
- |
56 |
-src_prepare() { |
57 |
- epatch "${FILESDIR}"/${PN}-2015c-makefile.patch |
58 |
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
59 |
-} |
60 |
- |
61 |
-_emake() { |
62 |
- emake \ |
63 |
- TOPDIR="${EPREFIX}/usr" \ |
64 |
- REDO=$(usex leaps_timezone posix_right posix_only) \ |
65 |
- "$@" |
66 |
-} |
67 |
- |
68 |
-src_compile() { |
69 |
- local LDLIBS |
70 |
- tc-export CC |
71 |
- if use elibc_FreeBSD || use elibc_Darwin ; then |
72 |
- append-cppflags -DSTD_INSPIRED #138251 |
73 |
- fi |
74 |
- export NLS=$(usex nls 1 0) |
75 |
- if use nls && ! use elibc_glibc ; then |
76 |
- LDLIBS+=" -lintl" #154181 |
77 |
- fi |
78 |
- # TOPDIR is used in some utils when compiling. |
79 |
- _emake \ |
80 |
- AR="$(tc-getAR)" \ |
81 |
- CC="$(tc-getCC)" \ |
82 |
- RANLIB="$(tc-getRANLIB)" \ |
83 |
- CFLAGS="${CFLAGS} -std=gnu99" \ |
84 |
- LDFLAGS="${LDFLAGS}" \ |
85 |
- LDLIBS="${LDLIBS}" |
86 |
- if tc-is-cross-compiler ; then |
87 |
- _emake -C "${S}"-native \ |
88 |
- CC="$(tc-getBUILD_CC)" \ |
89 |
- CFLAGS="${BUILD_CFLAGS}" \ |
90 |
- CPPFLAGS="${BUILD_CPPFLAGS}" \ |
91 |
- LDFLAGS="${BUILD_LDFLAGS}" \ |
92 |
- LDLIBS="${LDLIBS}" \ |
93 |
- zic |
94 |
- fi |
95 |
-} |
96 |
- |
97 |
-src_install() { |
98 |
- local zic="" |
99 |
- tc-is-cross-compiler && zic="zic=${S}-native/zic" |
100 |
- _emake install ${zic} DESTDIR="${D}" |
101 |
- dodoc CONTRIBUTING README NEWS Theory |
102 |
- dohtml *.htm |
103 |
-} |
104 |
- |
105 |
-get_TIMEZONE() { |
106 |
- local tz src="${EROOT}etc/timezone" |
107 |
- if [[ -e ${src} ]] ; then |
108 |
- tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
109 |
- else |
110 |
- tz="FOOKABLOIE" |
111 |
- fi |
112 |
- [[ -z ${tz} ]] && return 1 || echo "${tz}" |
113 |
-} |
114 |
- |
115 |
-pkg_preinst() { |
116 |
- local tz=$(get_TIMEZONE) |
117 |
- if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then |
118 |
- eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" |
119 |
- eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" |
120 |
- eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" |
121 |
- eerror "be using right/xxx for the system timezone as it breaks programs." |
122 |
- die "Please fix your timezone setting" |
123 |
- fi |
124 |
- |
125 |
- # Trim the symlink by hand to avoid portage's automatic protection checks. |
126 |
- rm -f "${EROOT}"/usr/share/zoneinfo/posix |
127 |
- |
128 |
- if has_version "<=${CATEGORY}/${PN}-2015c" ; then |
129 |
- elog "Support for accessing posix/ and right/ directly has been dropped to match" |
130 |
- elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." |
131 |
- elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" |
132 |
- elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" |
133 |
- fi |
134 |
-} |
135 |
- |
136 |
-pkg_config() { |
137 |
- # make sure the /etc/localtime file does not get stale #127899 |
138 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
139 |
- |
140 |
- tz=$(get_TIMEZONE) || return 0 |
141 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
142 |
- elog "You do not have TIMEZONE set in ${src}." |
143 |
- |
144 |
- if [[ ! -e ${etc_lt} ]] ; then |
145 |
- # if /etc/localtime is a symlink somewhere, assume they |
146 |
- # know what they're doing and they're managing it themselves |
147 |
- if [[ ! -L ${etc_lt} ]] ; then |
148 |
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
149 |
- elog "Setting ${etc_lt} to Factory." |
150 |
- else |
151 |
- elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
152 |
- fi |
153 |
- else |
154 |
- elog "Skipping auto-update of ${etc_lt}." |
155 |
- fi |
156 |
- return 0 |
157 |
- fi |
158 |
- |
159 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
160 |
- elog "You have an invalid TIMEZONE setting in ${src}" |
161 |
- elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
162 |
- tz="Factory" |
163 |
- fi |
164 |
- if [[ -L ${etc_lt} ]]; then |
165 |
- einfo "Skipping symlinked ${etc_lt}" |
166 |
- else |
167 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
168 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
169 |
- fi |
170 |
-} |
171 |
- |
172 |
-pkg_postinst() { |
173 |
- pkg_config |
174 |
-} |