Version bump.

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

3 files changed, 132 insertions, 15 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index d2cb849f56f6..3728268adeb0 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.265 2012/03/02 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.266 2012/04/02 04:45:47 vapier Exp $
+
+*timezone-data-2012c (02 Apr 2012)
+
+  02 Apr 2012; Mike Frysinger <vapier@gentoo.org> +timezone-data-2012c.ebuild:
+  Version bump.
 
 *timezone-data-2012b (02 Mar 2012)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 0aa83e5e1cbc..de59c8cef1ee 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -9,25 +9,27 @@ DIST tzcode2012b.tar.gz 135075 RMD160 25acce807c9e19d8294fe4dd8eac08fba9d796af S
 DIST tzdata2011n.tar.gz 204684 RMD160 4a2a06ada05aca1ea99767caa1b23c6fcb88bcd3 SHA1 5435fae9844dc89f9d418aa956e161e23d1babdf SHA256 a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd
 DIST tzdata2012a.tar.gz 207574 RMD160 b95722a2d42744bb217e11ace7b5bc7195f86d77 SHA1 5bd828d0845937da92c0518060a4aa8fbad81f8d SHA256 c28f731e19e7b612e26b2a41e9089ebe0c67bad422d2b7882e4b32983277ee7d
 DIST tzdata2012b.tar.gz 207782 RMD160 b58bb8a633b664f5babed8a6681ecc25a039733d SHA1 cd7c43bf8ccf56d174a2b85d2da35e83fd8f1107 SHA256 2f9f8e2d1ae087be5917f60c3946e8dc3fe1068d7738c3395f2125135309e745
+DIST tzdata2012c.tar.gz 206206 RMD160 cf38b711231e0ddba2b4c0f7be4d18658d751774 SHA1 e0cd9c2cc0ac8d90ed842133b910d4bb3bc1a6dd SHA256 33e19e1dd27bda5239812587d72971509a15b59baff7abd692b77ff66f168a82
 EBUILD timezone-data-2011n.ebuild 3140 RMD160 83a5fb739aaee8258c1f65abf7b283524d178a51 SHA1 15d5530d9079478a9fcdb93cc75669e76b9312b7 SHA256 382ca5ff92759e7fd37355ee30d3ad7fdfebc4290a2c3f9ac38063ec3f2681e1
 EBUILD timezone-data-2012a.ebuild 3149 RMD160 2b0a66439594374adfb04ed1edb19107a20949ae SHA1 3f1ee03b9e097aea4457adaa2158d6e94f98213e SHA256 53c0bb7aee50f6131a710ba773598896d727577f2eda4d0778954b17342fe86e
 EBUILD timezone-data-2012b.ebuild 3149 RMD160 aeaa17a422eec993b60ebc030cf4774effded5f1 SHA1 504447d19e08cfb3cc0ff573a101a56c47519915 SHA256 53c3da8b922bd52c86a3a64d538d8039563e10b2c2e7edfa580ddb948d1ab75b
