From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014b.ebuild ChangeLog |
Date: | Tue, 25 Mar 2014 14:51:20 |
Message-Id: | 20140325145111.A610A20057@flycatcher.gentoo.org |
1 | vapier 14/03/25 14:51:11 |
2 | |
3 | Modified: ChangeLog |
4 | Added: timezone-data-2014b.ebuild |
5 | Log: |
6 | Version bump. |
7 | |
8 | (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
9 | |
10 | Revision Changes Path |
11 | 1.299 sys-libs/timezone-data/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.299&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.299&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.298&r2=1.299 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v |
20 | retrieving revision 1.298 |
21 | retrieving revision 1.299 |
22 | diff -u -r1.298 -r1.299 |
23 | --- ChangeLog 10 Mar 2014 00:34:27 -0000 1.298 |
24 | +++ ChangeLog 25 Mar 2014 14:51:11 -0000 1.299 |
25 | @@ -1,6 +1,11 @@ |
26 | # ChangeLog for sys-libs/timezone-data |
27 | # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.298 2014/03/10 00:34:27 vapier Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.299 2014/03/25 14:51:11 vapier Exp $ |
30 | + |
31 | +*timezone-data-2014b (25 Mar 2014) |
32 | + |
33 | + 25 Mar 2014; Mike Frysinger <vapier@g.o> +timezone-data-2014b.ebuild: |
34 | + Version bump. |
35 | |
36 | *timezone-data-2014a (10 Mar 2014) |
37 | |
38 | |
39 | |
40 | |
41 | 1.1 sys-libs/timezone-data/timezone-data-2014b.ebuild |
42 | |
43 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014b.ebuild?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014b.ebuild?rev=1.1&content-type=text/plain |
45 | |
46 | Index: timezone-data-2014b.ebuild |
47 | =================================================================== |
48 | # Copyright 1999-2014 Gentoo Foundation |
49 | # Distributed under the terms of the GNU General Public License v2 |
50 | # $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014b.ebuild,v 1.1 2014/03/25 14:51:11 vapier Exp $ |
51 | |
52 | EAPI="3" |
53 | |
54 | inherit eutils toolchain-funcs flag-o-matic |
55 | |
56 | code_ver=${PV} |
57 | data_ver=${PV} |
58 | DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
59 | HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" |
60 | SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz |
61 | http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz |
62 | ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz |
63 | ftp://munnari.oz.au/pub/oldtz/tzcode${data_ver}.tar.gz" |
64 | |
65 | LICENSE="BSD public-domain" |
66 | SLOT="0" |
67 | 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" |
68 | IUSE="nls elibc_FreeBSD elibc_glibc" |
69 | |
70 | RDEPEND="!<sys-libs/glibc-2.3.5" |
71 | |
72 | S=${WORKDIR} |
73 | |
74 | pkg_setup() { |
75 | # Deal with the case where older timezone-data installed a |
76 | # dir here, but newer one installs symlinks. Portage will |
77 | # barf when you try to transition file types. |
78 | if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then |
79 | if [[ -d posix ]] ; then |
80 | rm -rf .gentoo-upgrade #487192 |
81 | mv posix .gentoo-upgrade || die |
82 | ln -s .gentoo-upgrade posix || die |
83 | fi |
84 | fi |
85 | } |
86 | |
87 | src_prepare() { |
88 | epatch "${FILESDIR}"/${PN}-2013h-makefile.patch |
89 | tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
90 | } |
91 | |
92 | src_compile() { |
93 | local LDLIBS |
94 | tc-export CC |
95 | if use elibc_FreeBSD || use elibc_Darwin ; then |
96 | append-cppflags -DSTD_INSPIRED #138251 |
97 | fi |
98 | export NLS=$(usex nls 1 0) |
99 | if use nls && ! use elibc_glibc ; then |
100 | LDLIBS+=" -lintl" #154181 |
101 | fi |
102 | # TOPDIR is used in some utils when compiling. |
103 | emake \ |
104 | TOPDIR="${EPREFIX}/usr" \ |
105 | CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \ |
106 | LDFLAGS="${LDFLAGS}" \ |
107 | LDLIBS="${LDLIBS}" \ |
108 | || die |
109 | if tc-is-cross-compiler ; then |
110 | emake -C "${S}"-native \ |
111 | CC=$(tc-getBUILD_CC) \ |
112 | CFLAGS="${BUILD_CFLAGS}" \ |
113 | LDFLAGS="${BUILD_LDFLAGS}" \ |
114 | LDLIBS="${LDLIBS}" \ |
115 | zic || die |
116 | fi |
117 | } |
118 | |
119 | src_install() { |
120 | local zic="" |
121 | tc-is-cross-compiler && zic="zic=${S}-native/zic" |
122 | emake install ${zic} DESTDIR="${ED}" || die |
123 | dodoc README Theory |
124 | dohtml *.htm |
125 | } |
126 | |
127 | pkg_config() { |
128 | # make sure the /etc/localtime file does not get stale #127899 |
129 | local tz src etc_lt="${EROOT}etc/localtime" |
130 | |
131 | if has_version '<sys-apps/baselayout-2' ; then |
132 | src="${EROOT}etc/conf.d/clock" |
133 | tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE}) |
134 | else |
135 | src="${EROOT}etc/timezone" |
136 | if [[ -e ${src} ]] ; then |
137 | tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
138 | else |
139 | tz="FOOKABLOIE" |
140 | fi |
141 | fi |
142 | [[ -z ${tz} ]] && return 0 |
143 | |
144 | if [[ ${tz} == "FOOKABLOIE" ]] ; then |
145 | elog "You do not have TIMEZONE set in ${src}." |
146 | |
147 | if [[ ! -e ${etc_lt} ]] ; then |
148 | # if /etc/localtime is a symlink somewhere, assume they |
149 | # know what they're doing and they're managing it themselves |
150 | if [[ ! -L ${etc_lt} ]] ; then |
151 | cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
152 | elog "Setting ${etc_lt} to Factory." |
153 | else |
154 | elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
155 | fi |
156 | else |
157 | elog "Skipping auto-update of ${etc_lt}." |
158 | fi |
159 | return 0 |
160 | fi |
161 | |
162 | if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
163 | elog "You have an invalid TIMEZONE setting in ${src}" |
164 | elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
165 | tz="Factory" |
166 | fi |
167 | einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
168 | [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" |
169 | cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
170 | } |
171 | |
172 | pkg_postinst() { |
173 | rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & |
174 | pkg_config |
175 | wait |
176 | } |