Version bump timezone-data to 2013g.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 151 insertions, 15 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 70f6949550d4..5fca4af04c17 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.291 2013/09/30 04:42:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.292 2013/10/02 06:36:24 djc Exp $
+
+*timezone-data-2013g (02 Oct 2013)
+
+  02 Oct 2013; Dirkjan Ochtman <djc@gentoo.org> +timezone-data-2013g.ebuild:
+  Version bump timezone-data to 2013g.
 
   30 Sep 2013; Mike Frysinger <vapier@gentoo.org> timezone-data-2013f-r1.ebuild:
   Merge duplicate pkg_postinst funcs #485720#6 by Arfrever Frehtes Taifersar
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 7e8c2582ebfb..be6d7af5f0d6 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -14,6 +14,7 @@ DIST tzcode2013b.tar.gz 135558 SHA256 fda9a8bd15f06939f0ecd1edba17d5e66d4d526632
 DIST tzcode2013c.tar.gz 135554 SHA256 e46ee931927273108db1c6b5ab86c37210e903536a910b35a5699a08799bd6f0 SHA512 0d7ab4a695d1d3e49f1d178854aed2a46df7aa9167e22095528cae50805222c3c5ff0ba40d0d4062275cc42ba9abbaf331e18468a1992488b91d4e7945ecffaf WHIRLPOOL 068f27cb7d7ae2e4d4b785a3bcd47330eb850e0569f9ffc0e6c281962766cf09c597b71f52a6584ef869da3becbe76f2ba61e1c7343951842575334a156f59b5
 DIST tzcode2013d.tar.gz 138198 SHA256 2d9eb90c94644cddb74a490d1184ef9f88efcaa7a2b1bf88be0ee9eeeab707b6 SHA512 228648a2b7dd7f1e434c79e3a6d9cf7df04dfe22566a42c7ab8633a64953971df30c9e30eb28842ed22e10af99d03db9be59e7957f1fee0733a489166f77889a WHIRLPOOL 4604647c029a2a8cabfa886d93ed2c2ca4cdd7614dcb3225e73d8f526ce1921fe96977bf0bd472f55ea88916c3109c525a477e7610998be9e296ba29b66eb300
 DIST tzcode2013f.tar.gz 170365 SHA256 ffd83e06f61f7854827cd7ac34239ef29c3d5ec760d7216f06c68f1b1d805ea3 SHA512 80015341cb969345ba629da65bc41c3abc75e170ab4b6795ef83828d05a737ae6d3de89806a116ba7e43e0f2c8c0f28e91cbee2022b9f9115a79df26d046bd66 WHIRLPOOL 56fecf0d5131163dd89e6169f2090c65c07e5f01937b6a2fc70bd3a74c64e78efea02f8e18917a624061892a69e13e01685846fc097f16cad97980654ea4f22f