-MISC ChangeLog 35011 RMD160 95578d6b908d9cec1f85b5c0acb3a92338431be4 SHA1 4695e03ab4ba0d150ddbc6da5bd0e82b36fe7395 SHA256 4c34eead1559a4f7563674c8d6e97720362138a95abb3e23d1cd9350aa2ce044
+EBUILD timezone-data-2012c.ebuild 3152 RMD160 5ada854590881ce83cb0de2bb53b12c9b0efab18 SHA1 615fea1834ec2aa51a6b7df7499a9ea0b54e6dbc SHA256 09d2a54a7da8e73090ca0a99676763e79c685676a39bdffaf226152fdb890550
+MISC ChangeLog 35143 RMD160 7144d27343b4acedd5d7149efc733c3d7cd17acc SHA1 0da62c7313bd4cdb45cc4156a4ebaacb80a16e9c SHA256 a0d8d13ef55a1c82cf4155b6b666d431d5a49a0aa42ff490f0c1d67b9e0eeffc
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPUGg7AAoJELEHsLL7fEFWdtYP+wduEhBBg9nOWeBwqoAcZSok
-vBgi3fhTpr3eNX5FvOgwFnhy7bHR2nquLO23XBQoQwA2G1KLOw3+k03VRNtVNW1k
-3uuvc/BCgkT+r7KUe4hGsMRc+wVDKZdXcDnd6E6iB2YMyUZDmJFKZs6LZNjuKKF4
-4UPcJuE160ceKMB9K5mLRTrdbHbr1bA0Mk7oG8+pzyNToaAqh/Fce5Ia+u61Ss7d
-grc/FLqK2Yo9HIf6+IHw/2tQXp6ZlvH9vyafYvQrxKP4sE/1aqnCP4MBUzJyukxT
-2n2WLd9tYgRQhzFOBK5XEiBqncMVky9jtRTDtUF4xuNXZQLxYvOUMADk5r2qsU7i
-ICVemLhhFq7QmPUqtOewSDeqmXDE9M3sSWbnaLTZmMH/MnOsid0qh8mK/aYLCETK
-b8e9MPefPdNmSMGN37BS7e6dlOASE2ldpJbNYsmvCHYtwxJZjhLSzDrK5e2DC5lH
-0cOCCgK8usgi72xyBFMX/ALfu6JtPjDXoaiwyGK7KcjmmCfWq8iXk0XF2oRdCJw7
-fqsntqVv+vnyXeGwlIiLkMPDX/wa7UEzLLgWkdkg96nBqaXCbwWizZo6h+8fOtqe
-/vrEem4HlTSjjWyvXoWKAaDyMAemy8fo6Sk2APYQ6FUrcMtvZUwCWYH+VnhRrket
-xb1daCg45u/U3DfmG5Cu
-=IIrS
+iQIcBAEBAgAGBQJPeS8EAAoJELEHsLL7fEFWB04P/1wsk+RavomPk5F6Ff98fj9U
+GtoslsHv1Bl5lSw2LRwKR2CuBvTO9SGrKV96dnP7oQvu+A36gOdwvb8M8qUN852E
+B7Q5PTYq+nE3Ty6DQ8PeHMYdmwKrbC61YDBcxg6XbrWua9HIS3xTJfuY9NRA83wx
+j+ekTR39IOwKGydDytRvvmY1JEUPTSI6qyQB2Wh1C7ZKxVdA2zZRZxK5DVgVfDyU
+7sibBEPLlWbqlH5egqSC5B5ykDyfl9mAU2LLGuQEGPkDc39JUcmY7wEwAAJZHt3F
+dpaCNIsk7ITKswcDoixqrG3j5Ik9WFKcZSUOgIX+MTaJuH1NU1cEE/9gOLu2fgao
+QQ6Zbc4WZ1VXgPe4Xy8bnht7/Ulh9rXvhYHIfRBtfMw/uH/oJfOrGixuAttuPXVL
+Joqhf90A2tHehaHDseDU462uCcZlNUO4UkTbYJ+TH6HkWfFuFSHGyguZaJK3YZgI
+ypcFL2N8E/LOW1Thac/JshdrbV1wrSykxwwhZ0nO2nf/+UOIFjRTBo/YV3LstUNZ
++Z37CQ46r7UcmEZrVSnT0XrvrziW5qvjZeNu6EVd3S4BoriMOTuK9axT6ymQgrzO
+n3CYz3Xj6nRBAp9LxAIJhKUWX327A6jlinuo+glhrb4KH5j51cGa+8KjIiBSr6Gd
+SiGiCzYvUCWZhpi6uRVs
+=xiyy
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2012c.ebuild b/sys-libs/timezone-data/timezone-data-2012c.ebuild
new file mode 100644
index 000000000000..041c5d0c90db
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2012c.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2012c.ebuild,v 1.1 2012/04/02 04:45:47 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%c}b
+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
+}