Version bump #302296 by Rodrigo Severo.

Package-Manager: portage-2.2_rc61/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 77b15e121793..f8035155cf68 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.221 2010/01/19 06:35:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.222 2010/01/26 19:19:14 vapier Exp $
+
+*timezone-data-2010b (26 Jan 2010)
+
+  26 Jan 2010; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2010b.ebuild:
+  Version bump #302296 by Rodrigo Severo.
 
 *timezone-data-2010a (19 Jan 2010)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 135e17d843ac..660f84ff2823 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,20 +2,19 @@
 Hash: SHA256
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
-DIST tzcode2009r.tar.gz 191114 RMD160 237f47a92f212afce3f0030d17c13a4465ff78ac SHA1 02ad606c1236f6ffa836799b09b58dfcaa608982 SHA256 49031541192a109fd9beddd07695cecf5ec90d09088c59b1d917c91f8f6081b2
 DIST tzcode2009t.tar.gz 191325 RMD160 6071d69d9367211cfe2ea32c9467f7317bb511d2 SHA1 2bc3abe70dd8b83582c22edaa86bf066c5508a36 SHA256 97f64d7056d6c18e6b4e1619bf94fc625a3d08413d238e0c5a5faba714a2297f
-DIST tzdata2009s.tar.gz 184326 RMD160 3feadcbd8738b5ae1a3d6bba05a2c9644de9a1c1 SHA1 c870aab416411056a62a0ee69552010fc7fa499a SHA256 ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 DIST tzdata2009u.tar.gz 185958 RMD160 e0647b3bf67a10ea40f843bc389ac22284d8a380 SHA1 4c5e24805e1d8989cc54e256b076e9345669ab05 SHA256 7cbd82597590ca279e042dbeace91553806c4b4dbff25c34b843a4f1d07e0384
 DIST tzdata2010a.tar.gz 185948 RMD160 537dffa063240d9907aea3f4847de8d92af6a743 SHA1 5a89ec9c62e0ac20909724f0c40327977e42d841 SHA256 d9dab04cbbc52a7f19363958402b1c9cc6724e587f2af822c3e40e52767dfee8
-EBUILD timezone-data-2009s.ebuild 3015 RMD160 4d4104d369a364f6d21a2cd187bd2bdbd677be38 SHA1 ff3b71aa2de4a72c4c17d0a20eeb683b9799a4e3 SHA256 5d64087f7930e7d39c26ee79198893b188963a622da1660ef5111669f3317890
+DIST tzdata2010b.tar.gz 187080 RMD160 b466357f47e1fb002d1586b3bf1b41a30e2512b1 SHA1 c456b990d9a3c3874d17197b5c8b5ee57def0463 SHA256 a93208ae389cc0d3618731cc9f406ba2cfc6aac39668a06c687d3fae2a7e8210
 EBUILD timezone-data-2009u.ebuild 3011 RMD160 ce0ceb1f14c5aeb09794379007b55b6dc22d475d SHA1 c99e52dc73030f7a801133d805b6e802038d0ed4 SHA256 15b206890e3415455f632bdd845ff540ceca502f8954bcd4306ff38cea402705
 EBUILD timezone-data-2010a.ebuild 3027 RMD160 e7ab9a0039286f9fd19563005a1700f50d8224dd SHA1 5bf6808b4dcca4ef1e607a6465d1acfea6346e2f SHA256 011042f22121dca7121e34fed672bf5a8fc2906306322e699588f7380000c240
-MISC ChangeLog 28168 RMD160 0ff3799f7b023189dac6481d74247b67f6367747 SHA1 9156798b95931c899604c6701e64d7e41be6164b SHA256 e98cdec7e283eacdbfd8e204f10bc58c11bc148b0741a907aecb6c34befcd61b
+EBUILD timezone-data-2010b.ebuild 3027 RMD160 1f8a474c9f23f07bc166b9b059796432e7364250 SHA1 af81c4bea2198aaafc303ecd9ecf7540bcbb8027 SHA256 039976902567ac888424260d802cc052c7ce742b4340b17f6adb47d8221f6337
+MISC ChangeLog 28328 RMD160 44edad8341bb864bd5b954dd9a9346004585a0ef SHA1 f64b91ba4a39905058e8eed34eb84e610b13a883 SHA256 35db05e2ca088b6aca902daf33af2392e2a6aca2aaea7a034bb27b96dd87c3c4
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktVUs0ACgkQTwhj9JtAlp5UWAD/fxgwe2UpoSKUj6OiHGtHcpHK
-pLgSB3Jcfm8O51WDvQsA+wc6rc3o7DrngF0KhSHIYu7bgGsBc5B4Gp1DAAj/iXIf
-=6vnL
+iF4EAREIAAYFAktfQD4ACgkQTwhj9JtAlp5wAAD/dlaMu/EvD0uBZWgsGmqkrUQn
+tHrtoJMndxoKNgr606kA/AoIzIdS/5rI3YZg0yxhBQj3hwXYt0NTsWmxYjIlB4Ts
+=G4gb
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2010b.ebuild b/sys-libs/timezone-data/timezone-data-2010b.ebuild
new file mode 100644
index 000000000000..2d70569ba6d1
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2010b.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2010b.ebuild,v 1.1 2010/01/26 19:19:14 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%10b}09t
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="ftp://elsie.nci.nih.gov/pub/"
+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
+}