Version bump #373201 by Rodrigo Severo.

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

3 files changed, 118 insertions, 5 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index a5cac39f407b..8880f126aa69 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.250 2011/05/09 15:47:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.251 2011/06/28 16:34:31 vapier Exp $
+
+*timezone-data-2011h (28 Jun 2011)
+
+  28 Jun 2011; Mike Frysinger <vapier@gentoo.org> +timezone-data-2011h.ebuild:
+  Version bump #373201 by Rodrigo Severo.
 
   09 May 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011e.ebuild:
   Stabilize for everyone #365873 by Arfrever Frehtes Taifersar Arahesis.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 76ef9f9d1dd2..df98491dd0d9 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -8,15 +8,17 @@ DIST tzcode2011g.tar.gz 194929 RMD160 4fb4d5da1da40776e1be96d5cbad3aced75366b8 S
 DIST tzdata2011d.tar.gz 194588 RMD160 8024546fb4333ce19dbafe7b3569e877edf7c920 SHA1 2d22bcf138707b9171ec54359ec872ca5cb343f7 SHA256 415a54774094e8dcdc9ba141fafbee4b3b2f2140a5b8cf012eea4b37fb9a23bd
 DIST tzdata2011e.tar.gz 195424 RMD160 6880d6694b947ac396d11d83bb8cbea5ea956913 SHA1 5f391435e9bf494698332f1307f9b7ea7e128e16 SHA256 44fef01de4589a4979eb6b5fdbbfd21a3b135852af1ecbfb9e0368ae47392c79
 DIST tzdata2011g.tar.gz 195818 RMD160 3490c919a9622083fed7f48b20b344a61af167c2 SHA1 6d93b9badbb394563d70efaa46c1f507923b9663 SHA256 01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c
+DIST tzdata2011h.tar.gz 196441 RMD160 7a78e9f9537340bdfb0fff1ce62f837722e39624 SHA1 cd0196ffd145eb7c7a0ed636db7cd652224a2749 SHA256 c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24
 EBUILD timezone-data-2011d.ebuild 3017 RMD160 a04132eb2e56ab0bed99e394efd786f0dae3ebe7 SHA1 1967fbeccb87a25c5a6573c7bd95d92ffc5be544 SHA256 a4218e393ee9c1f2a8dd318710c7fc673d22ab6ac21c3223299b59e98e0828c8
 EBUILD timezone-data-2011e.ebuild 3017 RMD160 03c07f4da81d4cb1fd00099706d563b6f379a064 SHA1 06786e7a335dde08e3fcf154584b90caa4b8ecda SHA256 72efde75c7024c2e385c4ddf22d56af260220dba8461f2a85ead7334c8856117
 EBUILD timezone-data-2011g.ebuild 3029 RMD160 fd707f92b634e8f5dc424e9dba6790dd533a2209 SHA1 b658dd476680f7ad105f6ff23e11b33c830b3d29 SHA256 5bca62397ec4cd6d39fe1b5c894d28649e64e646bb07c0771ee7644b917ce6e8
-MISC ChangeLog 32514 RMD160 6b794f8aeb1cbdbde5e0358ccc17f40bd4926216 SHA1 a9d37dadc223fac96f538a36a6b3c46fdfd13d57 SHA256 00f1834bd42cc14a06f6c3b46b7a8cf20e750b5922c0e76d20872554259c5432
+EBUILD timezone-data-2011h.ebuild 3032 RMD160 d5564bd13796dc4ff023c46fdd58c7637ebf0c06 SHA1 aa56a8847b30c39fd90b53b932dce1a0baa0a51a SHA256 e911518bbd7fc500bfb8a8002c9f94232d91464285b8ac9352667d7a5c2cf9c3
+MISC ChangeLog 32672 RMD160 72ebcc9f1ab4bc93ca4f6845714a3350facc4965 SHA1 5eb4d8aadb2bc48b970c4f09c91a2c339e751ccd SHA256 2ce0ae15489b6dca4568edae252f04c72d174d5732eb0f54bf5fc6b80eb5115a
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3IDNwACgkQaC/OocHi7JbjUgD/XoBnwB1BAEuEzXTZLpx9ML/0
-DvWHHrnGiiWhth6aq9oBAIdZQ6NKRWiOxyeL0lFINGDJHDzic04X2FlxdLb5W3n6
-=AtUD
+iF4EAREIAAYFAk4KAqAACgkQaC/OocHi7JYUngD/SYSZ7QBcxaN2SGTcmaoQQuUY
+XPYekEUziD70PtdMf+oA/jL3CdDlGbjG+7M1kDfnM4JYdUqmUgcO+sWUW4sFRvsi
+=RJbP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2011h.ebuild b/sys-libs/timezone-data/timezone-data-2011h.ebuild
new file mode 100644
index 000000000000..66cf5a0a43f7
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2011h.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-2011h.ebuild,v 1.1 2011/06/28 16:34:31 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%h}g
+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
+}