Version bump.

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

12 files changed, 171 insertions, 910 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index e5ac22c97683..bbba80f48be3 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,16 @@
 # 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.263 2012/01/01 07:15:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.264 2012/03/01 17:37:27 vapier Exp $
+
+*timezone-data-2012a (01 Mar 2012)
+
+  01 Mar 2012; Mike Frysinger <vapier@gentoo.org> -timezone-data-2011d.ebuild,
+  -timezone-data-2011e.ebuild, -timezone-data-2011g.ebuild,
+  -timezone-data-2011h.ebuild, -timezone-data-2011i.ebuild,
+  -timezone-data-2011j.ebuild, -timezone-data-2011k.ebuild,
+  -timezone-data-2011l.ebuild, -timezone-data-2011m.ebuild,
+  +timezone-data-2012a.ebuild, +files/timezone-data-2012a-makefile.patch:
+  Version bump.
 
   01 Jan 2012; Mike Frysinger <vapier@gentoo.org> timezone-data-2011n.ebuild:
   Stabilize for everyone.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 86f7c2d21a98..e7d7d91e160a 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,46 +2,29 @@
 Hash: SHA1
 
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
-DIST tzcode2011d.tar.gz 193553 RMD160 a7ec5ddb3570f07c8170ba1daad958bbe367ba26 SHA1 47a2724b694b9528c0dbf92c410a790038c4802f SHA256 68f2c07471c5390199c09fe9fee6a22f8a4dac24713af88b92da17b33ad98cc7
-DIST tzcode2011e.tar.gz 193776 RMD160 3f05fe13a012ceb84d056c17ab7e5ee80bb79d96 SHA1 235a7d9835860a366f3e3256eea1f62a234d7afc SHA256 8fb00f8763aa51d83d6f3190d144124bb7176ca829fc08823d6205297bf0426b
-DIST tzcode2011g.tar.gz 194929 RMD160 4fb4d5da1da40776e1be96d5cbad3aced75366b8 SHA1 a3d3f5a9f780620aa8137b6f8fe3384b23ce6c56 SHA256 636c735d8df1276cc8ab88bc31bb36a21f91ed34e26d181303ecd8fe48021bc2
+AUX timezone-data-2012a-makefile.patch 4022 RMD160 81bb668ca5ca5fb338d0d7369db23fa7023b9ce3 SHA1 d5b2538fa088d13748c2277c7bf1b2c454dc134e SHA256 4bbcd3fa36ee6b2506df766b0f283826fd5bd2402b24aa25845971e8f38b51e2
 DIST tzcode2011i.tar.gz 135022 RMD160 c37e7813867af0f20d9cbf60ff1d7f0741ebba1d SHA1 4f58cede47df8bba55b37982d8b38cd65266d412 SHA256 f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec
-DIST tzdata2011d.tar.gz 194588 RMD160 8024546fb4333ce19dbafe7b3569e877edf7c920 SHA1 2d22bcf138707b9171ec54359ec872ca5cb343f7 SHA256 415a54774094e8dcdc9ba141fafbee4b3b2f2140a5b8cf012eea4b37fb9a23bd
-DIST tzdata2011e.tar.gz 195424 RMD160 6880d6694b947ac396d11d83bb8cbea5ea956913 SHA1 5f391435e9bf494698332f1307f9b7ea7e128e16 SHA256 44fef01de4589a4979eb6b5fdbbfd21a3b135852af1ecbfb9e0368ae47392c79
-DIST tzdata2011g.tar.gz 195818 RMD160 3490c919a9622083fed7f48b20b344a61af167c2 SHA1 6d93b9badbb394563d70efaa46c1f507923b9663 SHA256 01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c
-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
-DIST tzdata2011l.tar.gz 203374 RMD160 b933711b06246c9d452d846a193b53295a966287 SHA1 c6740ec9645b78750e2109b6d42cd283e16988d7 SHA256 cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d
-DIST tzdata2011m.tar.gz 204214 RMD160 e5b56e7d1be05a43fe3acd64522831475c2c531e SHA1 e6374cd41c5bffd7ade27c365c4bdc5213bb9d85 SHA256 c8e01f5b4a3cd8b8aee84b4befb4b671cef34353e5af022ed22071f5b86ef5f4
+DIST tzcode2012a.tar.gz 135103 RMD160 b498355392e7e141e12fc4ca3592cfec6e96ef00 SHA1 80e0c9efb067950f34826d0708ff61e72e019da5 SHA256 27b742eb8700cafd5eea06cd0c3781b9a23a2c1e5647728efc1b7048cb7f88a3
 DIST tzdata2011n.tar.gz 204684 RMD160 4a2a06ada05aca1ea99767caa1b23c6fcb88bcd3 SHA1 5435fae9844dc89f9d418aa956e161e23d1babdf SHA256 a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd
-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 3191 RMD160 0a4fbc29f5206221f7e3389a516427e624bdf9a0 SHA1 026bbe455be1adb4206483afccac1fd729b0b99e SHA256 baae9ee5574f0f92a0682a882209c9b331da2309ca7115f5c45a2104bcfabb26
-EBUILD timezone-data-2011k.ebuild 3344 RMD160 a243738879658c3bc7a2e1a74bfcdeff79a6e044 SHA1 dcfd5861620a231bf720099ca187dea73a82c13d SHA256 9b8b53b827566915b679f2a19371617f2bc845028af1e1fbe1e67d0ec9b74a93
-EBUILD timezone-data-2011l.ebuild 3335 RMD160 040bc7a997027dc7a6782c60dc96bd704c9420f4 SHA1 3da21009d17e9f74bc4fc20f2512fe3d0dca70d5 SHA256 f23c82c87b6a97d46e66a2b9c5499aae65f11307e9b1a6c32f4ffc1e2c4accff
-EBUILD timezone-data-2011m.ebuild 3152 RMD160 f3fb5865224afaf09965e76eb88a9106f181fd40 SHA1 4512293e5aed6fdf31d0c02347cc1d8616ddc3c6 SHA256 91abaad23ddba1df099eb1986afb07541e8f1ab3c3485900c965a156fee7ebe4
+DIST tzdata2012a.tar.gz 207574 RMD160 b95722a2d42744bb217e11ace7b5bc7195f86d77 SHA1 5bd828d0845937da92c0518060a4aa8fbad81f8d SHA256 c28f731e19e7b612e26b2a41e9089ebe0c67bad422d2b7882e4b32983277ee7d
 EBUILD timezone-data-2011n.ebuild 3140 RMD160 83a5fb739aaee8258c1f65abf7b283524d178a51 SHA1 15d5530d9079478a9fcdb93cc75669e76b9312b7 SHA256 382ca5ff92759e7fd37355ee30d3ad7fdfebc4290a2c3f9ac38063ec3f2681e1
