From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 3 Oct 2015 02:14:57 +0000 (-0400)
Subject: sys-libs/timezone-data: drop old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0dffa8881be7dc4fa6a27aca18eef4391bed1a7d;p=gentoo.git

sys-libs/timezone-data: drop old
---

diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 61338b417ecf..8b2191274f65 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,12 +1,4 @@
-DIST tzcode2015a.tar.gz 182993 SHA256 885bab11f286852f34030d7a86ede7d4126319ca74b8ee22be8ca7c17d72dd19 SHA512 80d3bd3aeb70e21552a599c6203670fe742ca8d270c3fc430a3045d8e8a6610ebfe74941532c0791d5a99d6e4bf5fbdf62918de57d377d3fd26e7f7f786c66a4 WHIRLPOOL de4d9ea9611cc47e71f6e64fc4b0f6c45e5b3c995268d6244ed58fdc9b5e6d896c0e3ce1299e04ae018681523dc1e57f2dfcd0fb7f03423a93282123eb8a0376
-DIST tzcode2015b.tar.gz 183630 SHA256 e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76 SHA512 d9b56c8ec98d9158d10cf80df0181864c467a4387b8ced5701f466c40885ea524bc1d49b0e17c0a18d8006a423da1c1b9a7e74626c4a916dd37cbb85e04b2b0a WHIRLPOOL 9e57737318d00470a6315cda75ed0cc3b4bb7f57de4c60b0d3b527be12164ec7c390f285dde23102c764e2ff6b9473d2e4762642f7a3e716e746bcacb931eaad
-DIST tzcode2015c.tar.gz 184278 SHA256 7feeb1a60dff8b179c884f6e3aa7684606f4eaeb7f7ecc61a6bb81e3e38af42e SHA512 01f57e27c1031434e7da8876f30084dfef9dbe36988539c857f71f86c0ab1995f82c9fe5dad32ded12185c53433b7f1a0553d8848a2d97529981021ffd70dfb1 WHIRLPOOL b2dff9985ad6845ad368a35e471890e99c69f03cf6d92da9d0da362af1d0545e30485a7be1ca159444d49c148c2f1588b8fa3fd1161859cfa566365fb45ba341
-DIST tzcode2015d.tar.gz 184178 SHA256 221af54ec5c42eaf0101159ffe1256a883d1c14c46228d42774c656a56317128 SHA512 2cb4faced839d02e6313a7aacca4d2dfe6454186d9864ee4aa034f7280442e6a751cec2285bde2d5712962b733e107a46f2282469f6510b42d93972d6c34424a WHIRLPOOL d5760e6530f65a4aac86258cbec62b27c86952d0f5896fbc1f567af6aef025e453f455ba94805069706981ecd4806a22e09581dd38cfba18f892343eb2038e3d
 DIST tzcode2015e.tar.gz 185129 SHA256 b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0 SHA512 fdc568a68f4876b967b39e21fa53f063dc5756e886e2a273cc046d5a014eb517e9c91eb6e03d18c94a89ce48578868aed710790415c500188fce4e4add0ce7ca WHIRLPOOL d3fde26e0b0ebe98d7de0c2a666a79dd6020e471b647de2b61a89dc1eeba61e8928c7dcb2e1b15d867e8e81b5e33321a288a2b94e713deaf5579e00b6082e7b8
 DIST tzcode2015f.tar.gz 180742 SHA256 0c95e0a42bb61141f790f4f5f204b954d7654c894aa54a594a215d6f38de84ae SHA512 5cfbebde8a0be57e8388a7b6d35aeba99130a72c1a41f9bbd5d5864511a473aa5e9320ab21055b4383e64b3b9d7682c0d30377ce8407619987be672436014710 WHIRLPOOL c657f8d6a77cd96f6fed296bc905fd5690abe47f7cf25d99ea6802d61cee619c75e70ea006a77a0680d4c46ea43f8fb509bbb32b7ecc0323996e44b462e17845
