Version bump #343719 by Rodrigo Severo.

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

3 files changed, 119 insertions, 5 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 1d7372d48c71..1d8353207979 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.239 2010/10/26 15:04:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.240 2010/11/09 13:48:09 vapier Exp $
+
+*timezone-data-2010o (09 Nov 2010)
+
+  09 Nov 2010; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2010o.ebuild:
+  Version bump #343719 by Rodrigo Severo.
 
 *timezone-data-2010n (26 Oct 2010)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index f8357865486f..0b0a05397b9e 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -8,15 +8,17 @@ DIST tzcode2010n.tar.gz 192605 RMD160 27a4c430a12f1c58054d64b32bb8cb5091eef3a9 S
 DIST tzdata2010l.tar.gz 191467 RMD160 da2477896c92a57d6bb93f3dea6febaf63d6e8d1 SHA1 cdf10096260437556c3b7151790ec0db13d3d908 SHA256 bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577
 DIST tzdata2010m.tar.gz 191470 RMD160 551ea7eaccf64230dd4224997629c647d246535b SHA1 3e74330984b6aeb47cf27de2b860b2c69b2a0731 SHA256 1454a13a32e23e81195404d00ab97a64a356e9a5852fc7d121ed7e58cbdb75aa
 DIST tzdata2010n.tar.gz 191593 RMD160 84e039096a35be5344217f54ac481449ed711062 SHA1 8b7513a69b98af2ee7b61ab6c3c611659bb9f983 SHA256 5946bff5cef28feda6cff241f03c84e528cd4fcc0c2b27b537f52994f8afc70b
+DIST tzdata2010o.tar.gz 191722 RMD160 8c6aaa2f2ff080d4d371b95e46b3a5a4dbc0412c SHA1 bf1541379d987e99ea1941a32ff629f14b1b142c SHA256 cd0f3799688b3b870cd988505e47c2975b1808e73ec0677bc9db4b705b534c07
 EBUILD timezone-data-2010l.ebuild 3008 RMD160 1b6fd07131a6cd5db07923660a7bc7c0886755d3 SHA1 a84bc3a07f4a234d24d415a51761bdabd033c43d SHA256 ed4b28b918a05bcafa9755423c6ec3065342b6429a30ca684769ecb6a19c0887
 EBUILD timezone-data-2010m.ebuild 3020 RMD160 4e87a592589b744ee06b8375b733ce975da37b14 SHA1 785adb78f63ecb2e5a6b72bfc7c334dbcaf331ff SHA256 ac32e2285f191383b1c3cac8f7bd5914b9497e5d6e9c09212fcaf4b7a81d85ca
 EBUILD timezone-data-2010n.ebuild 3020 RMD160 abdbcb5d0056d7b49e7fa5538991f41a6f14245f SHA1 2df6b015c07235c26526c140226aae06d04baefe SHA256 e4228028946cace2a9e742e07797c175c85fa9301ace24f1932987f87f70df5e
-MISC ChangeLog 30804 RMD160 4d59f46fdf998786b39a4595ce98c75372e0a3bb SHA1 93174e4a79f0a73c879d9e566c10cbb85edbd962 SHA256 aebaedf2cf5d15fc2ce32b0810af4f5ccf7edc92d45b04fea8ce5cc2a464ed32
+EBUILD timezone-data-2010o.ebuild 3023 RMD160 0576c09a0d19974ab4b9a5941ee28049766beeb5 SHA1 358da3d0ad9efb52cf7aef452aebbbb7f751bfeb SHA256 001b8436338adbf5290f4427989fbd86c7cfe1e7f787e4647b77c3ef8c576215
+MISC ChangeLog 30964 RMD160 da7f7f6a5ded6239be58250a171d5d1d986169a0 SHA1 c761a82bac50daeb9ba87208ad21facfcb42499a SHA256 5160efe3badee05a8be4fa63c03732f7f9c565729fdcf0c4e833ae6661119020
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzG7bQACgkQTwhj9JtAlp6OewEAkJwD3NaH+crhob1qpUFxqrSI
-w90Bbp9bLPyGBo48ReoBAINRMZJxp0iAPZzk4mxtNhqmN3kFmVgq/TtBYk4lmggQ
-=Q9CE
+iF4EAREIAAYFAkzZURsACgkQTwhj9JtAlp6THQD/eq2G7VRV4cAH0J+Y7+BVTJ0N
+deXl2YC7ltutA6mAkPkA/jV0b7DkBbUgDogAxQwtjmQK9yqUYkzC7Ep2ycQ1tUlA
+=wIVB
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2010o.ebuild b/sys-libs/timezone-data/timezone-data-2010o.ebuild
new file mode 100644
index 000000000000..e1cdc64675ba
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2010o.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-2010o.ebuild,v 1.1 2010/11/09 13:48:09 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%o}n
+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
+}