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-2011n.ebuild ChangeLog |
Date: | Mon, 31 Oct 2011 22:48:13 |
Message-Id: | 20111031224803.645C62004B@flycatcher.gentoo.org |
1 | vapier 11/10/31 22:48:03 |
2 | |
3 | Modified: ChangeLog |
4 | Added: timezone-data-2011n.ebuild |
5 | Log: |
6 | Version bump. |
7 | |
8 | (Portage version: 2.2.0_alpha71/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.262 sys-libs/timezone-data/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.262&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.262&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.261&r2=1.262 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v |
20 | retrieving revision 1.261 |
21 | retrieving revision 1.262 |
22 | diff -u -r1.261 -r1.262 |
23 | --- ChangeLog 31 Oct 2011 00:01:14 -0000 1.261 |
24 | +++ ChangeLog 31 Oct 2011 22:48:03 -0000 1.262 |
25 | @@ -1,6 +1,11 @@ |
26 | # ChangeLog for sys-libs/timezone-data |
27 | # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.261 2011/10/31 00:01:14 vapier Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.262 2011/10/31 22:48:03 vapier Exp $ |
30 | + |
31 | +*timezone-data-2011n (31 Oct 2011) |
32 | + |
33 | + 31 Oct 2011; Mike Frysinger <vapier@g.o> +timezone-data-2011n.ebuild: |
34 | + Version bump. |
35 | |
36 | *timezone-data-2011m (31 Oct 2011) |
37 | |
38 | |
39 | |
40 | |
41 | 1.1 sys-libs/timezone-data/timezone-data-2011n.ebuild |
42 | |
43 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2011n.ebuild?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2011n.ebuild?rev=1.1&content-type=text/plain |
45 | |
46 | Index: timezone-data-2011n.ebuild |
47 | =================================================================== |
48 | # Copyright 1999-2011 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-2011n.ebuild,v 1.1 2011/10/31 22:48:03 vapier Exp $ |
51 | |
52 | inherit eutils toolchain-funcs flag-o-matic |
53 | |
54 | code_ver=${PV%n}i |
55 | data_ver=${PV} |
56 | DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" |
57 | HOMEPAGE="http://www.twinsun.com/tz/tz-link.htm https://mm.icann.org/mailman/listinfo/tz" |
58 | SRC_URI="ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz |
59 | ftp://munnari.oz.au/pub/tzcode${code_ver}.tar.gz" |
60 | |
61 | LICENSE="BSD public-domain" |
62 | SLOT="0" |
63 | KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
64 | IUSE="nls elibc_FreeBSD elibc_glibc" |
65 | |
66 | RDEPEND="!<sys-libs/glibc-2.3.5" |
67 | |
68 | S=${WORKDIR} |
69 | |
70 | src_unpack() { |
71 | unpack ${A} |
72 | epatch "${FILESDIR}"/${PN}-2008h-makefile.patch |
73 | tc-is-cross-compiler && cp -pR "${S}" "${S}"-native |
74 | } |
75 | |
76 | src_compile() { |
77 | local LDLIBS |
78 | tc-export CC |
79 | use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251 |
80 | if use nls ; then |
81 | use elibc_glibc || LDLIBS="${LDLIBS} -lintl" #154181 |
82 | export NLS=1 |
83 | else |
84 | export NLS=0 |
85 | fi |
86 | # Makefile uses LBLIBS for the libs (which defaults to LDFLAGS) |
87 | # But it also uses LFLAGS where it expects the real LDFLAGS |
88 | emake \ |
89 | LDLIBS="${LDLIBS}" \ |
90 | || die "emake failed" |
91 | if tc-is-cross-compiler ; then |
92 | emake -C "${S}"-native \ |
93 | CC=$(tc-getBUILD_CC) \ |
94 | CFLAGS="${BUILD_CFLAGS}" \ |
95 | LDFLAGS="${BUILD_LDFLAGS}" \ |
96 | LDLIBS="${LDLIBS}" \ |
97 | zic || die |
98 | fi |
99 | } |
100 | |
101 | src_install() { |
102 | local zic="" |
103 | tc-is-cross-compiler && zic="zic=${S}-native/zic" |
104 | emake install ${zic} DESTDIR="${D}" || die |
105 | rm -rf "${D}"/usr/share/zoneinfo-leaps |
106 | dodoc README Theory |
107 | dohtml *.htm |
108 | } |
109 | |
110 | pkg_config() { |
111 | # make sure the /etc/localtime file does not get stale #127899 |
112 | local tz src etc_lt="${ROOT}etc/localtime" |
113 | |
114 | if has_version '<sys-apps/baselayout-2' ; then |
115 | src="${ROOT}etc/conf.d/clock" |
116 | tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE}) |
117 | else |
118 | src="${ROOT}etc/timezone" |
119 | if [[ -e ${src} ]] ; then |
120 | tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
121 | else |
122 | tz="FOOKABLOIE" |
123 | fi |
124 | fi |
125 | [[ -z ${tz} ]] && return 0 |
126 | |
127 | if [[ ${tz} == "FOOKABLOIE" ]] ; then |
128 | elog "You do not have TIMEZONE set in ${src}." |
129 | |
130 | if [[ ! -e ${etc_lt} ]] ; then |
131 | # if /etc/localtime is a symlink somewhere, assume they |
132 | # know what they're doing and they're managing it themselves |
133 | if [[ ! -L ${etc_lt} ]] ; then |
134 | cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
135 | elog "Setting ${etc_lt} to Factory." |
136 | else |
137 | elog "Assuming your ${etc_lt} symlink is what you want; skipping update." |
138 | fi |
139 | else |
140 | elog "Skipping auto-update of ${etc_lt}." |
141 | fi |
142 | return 0 |
143 | fi |
144 | |
145 | if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then |
146 | elog "You have an invalid TIMEZONE setting in ${src}" |
147 | elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
148 | tz="Factory" |
149 | fi |
150 | einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}" |
151 | [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" |
152 | cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
153 | } |
154 | |
155 | pkg_postinst() { |
156 | pkg_config |
157 | } |