Remove old versions

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 30380381)

18 files changed, 12 insertions, 2208 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 402e526690d4..9934b752ce45 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.317 2014/11/11 23:58:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.318 2014/12/23 09:15:54 djc Exp $
+
+  23 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> -timezone-data-2011n.ebuild,
+  -timezone-data-2013a.ebuild, -timezone-data-2013b.ebuild,
+  -timezone-data-2013c.ebuild, -timezone-data-2013d.ebuild,
+  -timezone-data-2013f-r1.ebuild, -timezone-data-2013g.ebuild,
+  -timezone-data-2013h.ebuild, -timezone-data-2014a.ebuild,
+  -timezone-data-2014b.ebuild, -timezone-data-2014c.ebuild,
+  -timezone-data-2014d.ebuild, -timezone-data-2014e.ebuild,
+  -timezone-data-2014f.ebuild, -timezone-data-2014g.ebuild,
+  -timezone-data-2014h.ebuild, -timezone-data-2014i.ebuild:
+  Remove old versions
 
 *timezone-data-2014j (11 Nov 2014)
 
diff --git a/sys-libs/timezone-data/timezone-data-2011n.ebuild b/sys-libs/timezone-data/timezone-data-2011n.ebuild
deleted file mode 100644
index 584437a9ca21..000000000000
--- a/sys-libs/timezone-data/timezone-data-2011n.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-2011n.ebuild,v 1.2 2012/01/01 07:15:43 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV%n}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://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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-2013a.ebuild b/sys-libs/timezone-data/timezone-data-2013a.ebuild
deleted file mode 100644
index 475e53c56ac4..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013a.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-2013a.ebuild,v 1.1 2013/03/03 01:54:25 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.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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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 ~amd64-fbsd ~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}-2013a-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
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	emake \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		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-2013b.ebuild b/sys-libs/timezone-data/timezone-data-2013b.ebuild
deleted file mode 100644
index b797c07ba204..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013b.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-2013b.ebuild,v 1.2 2013/04/20 17:17:53 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.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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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 ~amd64-fbsd ~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}-2013a-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
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	emake \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		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-2013c.ebuild b/sys-libs/timezone-data/timezone-data-2013c.ebuild
deleted file mode 100644
index f9a49597c26a..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013c.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-2013c.ebuild,v 1.2 2013/08/25 00:36:22 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.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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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 ~amd64-fbsd ~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}-2013a-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
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	emake \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		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-2013d.ebuild b/sys-libs/timezone-data/timezone-data-2013d.ebuild
deleted file mode 100644
index da5c36866e74..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013d.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013d.ebuild,v 1.4 2014/01/18 02:22:57 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.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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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"
-IUSE="nls elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-2013d-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
-	export NLS=$(usex nls 1 0)
-	if use nls && ! use elibc_glibc ; then
-		LDLIBS+=" -lintl" #154181
-	fi
-	emake \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		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-2013f-r1.ebuild b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
deleted file mode 100644
index 1389329d6dbb..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild,v 1.4 2014/01/18 02:22:57 vapier Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013f-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2013g.ebuild b/sys-libs/timezone-data/timezone-data-2013g.ebuild
deleted file mode 100644
index d5bfed31f024..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013g.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild,v 1.3 2014/01/18 02:22:57 vapier Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013f-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2013h.ebuild b/sys-libs/timezone-data/timezone-data-2013h.ebuild
deleted file mode 100644
index f7d8bb1a4abd..000000000000
--- a/sys-libs/timezone-data/timezone-data-2013h.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013h.ebuild,v 1.2 2014/01/18 02:22:57 vapier Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013h-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014a.ebuild b/sys-libs/timezone-data/timezone-data-2014a.ebuild
deleted file mode 100644
index dc7f0945915b..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014a.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014a.ebuild,v 1.2 2014/05/15 07:07:02 djc Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013h-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014b.ebuild b/sys-libs/timezone-data/timezone-data-2014b.ebuild
deleted file mode 100644
index cc11e29e9fc3..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014b.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014b.ebuild,v 1.1 2014/03/25 14:51:11 vapier Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013h-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014c.ebuild b/sys-libs/timezone-data/timezone-data-2014c.ebuild
deleted file mode 100644
index 718404b87953..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014c.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014c.ebuild,v 1.1 2014/05/15 07:03:29 djc Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013h-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014d.ebuild b/sys-libs/timezone-data/timezone-data-2014d.ebuild
deleted file mode 100644
index 29c509677903..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014d.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014d.ebuild,v 1.2 2014/07/30 06:33:25 vapier Exp $
-
-EAPI="3"
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 elibc_FreeBSD elibc_glibc"
-
-RDEPEND="!<sys-libs/glibc-2.3.5"
-
-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
-		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}-2013h-makefile.patch
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-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 \
-		TOPDIR="${EPREFIX}/usr" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}" \
-		|| die
-	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="${ED}" || die
-	dodoc README Theory
-	dohtml *.htm
-}
-
-pkg_config() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src etc_lt="${EROOT}etc/localtime"
-
-	if has_version '<sys-apps/baselayout-2' ; then
-		src="${EROOT}etc/conf.d/clock"
-		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
-	else
-		src="${EROOT}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 "${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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014e.ebuild b/sys-libs/timezone-data/timezone-data-2014e.ebuild
deleted file mode 100644
index 876f952fe832..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014e.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.4 2014/08/08 07:23:09 vapier Exp $
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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-2.3.5"
-
-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}-2013h-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="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			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 README 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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014f.ebuild b/sys-libs/timezone-data/timezone-data-2014f.ebuild
deleted file mode 100644
index 1cab44b07336..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014f.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014f.ebuild,v 1.3 2014/09/02 13:52:47 vapier Exp $
-
-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
-	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
-	ftp://munnari.oz.au/pub/oldtz/tzcode${data_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-2.3.5"
-
-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}-2014f-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="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			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 README 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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014g.ebuild b/sys-libs/timezone-data/timezone-data-2014g.ebuild
deleted file mode 100644
index bbc6eb31ff71..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014g.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014g.ebuild,v 1.3 2014/10/16 19:19:12 vapier Exp $
-
-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}-2014g-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="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014h.ebuild b/sys-libs/timezone-data/timezone-data-2014h.ebuild
deleted file mode 100644
index 467b95d60ead..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014h.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014h.ebuild,v 1.1 2014/10/16 19:19:44 vapier Exp $
-
-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}-2014h-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="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}
diff --git a/sys-libs/timezone-data/timezone-data-2014i.ebuild b/sys-libs/timezone-data/timezone-data-2014i.ebuild
deleted file mode 100644
index 1df721f09b95..000000000000
--- a/sys-libs/timezone-data/timezone-data-2014i.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014i.ebuild,v 1.1 2014/10/22 23:38:37 vapier Exp $
-
-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}-2014h-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="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			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
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_postinst() {
-	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
-	pkg_config
-	wait
-}