Version bump timezone-data to 2014d (fixes bug 510422)

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

3 files changed, 152 insertions, 15 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 3779348a3584..8d982b70dabc 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.301 2014/05/15 07:07:02 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.302 2014/05/28 15:13:39 djc Exp $
+
+*timezone-data-2014d (28 May 2014)
+
+  28 May 2014; Dirkjan Ochtman <djc@gentoo.org> +timezone-data-2014d.ebuild:
+  Version bump timezone-data to 2014d (fixes bug 510422)
 
   15 May 2014; Dirkjan Ochtman <djc@gentoo.org> timezone-data-2014a.ebuild:
   Stabilize timezone-data-2014a for everyone
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index bc20ac721711..4452b6b84502 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -21,6 +21,7 @@ DIST tzcode2013i.tar.gz 173169 SHA256 63bba6790afc1cb2ea0af2b998a35fc237e2476081
 DIST tzcode2014a.tar.gz 174391 SHA256 05b93ba541b167a4c10f2e81a7baf972c24ff12db27d85f6c2dd328443c4d3f5 SHA512 bd48ce8b0bea23e7ab766acee7caf72bcd515ad3e039ab7d0356cde3d295d06a94497e4400b272bafcbca6fe9bef7c4f79fc58b7e2522e4aaa6dc43158f80745 WHIRLPOOL 32d6f2cb692b888fd2fd2dba3d3bbbe989fc387cb30778230e4b6c63aad8eaf274648f8fb14574a60620d4ae13cf66b462f480c97bd37f9edf70b838a112b44e
 DIST tzcode2014b.tar.gz 175361 SHA256 b5dad3b0c7880e3fc030f87354b93776d9c0e761a56f363d917ab02e1754a78b SHA512 0c72ae51240f3d5d56cafed76977e00ff6a8f228a07f17a0fcda2d1a86b25351114aaf79e8ca8d70a234bc0f089d699fe05280a2285c4ea39e067fe5dcb205c5 WHIRLPOOL 233c7d19e58774c1f2875968a89e898f4d40c59fa5985ad3966b6844c0da16ce68bc82dca89bfa499b9ea8467bf043c3ff82559501af73331f0d35ebdc598d81
 DIST tzcode2014c.tar.gz 175535 SHA256 1461e6f6973797ccf516421b272a28082fe26754e8ae94967d8f931a4c8f011b SHA512 f964b6a8e9be408ed6a950121669edcab81e75eed69a80f8050e87af1b8dd87ac0786bddee227bb64eacfd1baa6f6d085255f2aaa4e967bf82463267c291e682 WHIRLPOOL 39cc45f629d261fd2f6de7723b38c21ce323012ec80ec46f7b121ecdf2dc45f0153f3e96d65204f0b19466ee7d34db99464472587e5b2727c3b377ff6cf9792d
+DIST tzcode2014d.tar.gz 176681 SHA256 e9c775bb76c9700521ada77776277c25f8650a22b56d46c9f00f4147970ef13e SHA512 8448cd023322b0b1dda081a102305c4b066d2177516e2920bbcaed50a28df34a7236142176b84586885af869efb8ec7d21dfef69318f98ae6e84f36964acefeb WHIRLPOOL 1263dc168cb6dea29b247693dafbe7fd3896ab08fa6724ef74da1a64d23d27d58000313a5a4349ae1c8b9eb25e9420c6ba8697d0d43cbdaa8cf92656a3dd637c
 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
