Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 178 insertions, 6 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 637831510cc9..7ea5269d8115 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.322 2015/03/21 11:14:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.323 2015/03/21 11:15:01 vapier Exp $
+
+*timezone-data-2015b (21 Mar 2015)
+
+  21 Mar 2015; Mike Frysinger <vapier@gentoo.org> +timezone-data-2015b.ebuild:
+  Version bump.
 
   21 Mar 2015; Mike Frysinger <vapier@gentoo.org> timezone-data-2015a.ebuild:
   Stabilize for all.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 25bc85582b28..4fab92fa1865 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -17,22 +17,35 @@ DIST tzcode2013i.tar.gz 173169 SHA256 63bba6790afc1cb2ea0af2b998a35fc237e2476081
 DIST tzcode2014i.tar.gz 181815 SHA256 62591075fb0d47459889b71bac3c8487f09b7417b81dfa541d750b4889e84783 SHA512 ed780815a1e209616c791997f14da56cb9311c6585b70c503b32a11e8ec15e0dc04c37bdeaa5a1a1378ada714935a2d931679d0aa4ab42808d185b600e5d0582 WHIRLPOOL ba5bdf8117b64eda76dc559dd211fa83ee0662792a93004fd696b3d8463da2046d91a0cb45b88656230ac935b528b5cd3e8ce9a460c5e27fdb0b4a19ddadb666
 DIST tzcode2014j.tar.gz 182416 SHA256 7fd46125464856309fc81fe85a67a61de862b8ab884ce8ca82051f5fa308ede2 SHA512 1207670c168a80fe9db86307028efa3af8ca304817ebe36df5b5c2d2b67deba4294f05f4d6afa04220c3b255ad1903e2850bfb0649b2edfb2d754345a4b2490a WHIRLPOOL 87275670bc5eeaa634ea7cc858e0c52e61e69640d89a98119d42bf087f26b65216146749648c1347dca0924776e9f6f914ba85aac19c5a3e581ad329fb85de84
 DIST tzcode2015a.tar.gz 182993 SHA256 885bab11f286852f34030d7a86ede7d4126319ca74b8ee22be8ca7c17d72dd19 SHA512 80d3bd3aeb70e21552a599c6203670fe742ca8d270c3fc430a3045d8e8a6610ebfe74941532c0791d5a99d6e4bf5fbdf62918de57d377d3fd26e7f7f786c66a4 WHIRLPOOL de4d9ea9611cc47e71f6e64fc4b0f6c45e5b3c995268d6244ed58fdc9b5e6d896c0e3ce1299e04ae018681523dc1e57f2dfcd0fb7f03423a93282123eb8a0376
