timezone-data: upgraded package to upstream
Upgraded sys-libs/timezone-data to version 2013c on amd64, arm, x86
BUG=chromium:233979
TEST=`cbuildbot {arm,amd64,x86}-generic-full` works
Change-Id: Ib9fd13e0f1775cbe2a440c91f4aa15d142f214fb
Previous-Reviewed-on: https://chromium-review.googlesource.com/168630
(cherry picked from commit 93108db33b3bd199e75c296b8a2aa018ad1b039d)
Reviewed-on: https://chromium-review.googlesource.com/168722
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2012j b/metadata/md5-cache/sys-libs/timezone-data-2013d
similarity index 64%
rename from metadata/md5-cache/sys-libs/timezone-data-2012j
rename to metadata/md5-cache/sys-libs/timezone-data-2013d
index e5d5bae..c6f416c 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2012j
+++ b/metadata/md5-cache/sys-libs/timezone-data-2013d
@@ -2,10 +2,10 @@
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
IUSE=nls elibc_FreeBSD elibc_glibc
-KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD public-domain
RDEPEND=!<sys-libs/glibc-2.3.5
SLOT=0
-SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2012j.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2012j.tar.gz ftp://munnari.oz.au/pub/tzdata2012j.tar.gz ftp://munnari.oz.au/pub/tzcode2012j.tar.gz
+SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2013d.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2013d.tar.gz ftp://munnari.oz.au/pub/tzdata2013d.tar.gz ftp://munnari.oz.au/pub/tzcode2013d.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user 9e552f935106ff0bc92af16da64b4b29
-_md5_=a275be726a45f053c07bac13a3125326
+_md5_=59d86befc89804601818db4b8b4efd32
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index ebdd3b1..a4eef6a 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,2 +1,2 @@
-DIST tzcode2012j.tar.gz 134654 RMD160 828b30a423e82cbb4d70901ad9a611003bd4b281 SHA1 524808d703aa0fe54cdb19dbafb75c48028e72ad SHA256 ee4361b3b4ae201a270857c84d0f063c2a2191b3e4cd7414ea4622bb8bae9a82
-DIST tzdata2012j.tar.gz 214075 RMD160 0bd2994f6cb00fe45ee87285909e53a94e2c0334 SHA1 69a5c9866612792b010f521c0f7b9a34c4e57192 SHA256 4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa
+DIST tzcode2013d.tar.gz 138198 RMD160 74d2b1588dff5919bc2c0eff8648699cba3843d8 SHA1 e83b5304bf6ba93a590eca3c738b63fd0ed8e74d SHA256 2d9eb90c94644cddb74a490d1184ef9f88efcaa7a2b1bf88be0ee9eeeab707b6
+DIST tzdata2013d.tar.gz 218918 RMD160 6167a41e9cdd8de4c73a22e096742b4077ba8ffc SHA1 bdf46d0a6de276a21f1cbce6022888568c5ee520 SHA256 cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04
diff --git a/sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch
similarity index 86%
rename from sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch
rename to sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch
index 383492d..eb52f87 100644
--- a/sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch
+++ b/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch
@@ -11,36 +11,37 @@
- Flags to the linking are passed as LDFLAGS, not LFLAGS
- LDFLAGS was missed for the 'date' target
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
+--- a/Makefile
++++ b/Makefile
+@@ -46,5 +46,5 @@
# Everything gets put in subdirectories of. . .
-TOPDIR= /usr/local
+TOPDIR= $(DESTDIR)/usr
# "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,9 @@
+@@ -52,5 +52,5 @@
# Use an absolute path name for TZDIR unless you're just testing the software.
-TZDIR= $(TOPDIR)/etc/zoneinfo
+TZDIR= $(TOPDIR)/share/zoneinfo
+ # Types to try, as an alternative to time_t. int64_t should be first.
+@@ -59,5 +59,5 @@
# The "tzselect", "zic", and "zdump" commands get installed in. . .
-ETCDIR= $(TOPDIR)/etc
+SBINDIR= $(TOPDIR)/sbin
# If you "make INSTALL", the "date" command gets installed in. . .
-@@ -53,5 +53,5 @@
+@@ -67,5 +67,5 @@
# Manual pages go in subdirectories of. . .
-MANDIR= $(TOPDIR)/man
+MANDIR= $(TOPDIR)/share/man
# Library functions are put in an archive in LIBDIR.
-@@ -241,8 +241,10 @@
-
+@@ -293,6 +293,8 @@
###############################################################################
-cc= cc
@@ -51,8 +52,7 @@
+endif
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -281,11 +281,13 @@
+@@ -335,11 +337,13 @@
ALL: all date
-install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
@@ -69,14 +69,14 @@
+ cp tzselect $(BINDIR)/.
-mkdir $(TOPDIR) $(MANDIR) \
$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
+@@ -351,6 +355,4 @@
$(MANDIR)/man8/zic.8
cp newctime.3 newtzset.3 $(MANDIR)/man3/.
- cp tzfile.5 $(MANDIR)/man5/.
- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
INSTALL: ALL install date.1
-@@ -333,7 +333,7 @@
+@@ -392,7 +394,7 @@
# to using them, or vice versa.
other_two: zic leapseconds $(TDATA)
- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
@@ -86,10 +86,10 @@
+ -d $(TZDIR)/right -L leapseconds $(TDATA)
posix_right: posix_only other_two
-@@ -366,5 +366,5 @@
+@@ -422,5 +424,5 @@
chmod +x $@
--check: check_tables check_web
-+check: check_tables
+-check: check_character_set check_tables check_web
++check: check_character_set check_tables
- check_tables: checktab.awk $(PRIMARY_YDATA)
+ check_character_set: $(ENCHILADA)
diff --git a/sys-libs/timezone-data/timezone-data-2012j.ebuild b/sys-libs/timezone-data/timezone-data-2013d.ebuild
similarity index 91%
rename from sys-libs/timezone-data/timezone-data-2012j.ebuild
rename to sys-libs/timezone-data/timezone-data-2013d.ebuild
index 2fed94f..b0f864d 100644
--- a/sys-libs/timezone-data/timezone-data-2012j.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2013d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2012j.ebuild,v 1.1 2012/11/13 05:52:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013d.ebuild,v 1.1 2013/08/25 00:37:01 vapier Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -15,7 +15,7 @@
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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="nls elibc_FreeBSD elibc_glibc"
RDEPEND="!<sys-libs/glibc-2.3.5"
@@ -24,7 +24,7 @@
src_unpack() {
unpack ${A}
- epatch "${FILESDIR}"/${PN}-2012i-makefile.patch
+ epatch "${FILESDIR}"/${PN}-2013d-makefile.patch
tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
}