From 8e3fbd04f6194fd0cbe16e6df55f5d97fc4676c6 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 14 Mar 2012 17:32:06 +0200
Subject: [PATCH] Revert "timezone-data: update to tzdata-2012b"

This reverts commit 3c77fe82be2321134aa029503f1b35d551910680.
---
 packages/sysutils/timezone-data/build   | 17 ++-------------
 packages/sysutils/timezone-data/install |  2 +-
 packages/sysutils/timezone-data/meta    |  6 +++---
 packages/sysutils/timezone-data/unpack  | 28 -------------------------
 4 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 packages/sysutils/timezone-data/unpack

diff --git a/packages/sysutils/timezone-data/build b/packages/sysutils/timezone-data/build
index dba8b0bc9c..b3f7d344a7 100755
--- a/packages/sysutils/timezone-data/build
+++ b/packages/sysutils/timezone-data/build
@@ -25,19 +25,6 @@
 setup_toolchain host
 
 cd $PKG_BUILD
-TIMEZONES="africa \
-  antarctica \
-  asia \
-  australasia \
-  europe \
-  northamerica \
-  southamerica \
-  etcetera \
-  factory \
-  backward \
-  systemv \
-  pacificnew"
 
-for zone in $TIMEZONES ; do
-  zic -d ./zoneinfo -L /dev/null -y yearistype.sh $zone
-done
+make CC="$HOST_CC" CFLAGS="$HOST_CFLAGS"
+make TOPDIR="./.install" install
diff --git a/packages/sysutils/timezone-data/install b/packages/sysutils/timezone-data/install
index 5266343eab..f675c70c65 100755
--- a/packages/sysutils/timezone-data/install
+++ b/packages/sysutils/timezone-data/install
@@ -23,7 +23,7 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/share/zoneinfo
-  cp -R $PKG_BUILD/zoneinfo/* $INSTALL/usr/share/zoneinfo
+  cp -R $PKG_BUILD/.install/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
 
 mkdir -p $INSTALL/etc
   ln -sf /var/run/localtime $INSTALL/etc/localtime
diff --git a/packages/sysutils/timezone-data/meta b/packages/sysutils/timezone-data/meta
index 53f0bb2166..31fa3447ff 100644
--- a/packages/sysutils/timezone-data/meta
+++ b/packages/sysutils/timezone-data/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="timezone-data"
-PKG_VERSION="2012b"
+PKG_VERSION="2011n"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
-PKG_SITE="http://www.iana.org"
-PKG_URL="http://www.iana.org/time-zones/repository/releases/tzdata${PKG_VERSION}.tar.gz"
+PKG_SITE="ftp://elsie.nci.nih.gov/pub/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/sysutils/timezone-data/unpack b/packages/sysutils/timezone-data/unpack
deleted file mode 100644
index 3f69c9cda4..0000000000
--- a/packages/sysutils/timezone-data/unpack
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-[ -d $BUILD/$PKG_NAME-$PKG_VERSION ] && rm -rf $BUILD/$PKG_NAME-$PKG_VERSION
-
-mkdir $BUILD/$PKG_NAME-$PKG_VERSION
-tar -xzf $SOURCES/$PKG_NAME/tzdata${PKG_VERSION}.tar.gz -C $BUILD/${PKG_NAME}-${PKG_VERSION}