-DIST tzdata2015a.tar.gz 292131 SHA256 c52490917d00a8e7fc9b5f0b1b65ef6ec76d612b5b20c81bf86a04147af18e4c SHA512 ff36feb437238ba42fe67257e81ade0a2179d11f6c6449146e28e4b6553c62348b4131af75e440b4467109c9edba13e25ddaf701f2fcebb2a258b4ac9b57293c WHIRLPOOL 22d42c60e87948c691255282aea9e4c9d69b46db8c19ef1c06a262b5e6054e45fec39c5fa8d1dc24ad121ed70bd3dfa24ea61fe97961938b733262238d74b5bb
-DIST tzdata2015b.tar.gz 293482 SHA256 556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62 SHA512 767782b87e62a8f7a4dbcae595d16a54197c9e04ca974d7016d11f90ebaf2537b804d111f204af9052c68d4670afe0af0af9e5b150867a357fc199bb541368d0 WHIRLPOOL e6d7bd671dd17c44b9d51744bda2283b42d5e4b9b673e693976af2f52f2a03a9571d6604a30b88701ed11f69a3a797429c72274126c0f45e5a4b9637b589a632
-DIST tzdata2015c.tar.gz 294353 SHA256 860fac5f5f57f7a2dfc1ba682dbd1f5c0f0b597f761571277b6ed6561e22365a SHA512 ca89c2041c8420e7b154660e227211b60ba20e8d70b6870b5c0a149838c588d13065202b1266c59caf22a99df2387da95ac04049b9ecb7939cd406c7f007a73e WHIRLPOOL e5806b47d3082b260837c675ac267a99ec45549070c66b5cbd6a51b7fe57802a555bfd54918093e83447089d965fe2459c5e9c6ea12c333080add280b012182f
-DIST tzdata2015d.tar.gz 296131 SHA256 8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531 SHA512 37b5aa3c5e0d601c8b20fac08d7267c398a836e4190ef85625d5e86a806ba1baceb2315ba81a9a6c854eae4fce40e9c8f90cf5adade3f48ad443f77c221d8983 WHIRLPOOL c42972f20c8815557a9545f73bf3ff3b10a0148168a229641cb8e436da8ec337c5fc968acacfbd4d5beeae0fb183c5b6d54fe4240539352a9c3ce2b2f2318824
 DIST tzdata2015e.tar.gz 296773 SHA256 ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f SHA512 86498190a20c5c67827aa75f7e9c6aa6c19d58a88a70425ce70d5ae7cea42dc7386eb2867fa455fcfcdedc6a105ad70fbbdc7c27c7a58a51bd21d76a135983ce WHIRLPOOL aaf2f2009f451beaf178d1ee622ebacdd04f1795e07a606b61620cac8faf74a63e1ea3f75ef58b846a6093922cba9df764ed1929e70d1f0be5181fdc25901282
 DIST tzdata2015f.tar.gz 298815 SHA256 959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d SHA512 d86e6c9e4c6d9cd5de30762723d7a90ac697feeb6dd1f04649f6a35e4e1dc638261c32066db4aeafa767ac339ccd100c38dde044ceadd61e95cb3d39c27f977e WHIRLPOOL 0b56e3ae620bed60d37abb195e8c4add8f5a00114422e91f2e533fce8c0091bdd681ff5c682e929e5af45202afde838fcc1ae14b7865f6f83a126c647e56d6a4