@@ -34,6 +35,7 @@ DIST tzdata2013i.tar.gz 218866 SHA256 1cd56a6ee964143ef0c65229968a5093988335b95e
 DIST tzdata2014a.tar.gz 219826 SHA256 7cff254ce85e11b21c994b284bccd1e12ecda9dadf947fbb32e1912fd520e8b1 SHA512 91493a5ea85be2db6334c71d742e490e109896de28b08f6a76fa6cd30c03edb8b45c2ed4cab254464f1e559aaf22b1533f6b3582718f56142114178846cd5a96 WHIRLPOOL 0318f5ad11a0985bfcb26b63f03624b9a035059327728c90c368a00db6976bf063a22c5e9d48d5209feb12c28362820002d849109b1bb5ad4315403add22b1db
 DIST tzdata2014b.tar.gz 220771 SHA256 d1e1f3e0c253a8ac0b35ffe27ef95f6366c37beb953391806cd922efce2b1cb5 SHA512 8f4884c2576ab91de062ed6277818b220ee43facbe5721f51d33a99fde5b3e299936e94d579662dd813076199efa348d8f26fff1c06b92055b0efba98c0ed226 WHIRLPOOL 8817ce37ae69cde263f72ec09e5df250a4b94848a3a24a482492958c5b33e67d74c9c63bd688850d0139c288e792f6b11c1c3fa527a061f29ad87d6ed7434a92
 DIST tzdata2014c.tar.gz 221322 SHA256 aa2924e012644de3a6cc3160ffff690cb3afecf350af435daefa43bb669fb8f1 SHA512 a6f4ad3f9518a8e40aa319926ae9414ccca4c408d846e3d0002483959cb50dd6e3363a7a8c39f3e706df6ce4464f8a66ee6b4d6f387ec00b06ab35471c04dbb7 WHIRLPOOL 6784170039e965ad8165c5775994648799d87110df6f161f6738b8e4371e1a11464e4f5821e93a8a0ebce54d4ffd32a82805aa109c90207ee218cb5912474f69
+DIST tzdata2014d.tar.gz 221406 SHA256 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 SHA512 51794aa2b00f1125f5a267fb8dfefd05df925a238bf31743002cc7367a3d2bb2c1ce04e5bd096c35ea629b1fe9eaddd2d33142a9d7e742a3d1b2a17b74453e73 WHIRLPOOL 3065df319712c9c30612b7873c3786cfdacba015a6024a3690d3f861f3b766d6c411764574d5ca6bdaeb05a1189797c1c427f4ecda5012d842e4aa04392f4cfd
 EBUILD timezone-data-2011n.ebuild 3140 SHA256 382ca5ff92759e7fd37355ee30d3ad7fdfebc4290a2c3f9ac38063ec3f2681e1 SHA512 a5a6db9d6ebe425174f83560fed5b949559c9cfadacc2a73adbfd3637d38cffa452453aaa90e29f0424126596c8ac4cee1bf8a8a6dbc66343117d5acd1f0e02c WHIRLPOOL c307ed3e521cddf3a18305c4eb8ecc5badfad6c5b8339402cd3fac3fba3861f59bde65c06b30769a75196bb35ed7dc12227882ca3193ab27aad0e95de9daa5ee
 EBUILD timezone-data-2012j.ebuild 3226 SHA256 189e893f9a2de810a15d4c36dc060bd488486238eb0b62e3e34b0f94f4580887 SHA512 b421e8f2ac49de3e5c35a429821c3b10a4545c11b03974d9091f088543bfdbb3276893ca08829d1bfc7d8c7eb9bf958c8de9543fece5b511e315bc031d4a5a9a WHIRLPOOL 8972b6e607f11ea8f4564d10213449afdb1c3961a18514f5a4881dd56a80fe24c59ad326899c302ee55f99823445810b18b7e85c2512384dad5bfaba44a30e2f
 EBUILD timezone-data-2013a.ebuild 3236 SHA256 1fc1cba3d07afaacb31d71942d542deccf0a3e3383e5854519078b501449e30e SHA512 0f21ffa6306a3e4d0ae5df5e0ec5ff464c350e921dfab0330de159b9196b996ea91c6a81623a94896c71875054fb54ea167a696409245e9b916a4da0788430ab WHIRLPOOL ced72ae6c5bf80b0af88b1d2e56f2f68712c17b15463c4543019238999fe33fec032c671eee0d5b68c643926f8bd6ccc608bb5202215cb4ba6426a883214d50b