+DIST tzcode2013g.tar.gz 171550 SHA256 c7c358b459bb65cfab7b7bdd6a9689233fc393f1f9fdf4f0f46ca7dac5a9587b SHA512 dd4475916fe36609155d72cfe434b387455ba860cee15fbbbb5caf37cc77757d467c4ae80e81396280e8d3fb68e131373151e8d0eee9bbf8674b96f99e0a9cbd WHIRLPOOL 558d14d820ff7c2ace2f9f0e126fea708abc97ca4fed73f5ad682dbf6756b72729a67b481d4dd85a528cc3bc8ab09f53002ed69227d20c2e9c249bc3ad7f6557
 DIST tzdata2011n.tar.gz 204684 SHA256 a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd SHA512 2081fa44f00ace6539ecc1296f454fb96bb4afa61114ffbc58f46f82ef8ba2cfa22d7e48456a293502433dccca6d921db8f70d6c6e18a074996cfeb74534d2df WHIRLPOOL e7004894829c63baef91fd5fbc14b77a7fbd92ae2a6e001f279c8b1169bd5be009ae07af336ddaca148eadeba3383896b247a19c9e72d894e80ad60fc896f3f3
 DIST tzdata2012j.tar.gz 214075 SHA256 4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa SHA512 98515b92268a2ee49386f6955211c14b9fe47460ba1c3ec5d60681b1a934688c3de4452f8f757ca3a6924e15784585967c768e7c86be730378d0332c249584fe WHIRLPOOL 17af29d05587bea2b05762751d146101a8bcc647346aa22a33e06a095805ecf4feab62693b3216ba5d75cf87f8a63d8cbcee9167be4b6dfe7936e1828bbc4b8a
 DIST tzdata2013a.tar.gz 217511 SHA256 ed9f273f52d5df9ec09fdcf6684176bbdc86d0fbafcbc27b97e5a9c103024afc SHA512 c5b07246218f5c3c751b7ddc5c4ee127432fc19187019321beeff589596ae91c4d64400a63b6e335cf6a30643a8d9c8b9bd37d31c553424718626d7591aab995 WHIRLPOOL d1bb9d9e0d9e4d3df6f866dcd1b6d35cb07da0f2066e7d92140605f917f52e20f3acfabf65ff9e31f8885a088430cbef141b787088c37bcd8e7bca42d9f3007a
@@ -21,6 +22,7 @@ DIST tzdata2013b.tar.gz 218441 SHA256 70d589d0e76a3749403d2bb404e9214c2520dda4c1
 DIST tzdata2013c.tar.gz 218466 SHA256 e597a7eb239155eb2247fd4788f7fa10bf21d6469961200a6ca202f19cc15c87 SHA512 9fafc76ab3177672339a0e94f0083f01f8955d16f498fcd3d15c7e2f436f7f9d9b8d234e35b9acfd9ea58e5bfaeccca26a580f0498e07474555c963b31cf6de9 WHIRLPOOL bbe76f23e72f7d2611d9127344f5ed78a707ec6859074d03aa8f339d884a3c9d4842be24ca67887205ebc52530baff34ec35fce06885def2d1c28c90b28ca62d
 DIST tzdata2013d.tar.gz 218918 SHA256 cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04 SHA512 dc4220c8c2113d899b8901561a1335eb4de31881622fd78f2470c625689efe08d50575aeb927d688fd5d24739f1d64222d40221091ff25f9ad61a65f0ca039d0 WHIRLPOOL 3f71d25aaa22ae7bb56e23eda33a24250706450cf2af7bd0a70a80d9a54ab3d1d60e09530a87bd5f4b3fa013570eaa742a69b8cdae9b6cc42912d12938caf706
 DIST tzdata2013f.tar.gz 223967 SHA256 5b72ed29bea75e0b59cbd3f575db0aac62f96a2a36e652725f674a92a95d4ada SHA512 489c6386b3926bcd5c257efbfdfe4fc62beff7bd030e2c686c7de4857d8b8ba13d09522358aedc6c324a0dc5d449e0dbf48ec289a5e91b1cb70f36886604c239 WHIRLPOOL 8a6c5daef19708574f6c887798dca884d5452b04ecf566cf64d0a70b8adb4ce11356f0b29da3c687b73b022ffad134c0c727b62ca5f5eca6f6d35ebd898aa5c4
