Version bump #361589 by Rodrigo Severo.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 119 insertions, 8 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index f28823b97643..3345da409de6 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.247 2011/03/22 17:04:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.248 2011/04/03 02:08:23 vapier Exp $
+
+*timezone-data-2011e (03 Apr 2011)
+
+  03 Apr 2011; Mike Frysinger <vapier@gentoo.org> +timezone-data-2011e.ebuild:
+  Version bump #361589 by Rodrigo Severo.
 
   22 Mar 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011d.ebuild:
   Stabilize for everyone for Turkey #359981 by Serkan Kaba.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index c005661fc53b..596ae1948bcf 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
-DIST tzcode2011b.tar.gz 193462 RMD160 dd71b95e62e6acb92a50b10fc22de48e391b5200 SHA1 4ca30bc278e0b8ecda0c58bb6ffa9217e99b18aa SHA256 8031d05102e5c5109521a282aaab0629680bec82db783c716905802313678d67
 DIST tzcode2011d.tar.gz 193553 RMD160 a7ec5ddb3570f07c8170ba1daad958bbe367ba26 SHA1 47a2724b694b9528c0dbf92c410a790038c4802f SHA256 68f2c07471c5390199c09fe9fee6a22f8a4dac24713af88b92da17b33ad98cc7
-DIST tzdata2011b.tar.gz 193030 RMD160 c63ac8cb6aff97b33a939ddf4ef468897df96990 SHA1 0222d6cb2057239b96f7d16fd2a5434091d5a8c4 SHA256 ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9
+DIST tzcode2011e.tar.gz 193776 RMD160 3f05fe13a012ceb84d056c17ab7e5ee80bb79d96 SHA1 235a7d9835860a366f3e3256eea1f62a234d7afc SHA256 8fb00f8763aa51d83d6f3190d144124bb7176ca829fc08823d6205297bf0426b
 DIST tzdata2011d.tar.gz 194588 RMD160 8024546fb4333ce19dbafe7b3569e877edf7c920 SHA1 2d22bcf138707b9171ec54359ec872ca5cb343f7 SHA256 415a54774094e8dcdc9ba141fafbee4b3b2f2140a5b8cf012eea4b37fb9a23bd
-EBUILD timezone-data-2011b.ebuild 3017 RMD160 c2bfb0ec78c0aa1ab09c1c364ae65828bd256374 SHA1 71a79ca8b9a4a1efcfadfc8ed79bc2f2a3c6c651 SHA256 1bfe8408458935423822f88239db165a21fee272d2d2850d5adcc35ca0bc5ca4
+DIST tzdata2011e.tar.gz 195424 RMD160 6880d6694b947ac396d11d83bb8cbea5ea956913 SHA1 5f391435e9bf494698332f1307f9b7ea7e128e16 SHA256 44fef01de4589a4979eb6b5fdbbfd21a3b135852af1ecbfb9e0368ae47392c79
 EBUILD timezone-data-2011d.ebuild 3017 RMD160 a04132eb2e56ab0bed99e394efd786f0dae3ebe7 SHA1 1967fbeccb87a25c5a6573c7bd95d92ffc5be544 SHA256 a4218e393ee9c1f2a8dd318710c7fc673d22ab6ac21c3223299b59e98e0828c8
-MISC ChangeLog 32046 RMD160 f646958561d9a0a46c406e0b470f796863660c22 SHA1 de9ff20fe112415e6d846534372e5b2fa2f81051 SHA256 9b1639c2702c8364acb729ce77f674f86fe77113b0ee41c4653de1bc5f8a00eb
+EBUILD timezone-data-2011e.ebuild 3029 RMD160 4d845896bc283c43ce24aa30b1692c1d3ee00c36 SHA1 d6f6db40fdd288a787f519f208add87c0dc0bf00 SHA256 2af9a1766d656847b938ee0230046f36b11c3675843cc5fd370b116e7f07ec63
+MISC ChangeLog 32204 RMD160 4fcc82cac0b5ee9e2d205494cd5ba9ef8e05941f SHA1 e6445d5cdfc48e9aad667ab6c050b34fa0bce9d6 SHA256 ffda9772a889943f1b0f7f7db938faccb5874516c68f0184cb1ca6e79950dd86
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2I1oEACgkQaC/OocHi7JYRRwD+L9fa143Av9KORggrTIKfAsqs
-LoWtOPdvF+tf0mbeu3sA/0rauIn/7ylgor5Ufdd2murEpbyMX7s0MwNlaS8ND6Wc
-=uzqE
+iF4EAREIAAYFAk2X1poACgkQaC/OocHi7Ja4ygD+P+cwQlRvubjg9B5VyIJYkmqd
+ofc8N0MVC+0MhqqK/9cBAIegKaLvC4fQfKHdCvVkSIgkjl2FTd3t0niMisjJ2H2A
+=AJrA
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2011e.ebuild b/sys-libs/timezone-data/timezone-data-2011e.ebuild
new file mode 100644
index 000000000000..d1f28f58919a
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2011e.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011e.ebuild,v 1.1 2011/04/03 02:08:21 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
+	ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz
+	mirror://gentoo/tzdata${data_ver}.tar.gz
+	mirror://gentoo/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="nls elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!<sys-libs/glibc-2.3.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-2008h-makefile.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_compile() {
+	local LDLIBS
+	tc-export CC
+	use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251
+	if use nls ; then
+		use elibc_glibc || LDLIBS="${LDLIBS} -lintl" #154181
+		export NLS=1
+	else
+		export NLS=0
+	fi
+	# Makefile uses LBLIBS for the libs (which defaults to LDFLAGS)
+	# But it also uses LFLAGS where it expects the real LDFLAGS
+	emake \
+		LDLIBS="${LDLIBS}" \
+		|| die "emake failed"
+	if tc-is-cross-compiler ; then
+		emake -C "${S}"-native \
+			CC=$(tc-getBUILD_CC) \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic || die
+	fi
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	emake install ${zic} DESTDIR="${D}" || die
+	rm -rf "${D}"/usr/share/zoneinfo-leaps
+	dodoc README Theory
+	dohtml *.htm *.jpg
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src
+
+	if has_version '<sys-apps/baselayout-2' ; then
+		src="${ROOT}etc/conf.d/clock"
+		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
+	else
+		src="${ROOT}etc/timezone"
+		if [[ -e ${src} ]] ; then
+			tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+		else
+			tz="FOOKABLOIE"
+		fi
+	fi
+	[[ -z ${tz} ]] && return 0
+
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
+			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
+			elog "Setting ${ROOT}etc/localtime to Factory."
+		else
+			elog "Skipping auto-update of ${ROOT}etc/localtime."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+}
+
+pkg_postinst() {
+	pkg_config
+}