+DIST tzcode2015b.tar.gz 183630 SHA256 e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76 SHA512 d9b56c8ec98d9158d10cf80df0181864c467a4387b8ced5701f466c40885ea524bc1d49b0e17c0a18d8006a423da1c1b9a7e74626c4a916dd37cbb85e04b2b0a WHIRLPOOL 9e57737318d00470a6315cda75ed0cc3b4bb7f57de4c60b0d3b527be12164ec7c390f285dde23102c764e2ff6b9473d2e4762642f7a3e716e746bcacb931eaad
 DIST tzdata2012j.tar.gz 214075 SHA256 4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa SHA512 98515b92268a2ee49386f6955211c14b9fe47460ba1c3ec5d60681b1a934688c3de4452f8f757ca3a6924e15784585967c768e7c86be730378d0332c249584fe WHIRLPOOL 17af29d05587bea2b05762751d146101a8bcc647346aa22a33e06a095805ecf4feab62693b3216ba5d75cf87f8a63d8cbcee9167be4b6dfe7936e1828bbc4b8a
 DIST tzdata2013i.tar.gz 218866 SHA256 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda SHA512 679645837b940c0d4c63cb070e26c042461a520caa5fbe1ed12897a6bfb5c440352d54a9e1ffb8b7098a10dd9e2f33cf4c6f9cb0b6fc84c0dfc3898501ce4082 WHIRLPOOL f5c559b8bd3869e2f90792079329582d26d3e95f744543c40b5c3aa6429390a39e04697d68151730019e60cfa3c6fe6b4f8d3d3e79b6b4bed28dc4e81cffa9ce
 DIST tzdata2014i.tar.gz 289312 SHA256 2af331bdd2b794ec59b8ded7300fb29dc3573a009ec14183f5c9ad38e3886153 SHA512 d8893703cebfa337254a6cfb26b0c0083533922016d51dcb56c0cbc46ff7fb76d83e4e1359eec3a7728b4ebffd24e912117ac1f7425a150cad4d33e20033c40e WHIRLPOOL ca2fb6f470ff975168124ee30c2f4638ce9f0a68b0d999e451c19d328c0df438f6934b458b48e7d05a724445e7fc5c3e1ca5adbcc97e1998f88983630f132e43
 DIST tzdata2014j.tar.gz 290688 SHA256 a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d SHA512 4c2979be3a96f91f8576304ec905d571b73df0842c8300c1d7317819b45ab3e29948ed911aa265b12a4ad587d5cba44f646dd02e40e4fbf9e68556a2d327142e WHIRLPOOL adf3fc77aae18dccf05e3c990052fc2cb735a2c91bf9e93136cb45862e6f283e706beaa79373354817662a8b17449000a58760cb8f95fa78de88690207014a3e
 DIST tzdata2015a.tar.gz 292131 SHA256 c52490917d00a8e7fc9b5f0b1b65ef6ec76d612b5b20c81bf86a04147af18e4c SHA512 ff36feb437238ba42fe67257e81ade0a2179d11f6c6449146e28e4b6553c62348b4131af75e440b4467109c9edba13e25ddaf701f2fcebb2a258b4ac9b57293c WHIRLPOOL 22d42c60e87948c691255282aea9e4c9d69b46db8c19ef1c06a262b5e6054e45fec39c5fa8d1dc24ad121ed70bd3dfa24ea61fe97961938b733262238d74b5bb
+DIST tzdata2015b.tar.gz 293482 SHA256 556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62 SHA512 767782b87e62a8f7a4dbcae595d16a54197c9e04ca974d7016d11f90ebaf2537b804d111f204af9052c68d4670afe0af0af9e5b150867a357fc199bb541368d0 WHIRLPOOL e6d7bd671dd17c44b9d51744bda2283b42d5e4b9b673e693976af2f52f2a03a9571d6604a30b88701ed11f69a3a797429c72274126c0f45e5a4b9637b589a632
 EBUILD timezone-data-2012j.ebuild 3226 SHA256 189e893f9a2de810a15d4c36dc060bd488486238eb0b62e3e34b0f94f4580887 SHA512 b421e8f2ac49de3e5c35a429821c3b10a4545c11b03974d9091f088543bfdbb3276893ca08829d1bfc7d8c7eb9bf958c8de9543fece5b511e315bc031d4a5a9a WHIRLPOOL 8972b6e607f11ea8f4564d10213449afdb1c3961a18514f5a4881dd56a80fe24c59ad326899c302ee55f99823445810b18b7e85c2512384dad5bfaba44a30e2f
 EBUILD timezone-data-2013i.ebuild 3845 SHA256 92a0ec88188d6b037a8b44f4ecfa02a39cd2c6789600291c758c7b71f7b08b3c SHA512 0945048dbb8372333a278c383ed742cdd2795717114e30850daa3a77ff277c3871b09797e9adc5ffecc44e7ac0b0d1d5211945e924a4efc06a6e52aef4980349 WHIRLPOOL 6ae79b2d8acd8858a5ad10c32f4eea08c379f528b33ef72d0b1a9a764fcf5b6c9c29bc416404b1a4882c70468805610d43bb5f790e402b87b7303cbc891af5f8
 EBUILD timezone-data-2014i-r1.ebuild 4387 SHA256 9bd6c81988e70db63fa78b58bec3c78f57cbb647009333ba30989948277a133a SHA512 8a2f304411208a5417940fb6d2bd2a83450e6e6f309d9993b5ac352b26ba28c2e878f556bcd52b441978025173013fe6fc6eb58b2e9059d31b0ee49e9d838a25 WHIRLPOOL 695585b9f51f74649e12b20185e0b54a8d4706ac4ddb5fc4f198ef697f5ff5de81758c85c1e6cf9682f5e6e9c050bbc336b031e1199253df88dae7a0eec3fdb9
 EBUILD timezone-data-2014j.ebuild 4384 SHA256 a7a460664a6e03e31f90a591a9179603fa006bf1b1378756aca01552051b1969 SHA512 7f647e11b2d307f384192dd0fb0d372bf887c25dc62c615c05539fd8e9a9c95d6be944972f43e2d54c32015ad6a38c35c72758996c5e72d61af29d07cb03d6a9 WHIRLPOOL 991a16c94ec780eca86a8caf2786e811ac45a0aa2bab6aced341a9741f0d025f9892a4ea7cd5d392b823ead1e33ef79dd6d6a3613f894dfe82609a34e0c8329e
