Version bump.

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

3 files changed, 122 insertions, 5 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index bb1eb2b56aff..2e36eff6923f 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.261 2011/10/31 00:01:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.262 2011/10/31 22:48:03 vapier Exp $
+
+*timezone-data-2011n (31 Oct 2011)
+
+  31 Oct 2011; Mike Frysinger <vapier@gentoo.org> +timezone-data-2011n.ebuild:
+  Version bump.
 
 *timezone-data-2011m (31 Oct 2011)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 535427c3a90e..00965d67a02c 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -15,6 +15,7 @@ DIST tzdata2011j.tar.gz 198820 RMD160 8fe8e80d62fb4392197b7bd01b30e52398703de8 S
 DIST tzdata2011k.tar.gz 199725 RMD160 6e0061348316d47b987f838f106709b45a281959 SHA1 56f0847a10eaea672be19984b4b403e29631c98b SHA256 51f7d2a42b7fb9465feced642a6676afdf8b04a071e55f3fef1f0925bd67ef21
 DIST tzdata2011l.tar.gz 203374 RMD160 b933711b06246c9d452d846a193b53295a966287 SHA1 c6740ec9645b78750e2109b6d42cd283e16988d7 SHA256 cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d
 DIST tzdata2011m.tar.gz 204214 RMD160 e5b56e7d1be05a43fe3acd64522831475c2c531e SHA1 e6374cd41c5bffd7ade27c365c4bdc5213bb9d85 SHA256 c8e01f5b4a3cd8b8aee84b4befb4b671cef34353e5af022ed22071f5b86ef5f4
+DIST tzdata2011n.tar.gz 204684 RMD160 4a2a06ada05aca1ea99767caa1b23c6fcb88bcd3 SHA1 5435fae9844dc89f9d418aa956e161e23d1babdf SHA256 a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd
 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
@@ -24,12 +25,13 @@ EBUILD timezone-data-2011j.ebuild 3191 RMD160 0a4fbc29f5206221f7e3389a516427e624
 EBUILD timezone-data-2011k.ebuild 3344 RMD160 a243738879658c3bc7a2e1a74bfcdeff79a6e044 SHA1 dcfd5861620a231bf720099ca187dea73a82c13d SHA256 9b8b53b827566915b679f2a19371617f2bc845028af1e1fbe1e67d0ec9b74a93
 EBUILD timezone-data-2011l.ebuild 3335 RMD160 040bc7a997027dc7a6782c60dc96bd704c9420f4 SHA1 3da21009d17e9f74bc4fc20f2512fe3d0dca70d5 SHA256 f23c82c87b6a97d46e66a2b9c5499aae65f11307e9b1a6c32f4ffc1e2c4accff
 EBUILD timezone-data-2011m.ebuild 3152 RMD160 f3fb5865224afaf09965e76eb88a9106f181fd40 SHA1 4512293e5aed6fdf31d0c02347cc1d8616ddc3c6 SHA256 91abaad23ddba1df099eb1986afb07541e8f1ab3c3485900c965a156fee7ebe4
-MISC ChangeLog 34196 RMD160 5ba901efed658ee21cd29bee3f5aee288aeb936c SHA1 dc986d520ae6bda530b4927ca03ebe0b600b3a17 SHA256 cc1e0da99ff30a16d5389e45e3eb1d4f1474362245d7525e97875b4859e22e2d
+EBUILD timezone-data-2011n.ebuild 3152 RMD160 50b4be2c7bb55b8828bd98a8f5c76372a8567630 SHA1 4fc1a13cfdb80280d2239bb371f37fa29f339e36 SHA256 839db06f18eaca6784dcb14c47a14571cbda0fb17ee64efe9288edf63e8c5817
+MISC ChangeLog 34328 RMD160 946a6cfe52ca8e25870d5c6d6f2b7137b8668fda SHA1 2259b3e6e82ddc7d3dc6326f212565e0372bfcfe SHA256 a685d9b9e70299863b1efe99234c162e8daee319e0375e4b780a11f640fcf7d7
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6t5UMACgkQaC/OocHi7Jb87gD+M68nTBhR8XDtfZ2jnwrdzL5H
-6TqAnQnjH4jZWm1X2sQA/3vg8by8SJ6PzVTJM8MVLTeKQaN13lKLJEl7eGmxEHR3
-=gXcM
+iF4EAREIAAYFAk6vJaoACgkQaC/OocHi7JZ7bQD9E+1GC6Ooun0APphwXaL0sQgV
+72nDc3sdlZgCCTJQY+AA/ApMofFYnq/zn3zAA8ecb7e/7eyQYx5iMNYBP0DbCiWO
+=AusT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2011n.ebuild b/sys-libs/timezone-data/timezone-data-2011n.ebuild
new file mode 100644
index 000000000000..12aaf7425904
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2011n.ebuild
@@ -0,0 +1,110 @@
+# 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-2011n.ebuild,v 1.1 2011/10/31 22:48:03 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%n}i
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.twinsun.com/tz/tz-link.htm https://mm.icann.org/mailman/listinfo/tz"
+SRC_URI="ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
+	ftp://munnari.oz.au/pub/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
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src etc_lt="${ROOT}etc/localtime"
+
+	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 ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_postinst() {
+	pkg_config
+}