-MISC ChangeLog 34433 RMD160 fa911918e3e0772ff027edf5fa389728fcd20982 SHA1 606903101ad2fe06ba645e3ca473fb60501bc138 SHA256 dc14b444da84e66b4360b870e9e3472386a8e6c3334d02f18b043225a9410702
+EBUILD timezone-data-2012a.ebuild 3149 RMD160 2b0a66439594374adfb04ed1edb19107a20949ae SHA1 3f1ee03b9e097aea4457adaa2158d6e94f98213e SHA256 53c0bb7aee50f6131a710ba773598896d727577f2eda4d0778954b17342fe86e
+MISC ChangeLog 34879 RMD160 feb99b86164aa3933ecbf8473fd249ed842d2bd2 SHA1 b3aef755b471d5d0cc977c808f221b85177b5951 SHA256 1a86a0900436827db9c0ec1d6b5f0f6e2953e761fcebd5835d3fea80b13c1b53
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPAAvDAAoJELEHsLL7fEFWKMsQALECKYD1PmURfaJziwE+t+AT
-jx3rQgQK/fWKxki3dxbu6se9XoQ9gHcXqOGbpWdh3ucBlBlu4rV47Y14mntiF7Dd
-jCSio+9RPsfeLVm3AsnaJU4vM8inDYcSKLZ93akbvFW9FphSX9/k39zNCcWXd3AB
-PZqHRYLbTX8u1R21CyUPUs+VUwTPuQPZd5i6eJcEDw1D4vWlxnvLhn2rFXJdQeuS
-8h/y6cwIpN/PyvpZ1InH+rVCOQRYEA9i6/phdoMUXYApaZNWS8ZsvjZ1Psj8d+SU
-ljqhVgniZDBN87lRwcQqQE3J6Bp1tXBFtP79FXtSKJseXSThtnc6HYTy6Wm4r/hg
-Q38CI5uEPYt3mFLC+MalhY8w7BBVg4pEhx/iz6XdCg40h40wccvOP6XexUpuRVSg
-lxVbCm63JclCkY5sM7xTlzdmqsADuahYVIVwo+Bmp8PQAfUmGu2Fbsr4y47Wlf1R
-yR5msqRGigFl0rCu7MykLpM5hr9BJQfQupj5MYwkyWpnvrl5hE2xgRJDrRy8mQkq
-eqAJzhBWdkHQ5NSuaQxpY3FFCTL1cisMno1KNCjB3v0aXEnCGsgRVD1zW1ZpF0aT
-BVFnyApcsRKAX887PHeSnwh+cwtgyBboxZmtUxL12XC1ByG5kETQWpFIgITpRqq3
-Cc9/gvN5aYd+9mMjoJ11
-=xIvR
+iQIcBAEBAgAGBQJPT7PlAAoJELEHsLL7fEFW870P/ReIE3f1E0hBnCg+9KT1UtY4
+6CNNUJ9TEX3NrCAqpf1XlqqBaDgqdIIrW8v7kNu2oklzLKA/w5/uLyzbOutfclr6
+SxJD6CxDoaQJqeTh2ve/09iWAAd7e3c2rQZmtDnbCBOKkhkFl+98KlsCthwFei2r
+6mnwnHJ2FIAQUKD1T/DALztg061hnM2ylLQ59llWHFkIa7G4rcvYWvqXIEH5u5pT
+myhLCwDssL7bmZQ/vrODa0wSAwq2p2az87hhYxcGvuNFdLlndu4RP4iRWevhzSLQ
+a8r2mO3pFZqhPbCld16PK1js8UG8gcdROgHRoFcQVFnWQWJUIG00cAewki4O2fhj
+Z6IPpVxGhJEbFX+BKj4lZXiBvuuTiuPQtuEvfrIHLVM27MkAbNiUyOqnDu10gZTp
+/IqYhn/aeH2wVFlu8jzu4Ukxc2PRMFq7vmz+NUXQpVjNv4OwsZJh+TtIhrfOfBm6
+6N77Hny4zS2D9SvfDcABx61nHEFHHMCxsxt7god20XSDCf0HD7hbp/f8ZMmTKeOr
+H6ifJcRlC/Py8TlSbQKclDvr5ffc5072CXNG+bccD2FEys2vm7WvyNGVQcWrglih
+y+EoRyzeORh3FQy09uMFnKqwOTAYN02Ivy2B8bWzZoWVbD0fGClOo8lhoccQu/jr
+RiwGt14VJBIBppsmCnIu
+=HfsB
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
new file mode 100644
index 000000000000..38e10dd7f0f9
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
@@ -0,0 +1,138 @@
+ - Fix up default paths
+ - Support env DESTDIR / LDFLAGS / CFLAGS / CC
+ - Use awk instead of nawk
+ - Don't build/install libtz.a
+ - Don't install man-pages provided by sys-apps/man-pages
+ - Move zic zdump to sbin and tzselect to bin ala glibc
+ - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
+ - Install leaps zoneinfo into zoneinfo/right/ ala glibc
+ - Disable broken web test
+ - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
+ - Flags to the linking are passed as LDFLAGS, not LFLAGS
+ - LDFLAGS was missed for the 'date' target
+
+--- Makefile
++++ Makefile
+@@ -35,5 +35,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,8 @@
+ 
+-# TZDIR=		$(TOPDIR)/etc/zoneinfo
+-TZDIR=	/home/kre/src/tz/data/TZ
++TZDIR=		$(TOPDIR)/share/zoneinfo
+ 
+ # 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 @@
+ # Manual pages go in subdirectories of. . .
+ 
+-MANDIR=		$(TOPDIR)/man
++MANDIR=		$(TOPDIR)/share/man
+ 
+ # Library functions are put in an archive in LIBDIR.
+@@ -211,5 +211,5 @@
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS= -DSTD_INSPIRED
++CFLAGS += -DSTD_INSPIRED -std=gnu99
+ 
+ # If you want zic's -s option used when installing, uncomment the next line
+@@ -220,5 +220,5 @@
+ 
+ # The name of a Posix-compliant `awk' on your system.
+-AWK=		nawk
++AWK=		awk
+ 
+ # The path where SGML DTDs are kept.
+@@ -241,8 +241,10 @@
+ 
+ ###############################################################################
+ 
+-cc=		cc
+-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++CC+=		-DTZDIR=\"$(TZDIR)\"
++ifeq ($(NLS),1)
++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++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 @@
+ ALL:		all date
+ 
+-install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
++install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+ 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
+ 		cp iso3166.tab zone.tab $(TZDIR)/.
+-		-mkdir $(TOPDIR) $(ETCDIR)
+-		cp tzselect zic zdump $(ETCDIR)/.
++		-mkdir $(TOPDIR) $(SBINDIR)
++		cp zic zdump $(SBINDIR)/.
++		-mkdir $(TOPDIR) $(BINDIR)
++		cp tzselect $(BINDIR)/.
+ 		-mkdir $(TOPDIR) $(MANDIR) \
+ 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
+@@ -297,6 +299,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
+@@ -309,10 +309,10 @@
+ 		cp date.1 $(MANDIR)/man1/.
+ 
+ zdump:		$(TZDOBJS)
+-		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
++		$(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+ 
+ zic:		$(TZCOBJS) yearistype
+-		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
++		$(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
+ 
+ yearistype:	yearistype.sh
+ 		cp yearistype.sh yearistype
+@@ -333,7 +333,7 @@
+ # to using them, or vice versa.
+ other_two:	zic leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
++		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+-			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
++			-d $(TZDIR)/right -L leapseconds $(TDATA)
+ 
+ posix_right:	posix_only other_two
+@@ -351,7 +351,7 @@
+ 			then ranlib $@ ; fi
+ 
+ date:		$(DATEOBJS)
+-		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
++		$(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
+ 			$(LDLIBS) -lc -o $@
+ 
+ tzselect:	tzselect.ksh
+@@ -366,5 +366,5 @@
+ 		chmod +x $@
+ 
+-check:		check_tables check_web
++check:		check_tables
+ 
+ check_tables:	checktab.awk $(PRIMARY_YDATA)
+--- tzselect.ksh
++++ tzselect.ksh
+@@ -1,3 +1,3 @@
+-#! /bin/ksh
++#! /bin/bash
+ 
+ # '@(#)tzselect.ksh	1.8'
diff --git a/sys-libs/timezone-data/timezone-data-2011d.ebuild b/sys-libs/timezone-data/timezone-data-2011d.ebuild
deleted file mode 100644
index 34cd9aede1b4..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011d.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2011d.ebuild,v 1.2 2011/03/22 17:04:01 vapier Exp $
-
-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.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 *.jpg
-}
-
-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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011e.ebuild b/sys-libs/timezone-data/timezone-data-2011e.ebuild
deleted file mode 100644
index 99ae459a57e5..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011e.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2011e.ebuild,v 1.2 2011/05/09 15:47:40 vapier Exp $
-
-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.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 *.jpg
-}
-
-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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011g.ebuild b/sys-libs/timezone-data/timezone-data-2011g.ebuild
deleted file mode 100644
index 40faa3a811ba..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011g.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2011g.ebuild,v 1.1 2011/04/30 00:29:59 vapier Exp $
-
-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.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 *.jpg
-}
-
-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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011h.ebuild b/sys-libs/timezone-data/timezone-data-2011h.ebuild
deleted file mode 100644
index a34d550dc40c..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011h.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2011h.ebuild,v 1.2 2011/09/19 19:33:03 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV%h}g
-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 *.jpg
-}
-
-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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011i.ebuild b/sys-libs/timezone-data/timezone-data-2011i.ebuild
deleted file mode 100644
index 32154a900e38..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011i.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2011i.ebuild,v 1.1 2011/08/29 19:42:34 vapier Exp $
-
-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.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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011j.ebuild b/sys-libs/timezone-data/timezone-data-2011j.ebuild
deleted file mode 100644
index 5e83a735b626..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011j.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-2011j.ebuild,v 1.3 2011/10/19 20:12:23 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV%j}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 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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011k.ebuild b/sys-libs/timezone-data/timezone-data-2011k.ebuild
deleted file mode 100644
index b6c2aea5749b..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011k.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.3 2011/10/19 20:12:23 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 https://mm.icann.org/mailman/listinfo/tz"
-SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz
-	ftp://munnari.oz.au/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 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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011l.ebuild b/sys-libs/timezone-data/timezone-data-2011l.ebuild
deleted file mode 100644
index 766bd61be8cd..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011l.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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-2011l.ebuild,v 1.3 2011/10/30 17:53:11 dirtyepic Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV%l}i
-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://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz
-	ftp://munnari.oz.au/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 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
-}
diff --git a/sys-libs/timezone-data/timezone-data-2011m.ebuild b/sys-libs/timezone-data/timezone-data-2012a.ebuild
index ff755d46b504..15286f90c448 100644
--- a/sys-libs/timezone-data/timezone-data-2011m.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2012a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2011m.ebuild,v 1.1 2011/10/31 00:01:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2012a.ebuild,v 1.1 2012/03/01 17:37:27 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
-code_ver=${PV%m}i
+code_ver=${PV}
 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"
@@ -22,7 +22,7 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-2008h-makefile.patch
+	epatch "${FILESDIR}"/${PN}-2012a-makefile.patch
 	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
 }