Version bump #319145 by Rodrigo Severo.

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

3 files changed, 120 insertions, 15 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 9ae5f2bd728a..56d2b6a888f9 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.232 2010/05/10 19:17:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.233 2010/05/10 19:18:42 vapier Exp $
+
+*timezone-data-2010j (10 May 2010)
+
+  10 May 2010; Mike Frysinger <vapier@gentoo.org> +timezone-data-2010j.ebuild:
+  Version bump #319145 by Rodrigo Severo.
 
   10 May 2010; Mike Frysinger <vapier@gentoo.org> timezone-data-2010i.ebuild:
   Stabilize for everyone #319169 by Arfrever Frehtes Taifersar Arahesis.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index fbbdc58f0ac9..bcf7cd18b6cb 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -3,26 +3,20 @@ Hash: SHA256
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
 DIST tzcode2009t.tar.gz 191325 RMD160 6071d69d9367211cfe2ea32c9467f7317bb511d2 SHA1 2bc3abe70dd8b83582c22edaa86bf066c5508a36 SHA256 97f64d7056d6c18e6b4e1619bf94fc625a3d08413d238e0c5a5faba714a2297f
-DIST tzcode2010c.tar.gz 191464 RMD160 e2900289c3d98dd4f1e092122873be1caf4ca9f3 SHA1 151a77e7df589c95c353822626c33103301932d8 SHA256 1921ca7aee62700875af443d9ee40eb822f800bc3da131a1917d4c103784b324
 DIST tzcode2010f.tar.gz 191851 RMD160 b829a2dc015f5f752756e79a6d744e72025754b2 SHA1 c62af78a79d968f730e0528b9b7214495538aa80 SHA256 651d866c91ada925b4ac9491e69ebd5c355c46b2c01dd1741b5e6a609d93eb1e
+DIST tzcode2010j.tar.gz 191844 RMD160 604a0d9c8f30175f282c637d189591394c71431a SHA1 feac73315eb2ff82ff942590fcaea9224cc635c4 SHA256 f32b46405190e3a5f1ee4db9fb50aaf1379e6af4e5493402ebfc8ee757058e97
 DIST tzdata2010b.tar.gz 187080 RMD160 b466357f47e1fb002d1586b3bf1b41a30e2512b1 SHA1 c456b990d9a3c3874d17197b5c8b5ee57def0463 SHA256 a93208ae389cc0d3618731cc9f406ba2cfc6aac39668a06c687d3fae2a7e8210
-DIST tzdata2010e.tar.gz 187452 RMD160 b1473d8752d8bf25aa72ad055567599c5bc65fc3 SHA1 8668d6cde933470247a42246c7b73124ba403a89 SHA256 09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6
-DIST tzdata2010f.tar.gz 188147 RMD160 e0ea3c63b934dd16b058ffd275457f2278bd1605 SHA1 dcfb18ed88d00fdbb9e58f7cba190c86332b74f1 SHA256 823361e38da3f79a34c0adb835b1b6d2ae640937e3f7a7f4a2181500eeff0e94
-DIST tzdata2010g.tar.gz 188032 RMD160 4c8d6a70dda66c0f18167a6871b62d6ac8c1b8ba SHA1 7ae3878ae7dc98d905b93970138051653582f24f SHA256 a069dbea2989613466f9f4adb6de381efb46aeb9ff89e03fabb23dcae2c4cd90
-DIST tzdata2010h.tar.gz 188402 RMD160 510dc1685b3409aad0bac7002c1951756680047d SHA1 a576156646165f227b8e7502a549aef54bffaa81 SHA256 a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d
 DIST tzdata2010i.tar.gz 189130 RMD160 f3692083bef43fe9c44c2a40387a2d3baabeecca SHA1 d12988985b7a81db6d554d15f69cadc63ef2bd61 SHA256 bee0a26cca54db3413416d968c0a6361d83188b112d2512559d0e3602f254dc3
+DIST tzdata2010j.tar.gz 189870 RMD160 35c63055336aac4561c857fd6d388e57a0178157 SHA1 94b49ba5029cb9d9ac1d15c2812943823261832a SHA256 dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b
 EBUILD timezone-data-2010b.ebuild 3015 RMD160 2fbe1b19127074cae0872e961f628652d7b32e12 SHA1 60d3f400178b690d0292cfa329b8a7f100d70132 SHA256 1722894332834c0b0420c3122eeda075a83c72417feab30fbea2f6feb69cc8d9
