From: | "Dirkjan Ochtman (djc)" <djc@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2013g.ebuild ChangeLog |
Date: | Wed, 02 Oct 2013 06:36:30 |
Message-Id: | 20131002063624.F1CBF2004C@flycatcher.gentoo.org |
1 | djc 13/10/02 06:36:24 |
2 | |
3 | Modified: ChangeLog |
4 | Added: timezone-data-2013g.ebuild |
5 | Log: |
6 | Version bump timezone-data to 2013g. |
7 | |
8 | (Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 30380381) |
9 | |
10 | Revision Changes Path |
11 | 1.292 sys-libs/timezone-data/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.292&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.292&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.291&r2=1.292 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v |
20 | retrieving revision 1.291 |
21 | retrieving revision 1.292 |
22 | diff -u -r1.291 -r1.292 |
23 | --- ChangeLog 30 Sep 2013 04:42:20 -0000 1.291 |
24 | +++ ChangeLog 2 Oct 2013 06:36:24 -0000 1.292 |
25 | @@ -1,6 +1,11 @@ |
26 | # ChangeLog for sys-libs/timezone-data |
27 | # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.291 2013/09/30 04:42:20 vapier Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.292 2013/10/02 06:36:24 djc Exp $ |
30 | + |
31 | +*timezone-data-2013g (02 Oct 2013) |
32 | + |
33 | + 02 Oct 2013; Dirkjan Ochtman <djc@g.o> +timezone-data-2013g.ebuild: |
34 | + Version bump timezone-data to 2013g. |
35 | |
36 | 30 Sep 2013; Mike Frysinger <vapier@g.o> timezone-data-2013f-r1.ebuild: |
37 | Merge duplicate pkg_postinst funcs #485720#6 by Arfrever Frehtes Taifersar |
38 | |
39 | |
40 | |
41 | 1.1 sys-libs/timezone-data/timezone-data-2013g.ebuild |
42 | |
43 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild?rev=1.1&content-type=text/plain |
45 | |
46 | Index: timezone-data-2013g.ebuild |
47 | =================================================================== |
48 | # Copyright 1999-2013 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-2013g.ebuild,v 1.1 2013/10/02 06:36:24 djc 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/tzdata${data_ver}.tar.gz |
63 | ftp://munnari.oz.au/pub/tzcode${code_ver}.tar.gz" |
64 | |
65 | LICENSE="BSD public-domain" |
66 | SLOT="0" |
67 | KEYWORDS="~alpha ~amd64 ~arm ~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 | mv posix .gentoo-upgrade || die |
81 | ln -s .gentoo-upgrade posix || die |
82 | fi |
83 | fi |
84 | } |
85 | |
86 | src_prepare() { |
87 | epatch "${FILESDIR}"/${PN}-2013f-makefile.patch |
88 | tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
89 | } |
90 | |
91 | src_compile() { |
92 | local LDLIBS |
93 | tc-export CC |
94 | if use elibc_FreeBSD || use elibc_Darwin ; then |
95 | append-cppflags -DSTD_INSPIRED #138251 |
96 | fi |
97 | export NLS=$(usex nls 1 0) |
98 | if use nls && ! use elibc_glibc ; then |
99 | LDLIBS+=" -lintl" #154181 |
100 | fi |
101 | # TOPDIR is used in some utils when compiling. |
102 | emake \ |
103 | TOPDIR="${EPREFIX}/usr" \ |
104 | CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \ |
105 | LDFLAGS="${LDFLAGS}" \ |
106 | LDLIBS="${LDLIBS}" \ |
107 | || die |
108 | if tc-is-cross-compiler ; then |
109 | emake -C "${S}"-native \ |
110 | CC=$(tc-getBUILD_CC) \ |
111 | CFLAGS="${BUILD_CFLAGS}" \ |
112 | LDFLAGS="${BUILD_LDFLAGS}" \ |
113 | LDLIBS="${LDLIBS}" \ |
114 | zic || die |
115 | fi |
116 | } |
117 | |
118 | src_install() { |
119 | local zic="" |
120 | tc-is-cross-compiler && zic="zic=${S}-native/zic" |
121 | emake install ${zic} DESTDIR="${ED}" || die |
122 | dodoc README Theory |
123 | dohtml *.htm |
124 | } |
125 | |
126 | pkg_config() { |
127 | # make sure the /etc/localtime file does not get stale #127899 |
128 | local tz src etc_lt="${EROOT}etc/localtime" |
129 | |
130 | if has_version '<sys-apps/baselayout-2' ; then |
131 | src="${EROOT}etc/conf.d/clock" |
132 | tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE}) |
133 | else |
134 | src="${EROOT}etc/timezone" |
135 | if [[ -e ${src} ]] ; then |
136 | tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
137 | else |
138 | tz="FOOKABLOIE" |
139 | fi |
140 | fi |
141 | [[ -z ${tz} ]] && return 0 |
142 | |
143 | if [[ ${tz} == "FOOKABLOIE" ]] ; then |
144 | elog "You do not have TIMEZONE set in ${src}." |
145 | |
146 | if [[ ! -e ${etc_lt} ]] ; then |
147 | # if /etc/localtime is a symlink somewhere, assume they |
148 | # know what they're doing and they're managing it themselves |
149 | if [[ ! -L ${etc_lt} ]] ; then |
150 | cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
151 | elog "Setting ${etc_lt} to Factory." |
152 | else |
153 | elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
154 | fi |
155 | else |
156 | elog "Skipping auto-update of ${etc_lt}." |
157 | fi |
158 | return 0 |
159 | fi |
160 | |
161 | if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
162 | elog "You have an invalid TIMEZONE setting in ${src}" |
163 | elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
164 | tz="Factory" |
165 | fi |
166 | einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
167 | [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" |
168 | cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
169 | } |
170 | |
171 | pkg_postinst() { |
172 | rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & |
173 | pkg_config |
174 | wait |
175 | } |