+DIST tzdata2013g.tar.gz 226943 SHA256 b6cdd3998dcc732a6ae5e101e1394f9d4d6dff68bd48a8fb78c44c2b997d3a4f SHA512 84107da6eb8bbc9063b06e422eb6ef4a5952039b90b4c86f6cc6ccecb370d1482dddf8be472d498b98cbb3ac6f7a0ed374f8b83613989a7d7a3a228b8910ac71 WHIRLPOOL fce805496f463cecac3c84c64dd5f1fe8c7eaea80bcfcb4796f1dac023e9c4de94203f64f1901ec6cb348d1986e1c4d965a6aac026ab6f9365d0ced691e8eefe
 EBUILD timezone-data-2011n.ebuild 3140 SHA256 382ca5ff92759e7fd37355ee30d3ad7fdfebc4290a2c3f9ac38063ec3f2681e1 SHA512 a5a6db9d6ebe425174f83560fed5b949559c9cfadacc2a73adbfd3637d38cffa452453aaa90e29f0424126596c8ac4cee1bf8a8a6dbc66343117d5acd1f0e02c WHIRLPOOL c307ed3e521cddf3a18305c4eb8ecc5badfad6c5b8339402cd3fac3fba3861f59bde65c06b30769a75196bb35ed7dc12227882ca3193ab27aad0e95de9daa5ee
 EBUILD timezone-data-2012j.ebuild 3223 SHA256 639d245c8222ef9a17e99caabd74a7bcf2f942e341487fd418c6023961a8602b SHA512 233fd76e99e92c3850dfa9726bcea3afacdd9e8b1bad48c76eae8286173f9ae590ec491a8a9d839256f570274086599cb560fc26a1ab54608e647e192d5fbcf6 WHIRLPOOL 61eddb2f818d30c5552273921c146884f1ca315509019e153f8cdbd2d5bddeb9ff2a0baafcd35feba572fdb871682d640678575962b52695a866b9568fac06c1
 EBUILD timezone-data-2013a.ebuild 3236 SHA256 1fc1cba3d07afaacb31d71942d542deccf0a3e3383e5854519078b501449e30e SHA512 0f21ffa6306a3e4d0ae5df5e0ec5ff464c350e921dfab0330de159b9196b996ea91c6a81623a94896c71875054fb54ea167a696409245e9b916a4da0788430ab WHIRLPOOL ced72ae6c5bf80b0af88b1d2e56f2f68712c17b15463c4543019238999fe33fec032c671eee0d5b68c643926f8bd6ccc608bb5202215cb4ba6426a883214d50b
@@ -28,22 +30,23 @@ EBUILD timezone-data-2013b.ebuild 3224 SHA256 573ef78495aa0f61c794fde1ee37b10acd
 EBUILD timezone-data-2013c.ebuild 3224 SHA256 fe5f492145bd0f33173646455765088d88855549a2c03962ec87af64a99bf21d SHA512 ebd4fe19a8cb5550456a797229812008716f3e7a3117e65794be6ac1eb80663525c8538a0b2343e83f8bacfdd39fa283aef0f3f463316b6cfbe4c3c76454eaa8 WHIRLPOOL 3788d04bac8644b5c7ac4a7274daddd870f5420b5b949abb92f7603386f8526b8358eff23e9eb5e4bb77d2eaa2e9952a3e5fb9b6f9215cec969c05be695af0ce
 EBUILD timezone-data-2013d.ebuild 3224 SHA256 da6d10deb221372b723e4b905478c69f1adeb2403e938837fe458b08fd930de7 SHA512 076e0269ba72e777a5656a49241f5e3b58d20518b3695493294a3d1e8abfd167d70f06fc43c67109e54d3d9d1a95a2b11e10957d49282088ebc550caafad4fe8 WHIRLPOOL c8357f0d069d20b0349e867967e86dba0839951e50026c130fee0e13e4cea3fec164a40d68b07d2690f77dcb75d8f196f3062c541cd7c583ac2af031d0c96dd5
 EBUILD timezone-data-2013f-r1.ebuild 3795 SHA256 0636eb4b52a29ec90d00bbfa49e6d3436d79c15c0796fb891a9a7954af64325b SHA512 fffb7d3245e90b8a59bec9148fcf4a3d0e39a93fbf3262b7be9dc9545ce2cfb5ae8544765b0799434580a1b0689faa02371c28e1fd8d1be8d160e44699973cba WHIRLPOOL 1d484e1f837303bca541622c65c29b349e8ab984899ff447ac741f5ced0aa05a0962efcb65f3a7a8ee2ee9e29f2538c39873d2ac1968c51a81e771a66b1755e8
