10 files changed, 9 insertions, 988 deletions
diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 90c2331a7fe8..eb3737394b46 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.109 2013/04/09 16:06:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.110 2013/04/11 02:27:01 jdhore Exp $
+
+  11 Apr 2013; Jeff Horelick <jdhore@gentoo.org>
+  -thunderbird-bin-10.0.10.ebuild, -thunderbird-bin-10.0.11.ebuild,
+  -thunderbird-bin-10.0.12.ebuild, -thunderbird-bin-15.0.1.ebuild,
+  -thunderbird-bin-16.0.2.ebuild, -thunderbird-bin-17.0.2.ebuild,
+  -thunderbird-bin-17.0.3.ebuild, -thunderbird-bin-17.0.4.ebuild,
+  -thunderbird-bin-17.0.ebuild:
+  Remove old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> thunderbird-bin-17.0.5.ebuild:
   Stable for x86, wrt bug #464226
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.10.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.10.ebuild
deleted file mode 100644
index 27785afbdeb7..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.10.ebuild,v 1.2 2012/11/03 12:31:43 ago Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl ) "
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.11.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.11.ebuild
deleted file mode 100644
index 15167dd32b81..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.11.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.11.ebuild,v 1.3 2012/12/03 08:22:41 nativemad Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl ) "
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.12.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.12.ebuild
deleted file mode 100644
index 4404fd027f5a..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.12.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.12.ebuild,v 1.1 2013/01/09 06:19:52 jdhore Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl ) "
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-15.0.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-15.0.1.ebuild
deleted file mode 100644
index ce20ad32cec3..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-15.0.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-15.0.1.ebuild,v 1.2 2012/10/31 19:09:12 axs Exp $
-
-EAPI="4"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-16.0.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-16.0.2.ebuild
deleted file mode 100644
index 2df6d1c527c3..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-16.0.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-16.0.2.ebuild,v 1.2 2012/10/31 19:09:12 axs Exp $
-
-EAPI="4"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.2.ebuild
deleted file mode 100644
index b680fe2ff7f1..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.2.ebuild,v 1.3 2013/01/20 18:31:51 ago Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-	!net-libs/libproxy[spidermonkey]"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.3.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.3.ebuild
deleted file mode 100644
index ad6aae692af7..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.3.ebuild,v 1.3 2013/02/24 11:31:34 ago Exp $
-
-EAPI="4"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.4.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.4.ebuild
deleted file mode 100644
index 38632a6ba2fc..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.4.ebuild,v 1.3 2013/03/13 17:02:53 ago Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.ebuild
deleted file mode 100644
index 48a8a00d0a18..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.ebuild,v 1.1 2012/11/22 06:57:09 jdhore Exp $
-
-EAPI="4"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
-fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}