@@ -47,22 +49,23 @@ EBUILD timezone-data-2013i.ebuild 3845 SHA256 92a0ec88188d6b037a8b44f4ecfa02a39c
 EBUILD timezone-data-2014a.ebuild 3829 SHA256 cdd7615b033bc89ba5ec0d753e0c78a5d16fac554fa81408914460566c33df5c SHA512 4b84110c3014208c66553ef8f9086287ce07026fdf5e6a226e1ee50508f8c569b709a6963106f20fe61989312f07e08dfc370c9ecf4705815f52f603f2ac1209 WHIRLPOOL cd156fb88e0d9174047204c46b39a62c36d9c24fa285c18198f11e18e60c3c5d4952ea990ac4d9e17b97332a6ace33d7f309a917cc37150c7f71a51512a3bd04
 EBUILD timezone-data-2014b.ebuild 3845 SHA256 98f1ec5078de19b37523defd1d9fd7b95104be91a78a9a39074ab59c08ed9f4b SHA512 25e0e1ba617de25d96c275a55891fcbf061af95bfa9714c55cd62be4bdadfd9f97ab82e2414892defe8f51734ae1117101059751f927633c855fdb8fb2179259 WHIRLPOOL 7048542b8256c9997589e3b2bfcd4d65b8eca6db814109dc2699b4952faaf055c297aef4f80a7d58d058028d621b0e7b52a90b85be7a95f568a68de7bac63291
 EBUILD timezone-data-2014c.ebuild 3842 SHA256 0ffbd0bf80590896251064a833d858065e69b7e0b1a2bf6f8741832f0b7315c5 SHA512 a017053ec5cbd34e6471106aa8ac42c8978181a752dc3b95e3d9aa099685126790bf897606a59a5c816e7f73110a05b15ac61d56ce98be5a8868b6d8e822aacb WHIRLPOOL b8a7b933ceb56e38d285188d822518cb26c06b4cb8eed21c4632555163aef38c13f0cfcbdb654a27875b7026dff27c5759a4c5b25945299c536449a3e95e8840
-MISC ChangeLog 40450 SHA256 1ceae94d8c24d27dfd7f7aec3021b9e680330efec06c45e65d9c242b7f0a5627 SHA512 376fdf83127ca69a1a7d97e49364732c4679c865e3691b530ab20e66c66ca65d0a01424317a721369010f337a08e11fc048648d412a3fc34871f7bddc552fb26 WHIRLPOOL d47b23633d3c2f932af5550e89d6ec84950237d12b04bbeafb892ce8733e76610014036f5cd6f0df806ffd51fe16e5e24c7c25ff3de498a03d71ee3f57130693
+EBUILD timezone-data-2014d.ebuild 3842 SHA256 2fa6a2c3131110a017abeb9c7a6757b772023eae4948ab4f449ad5d937e41be9 SHA512 c1bca6dfdbda835dc1b46cc79135f417dba473a659d0345fbecbbcd48627ae55bce058a781b42f6cbc5ec5441f8cf7286110dfa48bef8c870adb1ee13890ec78 WHIRLPOOL b9a0228d3e1fb6d1f8343c36b758aed9ae802cbad52705b8644cc3041e501d80bb9838a6421546781d537f65951eb2cf17fd45696ae1e0e100101e33e12d45af
+MISC ChangeLog 40621 SHA256 fcdcb38c8fa5d915704ff1129ea0d39f81933ddd417675e2f76888eb4a0fe4c0 SHA512 f6402684844fd19163d296dae051102c0bf77360da6cf582ece01318d4f16f178d4decdf01460f117581cdaed84317b6f904ebbad4afc39f1deee7f9fddddb2f WHIRLPOOL 35b7e2ca64783ab1805ca756004a7eb9c5b044c321cc53aa9eedb67f27dadc5c903e5f7c897cc7f2a191731a43ebf3db648f0cb39506c4ef0765a1851bc0208f
 MISC metadata.xml 262 SHA256 fc8b85adf6da7103f13237c3796f6deabbfaa022ce4ee9eed4510c32442df512 SHA512 8e54516211de1628ecc1d896a47efdbdf828abd1815d5f3220a724b8e0dc160d9daa905f0b8fa3685ba0ff0a58abd23c75ce61998e20d8a8ec1f1d642eb74b17 WHIRLPOOL 56834aa3ee133edfc9aed39692f48f28978c927b36d4d790eb6f67cb6080a797f9e1c4b27d68bed16961e31ae024c132fd15c546f2b79b1216080ffbd8ea056b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTdGebAAoJEJ+WuSkwOAOB6jgP/1YIfSBOh00vc/iK5AUxx1ZX