-EBUILD timezone-data-2015a.ebuild 4437 SHA256 261856065071e0537dbe67201f569063e85b13554da825352270a9ce5b1e18b4 SHA512 6548a9dfc0ba089e95a741267e8e03ee5f0c220c70f6dd16c3dc50b9b944f4ee739afabb1f6cc4c9cd94efb8b784441d22cad390bb760bc7e6c5f905efe56ab4 WHIRLPOOL 9622da12209addc7cb15d2edf65414f643e65e60177f23b22907abbe75fd0ec1901ce1aa430d807fc65885e7c7e28c2730097ecd6af1e53add565ccd18db8113
-MISC ChangeLog 43887 SHA256 e2fe5f5b40274136890417a963e4dcdc47491cac652516751dc9c6a027577803 SHA512 553639c5298e0039da09f9d439c63568b49076e81f77e7dde15d7a06b3b6fad786734114745bc022bea7dd9445148784f5952049a09ab17db5fe350825512faf WHIRLPOOL 0edcf61fb1340f847f2b98a262d4ab0bdb7bea422c3856bb4bfb204c5f71cd7ee954f2396702358f42ebf29bea997292e319947aabe0e061845ec866650e62fe
+EBUILD timezone-data-2015a.ebuild 4423 SHA256 729504430de5ebe2acb3fa2f2f0eb154a79692c66608d9b32b599278ef7396b0 SHA512 5821c227466c450148e6b8ab5f8736a906fc3861652a04fe22050f21c5db21578490e4e80614e0e228c861d350484e4eaed1d978fdfa94ef6ed4b709aa7fa39c WHIRLPOOL 40e758e98bd45cbfe82ba961fefecfde0e58f0de50d9f6f34ca14740b36ffe9d80f42fb961f435ac9085a3388ef32f1e9a9a167ec9211cfd64f98606935a8896
+EBUILD timezone-data-2015b.ebuild 4436 SHA256 dfd0ddab5270bad0253532fa7596d5ed39dccb1e0274b813754fa593ddb1bac6 SHA512 66fac69abdc15fad6623697c6b35296028560b1109b56917c058fa0140914982d9865987845ccce465a68b0a1fdf8e35d99b9058defb28af3b7eb3ec533a0a7c WHIRLPOOL 1f61863f4e144b5fe7e3216c0192b81706f283b118e29a11d58dddbefb6f54d090f7322c51ed5c683f5f8cb3b88a5d4ed80a86064f406a3975e3f4b73a25877c
+MISC ChangeLog 44118 SHA256 e3b0b7451b5032b33fc1aaf837d752a5e103775c911703193fd2ec8e9f837c81 SHA512 a38c8755c72df6323bea73b6fcb67854e021f9020a633ebbc0f682721bfb8516f530ab441b6f277ce70bfa9789e26bd293f672d792b1b253338d2514fc0ad398 WHIRLPOOL 7f7f5c100a6c6a5bd2624c17e28d542a6ae6156716e139f1bb4303566e327d6dfff84ebf2703c764009a1f72486675517fe8e2deb7079580203e41fa4ca048a6
 MISC metadata.xml 472 SHA256 4ab35a5283c62aa867e05bcfdcaeb90e5ac191347a32735d37290885502a2511 SHA512 f91ce6146a369ddb6ee82c0d6e221ceb1fbe9beb073c2e37c27b07e0684c701328891a51f58ef9fefea6007e0111979af7034787b167735fb6d79c8462d9dfcc WHIRLPOOL ab3bbde9fbc205a887f591b7362034b01081c9a477dab314acfd92b4aa4b7e010532fdee7b2684504044fb3df2e8e8d09466d67765ec9feff3a2223ff7c54a1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTespYACgkQC77qH+pIQ6S1fgD+PC7OKxjdvPIhI8rnlZMjVFGJ