-EBUILD timezone-data-2010e.ebuild 3023 RMD160 4a2c682a905b4fb1b78e1332d4b4802da7806e04 SHA1 4742f7cfff7a145b7c9dd84dacf4580e88924524 SHA256 ce72209c6f468f935c2e5a5849a0964705e22895bff4bc8cf9796ccad2ef44e9
-EBUILD timezone-data-2010f.ebuild 3023 RMD160 afe35c8c542f9d3eabd5fa074c5277562fb15c8d SHA1 e783304f09471072ebca86283cc403bd5dc75829 SHA256 e13d44740e33d63fcd9fa26eb93bbe838bc6e1cbedea1f3871c39201879f5623
-EBUILD timezone-data-2010g.ebuild 3023 RMD160 d0357a34e4a43907e38fbdfd21c7092ce82e7fbc SHA1 f3d0af508434e2f435d2d6643d6467385e82480b SHA256 d31eea20aaccd70deb6aa59bf48e0f9639a438b1ed63fdf10c6f816ccdc422f7
-EBUILD timezone-data-2010h.ebuild 3023 RMD160 c5302d75a10e5837b1d9ff013da0b1fbe7331050 SHA1 d15503a18fd69de4d94182fdf095cf0d01f16062 SHA256 253f319022cf3dda707979aea6efc4d57272f33ccd19a60e305d9d78544832d1
-EBUILD timezone-data-2010i.ebuild 3023 RMD160 295799c636f9453673fe5c3f0cece9901bc4b9e4 SHA1 62f826d00f61892b3eb2f7f6bccd03242fae5405 SHA256 94383537e735b983d6d65cd883b34cf2199c6aaa7552b1c9ee35fad6b5b19553
-MISC ChangeLog 29664 RMD160 a4decfc3db6d8d13b6fcd9051c66989a991b1a73 SHA1 6efd31778f65aa9c962f5f72d76fc33cfd127238 SHA256 eb1c74cd4c4bda6dc2a3f057aa1a38d014123c0d30bc0d6e07cf1cd45c3738cc
+EBUILD timezone-data-2010i.ebuild 3011 RMD160 4273edb60f7ba04583d045716b92652a4ebb1f1d SHA1 40a978cc9f9ffb819a76723838c83ae126727522 SHA256 601da6fc891b0a4c4041ea732e4a5cb1b623168d1480427264c4e7cb25c2bb8f
+EBUILD timezone-data-2010j.ebuild 3020 RMD160 ba4d78d800e73246e20313c14aba231a7a0844f4 SHA1 5fedc31851fab7423ab2991152b52fa9d817032c SHA256 8508d5bb1d1b7f4905bba88923502c36877931d3b219c79e47e5203a3e14d580
+MISC ChangeLog 29954 RMD160 f5f1e4fe69bfdf836ebe8bdd2bf79a1b26d205fe SHA1 401f974083bba81709807c3458211fb642a5c019 SHA256 1e4308f19ba18db4bdb6020272b71827e46de12d61280f3d54a8ed3227ad9e0e
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkvM46IACgkQTwhj9JtAlp7T0gEAwPxxnLTapZypHbXmio2mCGGC
-VctpUVm15LkUp9Az9kYBALPSiJguybD08S7+iP9BGX8wAL9e5PeMCmTwFqXnjzXH
-=oRS/
+iF4EAREIAAYFAkvoXA4ACgkQTwhj9JtAlp7vOQD/baQCmu+TyqiLQPHcw2lxl3GE
+7bZ56oAAXL6w/Hh7feEBAJuSn0YNFKQ8xaLZW3FfKqdTIWE37sTbmupoB9HokX3r
+=1PT0
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2010j.ebuild b/sys-libs/timezone-data/timezone-data-2010j.ebuild
new file mode 100644
index 000000000000..718d262581c3
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2010j.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-2010j.ebuild,v 1.1 2010/05/10 19:18:42 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="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
+}