-MISC ChangeLog 38942 SHA256 bcbb09db5a9ebdd147f6a48c44f8e3f5fd396831964f7ceabb390a994f37a574 SHA512 98c01f1472da9e35b4e9dc45666ee60c02d26dc55d41234fa3f49203c187f7f1d33eae7d6f8b4bd24687a4bc6b8031aacb5aa0240e48bac2979bd5927c717b3c WHIRLPOOL d1c8efca9f5181489c68d0e280427758495473069d0711db5acbd3052280d14a23d283b87580ee179d9787dd9c787027814d8f7b17851ef25bd4492dee8bdf77
+EBUILD timezone-data-2013g.ebuild 3789 SHA256 b73b3ea35df366a9ed04ad6eb750bcd154772043072de75547db701b980a3ee9 SHA512 1dc71b2adc09c4154bebde3ea3c5a808d763c3d69e1443200dc76f5c3310cf36bee0099bae4f45c0f40e1511576e327a81db3fb4ec0ac5b390c6cd994abba0ab WHIRLPOOL ef77a09779f60d55a0702db5a5dd9e14fdec431a319051a7cf95a9511d45a719da0661ef8306bfc09777ac6af51e4242a749e9a713a39fe071e215ac1c00f027
+MISC ChangeLog 39092 SHA256 90be74f2e61887e08859fde847984cf6a2e3710a367f304c770c51dcd4c34a7f SHA512 a5c2d35947e68659f7194b58fded9ce9322501109cd02c74889e7be9d35a4ddc2ab21fe09fbed1272161cdad79fe2c8628572fe1215cedb8e592351b10d6d65f WHIRLPOOL 190e6967eadd6e940cf2b885944992ba10b5c18d7902bf22534a12da2dc39fdfed15fc3ef03ace061c36a59a621f936a2eafdc8e16bb40119ed21be4f3bba051
 MISC metadata.xml 262 SHA256 fc8b85adf6da7103f13237c3796f6deabbfaa022ce4ee9eed4510c32442df512 SHA512 8e54516211de1628ecc1d896a47efdbdf828abd1815d5f3220a724b8e0dc160d9daa905f0b8fa3685ba0ff0a58abd23c75ce61998e20d8a8ec1f1d642eb74b17 WHIRLPOOL 56834aa3ee133edfc9aed39692f48f28978c927b36d4d790eb6f67cb6080a797f9e1c4b27d68bed16961e31ae024c132fd15c546f2b79b1216080ffbd8ea056b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSSQEzAAoJELEHsLL7fEFWojUP/27GK9GvpAqo11rlSDIjNIMS
