Version bump #338932 by Rodrigo Severo.

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

3 files changed, 121 insertions, 9 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 4bd50a1b68ec..0138221d35d6 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.237 2010/09/27 19:02:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.238 2010/09/27 19:03:32 vapier Exp $
+
+*timezone-data-2010m (27 Sep 2010)
+
+  27 Sep 2010; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2010m.ebuild:
+  Version bump #338932 by Rodrigo Severo.
 
   27 Sep 2010; Mike Frysinger <vapier@gentoo.org>
   timezone-data-2010l.ebuild:
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index f379b563809c..58d96307e55e 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -3,20 +3,20 @@ Hash: SHA256
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
 DIST tzcode2010j.tar.gz 191844 RMD160 604a0d9c8f30175f282c637d189591394c71431a SHA1 feac73315eb2ff82ff942590fcaea9224cc635c4 SHA256 f32b46405190e3a5f1ee4db9fb50aaf1379e6af4e5493402ebfc8ee757058e97
-DIST tzcode2010k.tar.gz 192047 RMD160 fd211701531f8b3ffa2383047279fc0d9d7da9e1 SHA1 57ecc7173fff554a5ab73a4b4546e557a1599783 SHA256 96671eac3a98d0c974833c8bfa7ea9b537cc9d32573e902103846b90f6dccdbd
 DIST tzcode2010l.tar.gz 192046 RMD160 2fa4dc6de8b728033cad088e71cb5e7a909729e7 SHA1 c5957ab9cd82f5c2acfec941cc65cf1d61ef62a8 SHA256 489876779f75f1c7659d26c09c3bcce62188b60eeb3981e0e3cd1f7669808ccc
+DIST tzcode2010m.tar.gz 192450 RMD160 5eb78b3ee6801952b4b4d0543d7eff1f94f4e30b SHA1 605eb305d899d48a8ad0d48b0fb175daaf743bb0 SHA256 24f0274d531a53415f1314891bc0df47778044a53186a1c0eb2df3991af91a18
 DIST tzdata2010j.tar.gz 189870 RMD160 35c63055336aac4561c857fd6d388e57a0178157 SHA1 94b49ba5029cb9d9ac1d15c2812943823261832a SHA256 dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b
-DIST tzdata2010k.tar.gz 191382 RMD160 b7a4ccc4c71d587111364914dbea131c90f566ad SHA1 46d26a7709860aaef3a7dfdab7e05c94ce9ad233 SHA256 ef69c99504c0fd9864ba8ef1daae5f2d4df097cf7dc350f09b8f70386272408d
 DIST tzdata2010l.tar.gz 191467 RMD160 da2477896c92a57d6bb93f3dea6febaf63d6e8d1 SHA1 cdf10096260437556c3b7151790ec0db13d3d908 SHA256 bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577
+DIST tzdata2010m.tar.gz 191470 RMD160 551ea7eaccf64230dd4224997629c647d246535b SHA1 3e74330984b6aeb47cf27de2b860b2c69b2a0731 SHA256 1454a13a32e23e81195404d00ab97a64a356e9a5852fc7d121ed7e58cbdb75aa
 EBUILD timezone-data-2010j.ebuild 3008 RMD160 155b283b2da151f1783a605f09fc82afd9b1c3bc SHA1 3e400d5a45c417d35f328b438b27a6f314d33d4f SHA256 5e7a0df359a28a2df17e131fd11fec51c62c538b54db0f5fb3579b808501370c
-EBUILD timezone-data-2010k.ebuild 3020 RMD160 df8f09d23a81dc2f0b43d2bb3694d80273e424dd SHA1 cabb5d6279cb178f4f66576e64a80cbd4f914bb0 SHA256 768629c1e15d5068b1d0351c81f9b66417a134cfee86fe4c607c5e8d999e778b
-EBUILD timezone-data-2010l.ebuild 3020 RMD160 38905cd7bacd73fa09cdf7735670281128cc4fd8 SHA1 6739328626e5db5d01b3ee5c6c2f0240f39b4321 SHA256 d7a3558ca1d5c2350562616e07d5006d4417bbf09fe4e84c6077f07a4635fcd3
-MISC ChangeLog 30377 RMD160 6b07bba2c0e12ba94590ec9d49f8162fca73914e SHA1 b0ad3c2a6ada4588b02f44c40d6f557414af37fe SHA256 4b47340c6cb45461d400f1555709ac532dee171dd3128afe69e16f8d6b1272ce
+EBUILD timezone-data-2010l.ebuild 3008 RMD160 1b6fd07131a6cd5db07923660a7bc7c0886755d3 SHA1 a84bc3a07f4a234d24d415a51761bdabd033c43d SHA256 ed4b28b918a05bcafa9755423c6ec3065342b6429a30ca684769ecb6a19c0887
+EBUILD timezone-data-2010m.ebuild 3020 RMD160 4e87a592589b744ee06b8375b733ce975da37b14 SHA1 785adb78f63ecb2e5a6b72bfc7c334dbcaf331ff SHA256 ac32e2285f191383b1c3cac8f7bd5914b9497e5d6e9c09212fcaf4b7a81d85ca
+MISC ChangeLog 30644 RMD160 604d980d71983fe8bc809483804a2183f1576f5d SHA1 869107cdeeae60ac97e46cf549879eb6431e2028 SHA256 e02d600bb88fcba41a7ccea645da2d817a650e580a8ebcba046ec0df9b6a2def
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxpeqgACgkQTwhj9JtAlp5DRQD/artUwATMBCEYS2f117cPooXQ
-xbyGODsUvwLpQaQLmOcBAMMDbpET1t+DKqLIeTVcIY5tJTCHiRIfA3cOWQkkJTph
-=Ke/G
+iF4EAREIAAYFAkyg6n4ACgkQTwhj9JtAlp4vHgEAwQW5RjyDvysMyPdDPAPM0i/t
+10WYcgnvUoGS8ykrOYAA/iyDmxTpXHxf4T0LmxvvJ9RTOF+w6EArlPL153Xk5N1J
+=kZ15
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2010m.ebuild b/sys-libs/timezone-data/timezone-data-2010m.ebuild
new file mode 100644
index 000000000000..fe71bc49c0ca
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2010m.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-2010m.ebuild,v 1.1 2010/09/27 19:03:32 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
+}