Version bump #384983 by Rodrigo Severo.

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

3 files changed, 119 insertions, 6 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index c7e47bc1f050..41225d3b0542 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.254 2011/09/19 19:33:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.255 2011/09/30 20:02:21 vapier Exp $
+
+*timezone-data-2011k (30 Sep 2011)
+
+  30 Sep 2011; Mike Frysinger <vapier@gentoo.org> +timezone-data-2011k.ebuild:
+  Version bump #384983 by Rodrigo Severo.
 
   19 Sep 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011h.ebuild:
   Stabilize for all #383679 by alexsaa.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 7e253b70abad..e72230f83889 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -12,18 +12,20 @@ DIST tzdata2011g.tar.gz 195818 RMD160 3490c919a9622083fed7f48b20b344a61af167c2 S
 DIST tzdata2011h.tar.gz 196441 RMD160 7a78e9f9537340bdfb0fff1ce62f837722e39624 SHA1 cd0196ffd145eb7c7a0ed636db7cd652224a2749 SHA256 c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24
 DIST tzdata2011i.tar.gz 198665 RMD160 ee4a4e5db40ae4a2824a65b6658d920c6dc1546d SHA1 8274c0a5dfc41c7ab9ccfc919387b3c8180cd75d SHA256 f8dde7ca5e61f21ac34c8cdbef5568d00c829981211098f059d8104964c81ffa
 DIST tzdata2011j.tar.gz 198820 RMD160 8fe8e80d62fb4392197b7bd01b30e52398703de8 SHA1 f0be74619b61a7a000116c33022a9256bbda4e53 SHA256 7e8540a85f1b474df1b40b403bea5748311ca7731b3038e51d6abc7f2d223c2a
+DIST tzdata2011k.tar.gz 199725 RMD160 6e0061348316d47b987f838f106709b45a281959 SHA1 56f0847a10eaea672be19984b4b403e29631c98b SHA256 51f7d2a42b7fb9465feced642a6676afdf8b04a071e55f3fef1f0925bd67ef21
 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
 EBUILD timezone-data-2011h.ebuild 3020 RMD160 9846949c9a176202dc7695cc08d70dee81b6cf65 SHA1 5970eb8295efab0705e63091420fb30076abcf59 SHA256 3470b47a5b9b52d1fd791b1ca199b822de78228c9659b0d84528cb7bb98b0a70
 EBUILD timezone-data-2011i.ebuild 3023 RMD160 6ff5ed86d6abef3934224027e098d8296a6cfad4 SHA1 269080892d8d03e72fff2389736ecde578d05d1c SHA256 16a36db8e675249f7c4338c571fc85510c929c34ce447bb3b495a32763bee48d
 EBUILD timezone-data-2011j.ebuild 3026 RMD160 b642feff94fa048fbeac5503481768afa6361590 SHA1 9d10588d4bcdc3f5d390030894cf6a3dc6168164 SHA256 b5188135682c27c3fc44339cfd7593af501f2b0996acb467ca2d7f5adc5b26bf
-MISC ChangeLog 33107 RMD160 fd6d5c960c7bdbf0d3f101d0d755358f5e46da65 SHA1 235df260a97c3d8c3dd0b4ad5bf77473ed8abf67 SHA256 127cfa6b4a7b1fe5e2548602c5a0581dd1fee12f85946a02628333d65de9c2a5
+EBUILD timezone-data-2011k.ebuild 3026 RMD160 d0e1ae5dbcfa002af766545e0dd32f73946ea1d8 SHA1 f62bd6f98f8fc880a3ba987cb9451b2daf0ac19d SHA256 42b5bdfcdfed98980cd8597430a3749c71152e6e6e2e6666d6996b2763b78704
+MISC ChangeLog 33265 RMD160 d1ad9118f1d49eb3084d0345c1029af68c2b50b6 SHA1 d8d62a21e27d93178700ee8393f280a6320e44b3 SHA256 0f2599676aa79d744d27789eaa781b0c61ab509ecf678c6ed7860dcb83f1542c
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk53mPYACgkQaC/OocHi7JYwbgD/WnB4DZQq1NcsnLH73U9a6L47
-GUR5ny8PvDnEeY+XG3YBAJKUiISQ6nW5tpHGsoC9XNQT9DOOHsv6Ap8hPvw0bjCg
-=fhUi
+iF4EAREIAAYFAk6GIFQACgkQaC/OocHi7JbthgD9FjZ9TB1+lZyWqyfKbc+GOvpH
+xOp+SHqXgUFf1hM55+sA/2xZSdFV+3Lt+eqEI/FL9f2kpmJi1+W3IaF5Wq/JCsI1
+=8KB/
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2011k.ebuild b/sys-libs/timezone-data/timezone-data-2011k.ebuild
new file mode 100644
index 000000000000..db26454bc52b
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2011k.ebuild
@@ -0,0 +1,106 @@
+# 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-2011k.ebuild,v 1.1 2011/09/30 20:02:21 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%k}i
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
+	ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz
+	mirror://gentoo/tzdata${data_ver}.tar.gz
+	mirror://gentoo/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
+
+	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 ${ROOT}/etc/localtime ]] ; then
+			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
+			elog "Setting ${ROOT}etc/localtime to Factory."
+		else
+			elog "Skipping auto-update of ${ROOT}etc/localtime."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+}
+
+pkg_postinst() {
+	pkg_config
+}