-NVuJ12StJNm57zCcqkkA/R1pZ6Y0GZOS4q72/9yMRzGB7sYE+s2cfKoqu2yQMfFZ
-=uakN
+iQIcBAEBCAAGBQJVDVK3AAoJEPGu1DbS6WIAjbsP/2p0Fb8TKJON+dg2vPargzK5
+RcPdM4tT/+wPV3hOwCCiyFeyUN/SON87AtmVQDzYfFnnbjnIXZI9wBzLKJBm0qMs
+kupFb+fbL3X3jB6B3/H3QbvgqnWP3FhiVhGoFuMvBnTfHjVZRzi0tE7rv3nCzkUJ
+Tu/qGGAo7xL1KTp0Gn18nGetykklm9HNGXFBQkdIcg3EnHnN3BcAB6DvrmyUIRPZ
+ja6RYczvAIF2sIODRQlQhDMobYEnOTrFAaUsapopCrZqPOWW9qIPc84azPnW6dpq
+AnuQX0VOMJqQVtliBq1TF7JD70c524bJrejBjcwzEoCNQEDCcCIo0aLHWjwsbUgq
+yzXXclLzA3mSAPpXanbgJSrNVPppv86Tc2j9J0kqYQwQsHXcnGhK4FpAJNaTTorA
+TkNRNDFL14Vnsemhz25L7tM4DpjW3Ocz8auTY3guiD5XygJN++o8iqUyCyWKWlD2
+OkOBG1iX7MR9sdxVchMK+FEznC3hAlzYvNDjKvlnjwevPdBCyB+cqOFIkFZ6vGDH
+J1O7o4lthMYQ46GfSJX/LsxOxsi1/gsjVeFEgkoBahTXpyOUKDq+0RB+I+s24FIF
++nmDyUZWzZkOSHZqR3l3okHxdMeJNPMNEnxoqGSdfNpJ/RJyi/9ignAV1oUI8lf1
+Hq2HvpvTsRUXlb6miHUa
+=T0Hi
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2015b.ebuild b/sys-libs/timezone-data/timezone-data-2015b.ebuild
new file mode 100644
index 000000000000..5541248cad41
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2015b.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015b.ebuild,v 1.1 2015/03/21 11:15:01 vapier Exp $
+
+EAPI="4"
+
+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"
+
+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 right_timezone elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!sys-libs/glibc[vanilla(+)]"
+
+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
+		# In case of a failed upgrade, clean up the symlinks #506570
+		if [ -L .gentoo-upgrade ] ; then
+			rm -rf posix .gentoo-upgrade
+		fi
+		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}-2015a-makefile.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+_emake() {
+	emake \
+		TOPDIR="${EPREFIX}/usr" \
+		REDO=$(usex right_timezone posix_right posix_only) \
+		"$@"
+}
+
+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 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			CPPFLAGS="${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}"
+	dodoc CONTRIBUTING README NEWS Theory
+	dohtml *.htm
+
+	# install the symlink by hand to not break existing timezones
+	if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
+		dosym . /usr/share/zoneinfo/posix
+	fi
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if ! use right_timezone && [[ ${tz} == right/* ]] ; then
+		eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
+		die "Please fix your USE or timezone"
+	fi
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
+
+	tz=$(get_TIMEZONE) || 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
+	if [[ -L ${etc_lt} ]]; then
+		einfo "Skipping symlinked ${etc_lt}"
+	else
+		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+	fi
+}
+
+pkg_postinst() {
+	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
+	pkg_config
+	wait
+}