-VFHXj6RrgfiQBX0yjZTT/xYSfF+eLj6tSMPsVlX2NrtQn3e8XOShKSjxx9yS37bj
-vmkjTHIFV9bnKFCsmx0UDM8TXgi7PAPKX5yEcPODh0EXpC/8WfbBBP+txT82FHEr
-cB2TgiR+8yGBPOoPwAn/G8Ix/TWbJLb6YsL5JuBImuy8qibVzT+2H95dHNObdx/i
-ABZYDFJK5irneOKHruwZgHknCk5xaHnJyMWpqsnnLJXEybIhyrOBHmP0+fFMBMv/
-aY50FbIHHZKNq1HX4e6xrHnLIu7oMd3juArs133qCsdLdV4aTsq0rdzFnFo3PkSY
-op02x93IDZ5MdvDm7ZhmSQh7B3toLuKM5njCrKt1MFHqspopL5KPBnib9KCqWvLh
-qFRAwR0/bEd/+OVtWg04aHheo55evDwtzmUlMlh0j6kp1JutZxYcQdt+BErR4Q5M
-B31aHO9dDBQ8DyKXyMwZtXUst6TmzHFQ2pa3twd+IJzt7I7G//5WkKeQOwLFKyH1
-KHu5gcBhxlR3nkykUcr7jystwr+xwzR6u7GZqkhSXUhL37mdbsPULgUbRPnEJEdm
-vkbygKSbyAeSCfAY4SdN/txnbhPwnCu2d/1H/5RQ9uNFtSUNIIJSGoe+/uxOUido
-S0Re5VZfHNSB97uO8vBU
-=1Lqb
+iQIcBAEBCAAGBQJThf0oAAoJEJ+WuSkwOAOBk60P/2F4aG02qxZ2x6rYx5v0adzR
+yzUDJR1wPHXLBPjYdorIqQSHnbUrmQBeHXlB5tYoUV0JSxVwdPomD2WiosqBj6Vj
+95hkRX69UMg2wj37FY3SscWsEJ2ZjV7b3sE5CzNQbB1wMN0VRR0Kz2L6nJPF3g7L
+HpVnnTq0bx4LSVw1Duc8lsoPPwUpnizer9v0hlIHH1+fJq8Tv0SIx5lrV/tPPL6F
+hXy+Mf/6mW15OMefoS2tpah6TQbwp/y3fRLf9Yk/GF5Muynxuj+BJwn63d6WpZZe
+uGCjewQuAfl6lyltkFn0gTIhXggUFsFtTyDdqBsqdujageto9/Q7A86lgOGNJfdM
+bRh3eD65k1wETzo4XYcvfDRhNCg3ExuYEC+MnrjkY/ePlECYeBOXDyUprSQKmYf7
+um7jfidyMXUc0RiRCK8NBRGaEWhRcJHmLU7/UcXesQB5kJvAhdKhwTdgcfJELDRg
+Tiu66rosd7PgAz35m6buuHmAT5GsAE2spNgVhKVCq9mU0fnjhK65fI1jMz7oV/q/
+BFTiVpF/lbo5WeiJOHUWt3F+r2dR5eqwHMgZmCED3wpO3hnf4/f2Lxno4l4z4puN
+lXTDdDCdMMXjnGaCLpI8J/S2Bu/klw9geREGHJHB6HTwAr9DUasgUxQjEylQuYjC
+gtPga9COwnRBkDNnGPA/
+=f5ia
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2014d.ebuild b/sys-libs/timezone-data/timezone-data-2014d.ebuild
new file mode 100644
index 000000000000..1a3cb424583f
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2014d.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014d.ebuild,v 1.1 2014/05/28 15:13:39 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/oldtz/tzdata${data_ver}.tar.gz
+	ftp://munnari.oz.au/pub/oldtz/tzcode${data_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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
+			rm -rf .gentoo-upgrade #487192
+			mv posix .gentoo-upgrade || die
+			ln -s .gentoo-upgrade posix || die
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2013h-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
+}