-weNDQZQRn/wACIw2ugqvx4Vs9BATOzDQCIfEEWjp2GgyS1vVewpPwr1SrrwbHmUr
-B/FQksjX1QxTymXyR9zj9u8wEqWmYLDn6hhYCwWM6B5AR3QnkPW3bpxxv8LNLJz3
-vurh29JcuUCIc68GyiKj2T0BRMm9N2xgyEuadnID0hBPLh76U5zxLrm4JLU1Hlah
-X6h77c38TU+VePncUxm47c0iV8sKQF/zb5Agh0tWjgZyZlave1LzkI5WchdrbuEH
-tys+UGGoNqFsAR2+ieYI0sKbElVvegMxoodcGQUZh49bYxR3i6Cx6Vtsml+ln0Fi
-mMc8VgnQeKnozJpBjcWB7pTubkbhbjlLCYkII05/3EU5wg6NwHhfi18i6tHiVWf5
-+hXf3qyGNWA5S8zsvLs+fOF0lCle4uw3j6fq9ABTrcBub3W6qvE2uslmnc2y3A0l
-l0zT6VU8BINEKS7DzPXLnTyGZDyvCIexm6pbUEUc7VMPR8oX5R0zigUgTWVgnB/k
-eW5YwEid7SkZTsTGBOeu0lY7OBbDrXZdKeH8nNXvkq580LYDIkaskVkcooT+PXXn
-ucrZBbXvbToanOijFYzCwXWVcZUm1JZ+waIUZEqnlTBrVHX5imqZj/XEdMP6yuR8
-O7N9vj8SykuhEk4YbsnU
-=WyQh
+iQIcBAEBCAAGBQJSS78EAAoJEJ+WuSkwOAOBTQAQAKHHRqcJIjM0JMrOrflaqdqB
+fmCDUq7Y+6ns9pirbFA1kVOKSD9jon3fAnU9xNQM4hzrb4AmSLNk/ODkC0SjQpZY
+j7IM1tZv7h0B7UCnj6n3gpwYF5xiHzhqYkWiaDRRCOCB9fbg8Hqm0zdnQZSDnOCD
+olqxJMG1pKJForqpG0DhIdHbQkf/ttifw5yiRZejmdJwp8L+7MR9eYjugqMtdBRH
+M2NreswBK93+VetBfceAtmeCNc5RcTcUli0M/Rte6NcvMopYqAlqDZWlmglf9WO/
+h4EWmDoc2Oyhzz41LUxnDGTftWjE2bktqyi6xkX18VT9IAauz5gqeEjmFmQSXlsQ
+05R8LGyq4zQKYRX7GEdboQfuXd9L5nj5qitucubFshMB2b396UOPaxrN03pTgGDK
+G8o/qEBCERm/1bCRoDLoZIreV4fS6XJw28EtLkemYSS2mAUNCWm89W4nXFaQ4Rn9
+aJJb2k5+Md1PE1pVt4NoGW1f4rc1mmZVwAI5SpJQdX3jUoxv/WxqtldGfKTcru5C
+LD0j8OLml1H3HOSrLqohS/jNEXyRJ0jdx4U47wY0ctG/99CPoYMbnabwo+wK2vzs
+rZhguI1Po84SOEYZo/sYNDXdfxyaX9UXE4t8eFcWUC+jkCFRcGM/mZL/8RYgDNvr
+s7aHsyoGpFW4gUU5mGu8
+=gINO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2013g.ebuild b/sys-libs/timezone-data/timezone-data-2013g.ebuild
new file mode 100644
index 000000000000..8df940e4e15b
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2013g.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild,v 1.1 2013/10/02 06:36:24 djc Exp $
+
+EAPI="3"
+
+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="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz
+	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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="nls elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!<sys-libs/glibc-2.3.5"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# Deal with the case where older timezone-data installed a
+	# dir here, but newer one installs symlinks.  Portage will
+	# barf when you try to transition file types.
+	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
+		if [[ -d posix ]] ; then
+			mv posix .gentoo-upgrade || die
+			ln -s .gentoo-upgrade posix || die
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2013f-makefile.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_compile() {
+	local LDLIBS
+	tc-export CC
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+	export NLS=$(usex nls 1 0)
+	if use nls && ! use elibc_glibc ; then
+		LDLIBS+=" -lintl" #154181
+	fi
+	# TOPDIR is used in some utils when compiling.
+	emake \
+		TOPDIR="${EPREFIX}/usr" \
+		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}" \
+		|| die
+	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="${ED}" || die
+	dodoc README Theory
+	dohtml *.htm
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src etc_lt="${EROOT}etc/localtime"
+
+	if has_version '<sys-apps/baselayout-2' ; then
+		src="${EROOT}etc/conf.d/clock"
+		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
+	else
+		src="${EROOT}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 "${EROOT}"/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 ${EROOT}/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 ${EROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_postinst() {
+	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
+	pkg_config
+	wait
+}