diff --git a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch
deleted file mode 100644
index 2153d764981d..000000000000
--- a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
- - Fix up default paths
- - Support env CC
- - 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
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES=	America/New_York
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
- TZDIR_BASENAME=	zoneinfo
--TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR=		$(TOPDIR)/share/$(TZDIR_BASENAME)
- 
- # Types to try, as an alternative to time_t.  int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
- 
- # 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. . .
- 
-@@ -67,7 +67,7 @@ BINDIR=		$(TOPDIR)/bin
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -298,8 +298,10 @@ GZIPFLAGS=	-9n
- 
- ###############################################################################
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CPPFLAGS+=		-DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
- 
- AR=		ar
- 
-@@ -352,17 +354,14 @@ ALL:		all date
- install:	all $(DATA) $(REDO) $(MANS)
- 		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
--			$(DESTDIR)$(LIBDIR) \
-+			$(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- 			$(DESTDIR)$(MANDIR)/man8
- 		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
--		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+		cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+		cp tzselect $(DESTDIR)$(BINDIR)/.
--		cp libtz.a $(DESTDIR)$(LIBDIR)/.
--		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- 		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
--		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
--		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
- 		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only:	zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix:	right_only leapseconds
- 		rm -fr $(DESTDIR)$(TZDIR)-leaps
--		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
--		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+		ln -s . $(DESTDIR)$(TZDIR)/right || \
-+		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- 			-L leapseconds $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- 			-L /dev/null $(TDATA)
- 
- posix_right:	posix_only leapseconds
- 		rm -fr $(DESTDIR)$(TZDIR)-posix
--		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
--		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+		ln -s . $(DESTDIR)$(TZDIR)/posix || \
-+		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- 			-L /dev/null $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- 			-L leapseconds $(TDATA)
- 
- posix_packrat:	posix_only backzone
-@@ -440,7 +442,7 @@ tzselect:	tzselect.ksh
- 		chmod +x $@
- 
- check:		check_character_set check_white_space check_links check_sorted \
--		  check_tables check_web
-+		  check_tables
- 
- check_character_set: $(ENCHILADA)
- 		LC_ALL=en_US.utf8 && export LC_ALL && \
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index 541771197a2b..96d5c97f4803 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -12,9 +12,5 @@
       when counting seconds since the epoch (while POSIX does not) as they are
       based on the TAI (International Atomic Time) clock
     </flag>
-    <flag name='right_timezone'>
-      Install the set of "right" timezones; these timezones include leap seconds
-      when counting seconds since the epoch (while posix does not)
-    </flag>
   </use>
 </pkgmetadata>
diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild
deleted file mode 100644
index 8ddb089d1ad0..000000000000
--- a/sys-libs/timezone-data/timezone-data-2015a.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# Deal with the case where older timezone-data installed a
-	# dir here, but newer one installs symlinks.  Portage will
-	# barf when you try to transition file types.
-	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
-		# In case of a failed upgrade, clean up the symlinks #506570
-		if [ -L .gentoo-upgrade ] ; then
-			rm -rf posix .gentoo-upgrade
-		fi
-		if [ -d posix ] ; then
-			rm -rf .gentoo-upgrade #487192
-			mv posix .gentoo-upgrade || die
-			ln -s .gentoo-upgrade posix || die
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex right_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	local LDLIBS
-	tc-export CC
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-
-	# install the symlink by hand to not break existing timezones
-	if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
-		dosym . /usr/share/zoneinfo/posix
-	fi
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if ! use right_timezone && [[ ${tz} == right/* ]] ; then
-		eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
-		die "Please fix your USE or timezone"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	tz=$(get_TIMEZONE) || 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 "${EROOT}"/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 ${EROOT}/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
-	if [[ -L ${etc_lt} ]]; then
-		einfo "Skipping symlinked ${etc_lt}"
-	else
-		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-	fi
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015b.ebuild b/sys-libs/timezone-data/timezone-data-2015b.ebuild
deleted file mode 100644
index 8ddb089d1ad0..000000000000
--- a/sys-libs/timezone-data/timezone-data-2015b.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# Deal with the case where older timezone-data installed a
-	# dir here, but newer one installs symlinks.  Portage will
-	# barf when you try to transition file types.
-	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
-		# In case of a failed upgrade, clean up the symlinks #506570
-		if [ -L .gentoo-upgrade ] ; then
-			rm -rf posix .gentoo-upgrade
-		fi
-		if [ -d posix ] ; then
-			rm -rf .gentoo-upgrade #487192
-			mv posix .gentoo-upgrade || die
-			ln -s .gentoo-upgrade posix || die
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex right_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	local LDLIBS
-	tc-export CC
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-
-	# install the symlink by hand to not break existing timezones
-	if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
-		dosym . /usr/share/zoneinfo/posix
-	fi
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if ! use right_timezone && [[ ${tz} == right/* ]] ; then
-		eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
-		die "Please fix your USE or timezone"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	tz=$(get_TIMEZONE) || 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 "${EROOT}"/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 ${EROOT}/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
-	if [[ -L ${etc_lt} ]]; then
-		einfo "Skipping symlinked ${etc_lt}"
-	else
-		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-	fi
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild b/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild
deleted file mode 100644
index 0ba79099f6b0..000000000000
--- a/sys-libs/timezone-data/timezone-data-2015c-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2015c-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	local LDLIBS
-	tc-export CC
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	tz=$(get_TIMEZONE) || 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 "${EROOT}"/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 ${EROOT}/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
-	if [[ -L ${etc_lt} ]]; then
-		einfo "Skipping symlinked ${etc_lt}"
-	else
-		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-	fi
-}
-
-pkg_postinst() {
-	pkg_config
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015c.ebuild b/sys-libs/timezone-data/timezone-data-2015c.ebuild
deleted file mode 100644
index f0f999a9d8cc..000000000000
--- a/sys-libs/timezone-data/timezone-data-2015c.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# Deal with the case where older timezone-data installed a
-	# dir here, but newer one installs symlinks.  Portage will
-	# barf when you try to transition file types.
-	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
-		# In case of a failed upgrade, clean up the symlinks #506570
-		if [ -L .gentoo-upgrade ] ; then
-			rm -rf posix .gentoo-upgrade
-		fi
-		if [ -d posix ] ; then
-			rm -rf .gentoo-upgrade #487192
-			mv posix .gentoo-upgrade || die
-			ln -s .gentoo-upgrade posix || die
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2015a-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex right_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	local LDLIBS
-	tc-export CC
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-
-	# install the symlink by hand to not break existing timezones
-	if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
-		dosym . /usr/share/zoneinfo/posix
-	fi
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if ! use right_timezone && [[ ${tz} == right/* ]] ; then
-		eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
-		die "Please fix your USE or timezone"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	tz=$(get_TIMEZONE) || 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 "${EROOT}"/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 ${EROOT}/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
-	if [[ -L ${etc_lt} ]]; then
-		einfo "Skipping symlinked ${etc_lt}"
-	else
-		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-	fi
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2015d.ebuild b/sys-libs/timezone-data/timezone-data-2015d.ebuild
deleted file mode 100644
index 0ba79099f6b0..000000000000
--- a/sys-libs/timezone-data/timezone-data-2015d.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2015c-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-_emake() {
-	emake \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	local LDLIBS
-	tc-export CC
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	tz=$(get_TIMEZONE) || 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 "${EROOT}"/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 ${EROOT}/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
-	if [[ -L ${etc_lt} ]]; then
-		einfo "Skipping symlinked ${etc_lt}"
-	else
-		einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-		cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-	fi
-}
-
-pkg_postinst() {
-	pkg_config
-}