diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
deleted file mode 100644
index da750c0..0000000
--- a/mail-client/thunderbird-bin/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a850355fabf7d1a167f73f51c86fb77ef4ec651fa48cea3010752836feb51dc71c1ba787c95fe4deef SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f
-AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
-AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
-DIST lightning-5.4.5.tar.xz 1898160 BLAKE2B ed8c2f54140444610fdcc91e375636d53d7ede9e70e114e072a55867278130e09bf54bb4e04cec789efa47ed8e92586b2217b53663e6057d6556df1a5a25f48f SHA512 621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
-DIST lightning-5.4.8.tar.xz 1891528 BLAKE2B 8b15d2058171d09b8fc1e992b48d36f024ae9405803c0626060bbdb75318a6ce652cc1b527cc2a30041c81f2ea215c63950912a8783d55e4042c2fcc270bfccf SHA512 9c36ad58ef77f9e7a1e34c07db0357d4db75a44c837068016e1413e31cc762f2cc1b4cf1edf8a78124077053db6ddddec68c17ba42da91c2a05dc87616f742dc
-DIST thunderbird-bin_i686-58.0_beta2.tar.bz2 50822642 BLAKE2B 234bb1fb8ce7ded480fc1d40b938e22f8967b91e8ffa7234e17d71b15a97eab5fe1808f57a20eddaf2d70cb10c14f193460d299cec764c79f1d80f6a93bfb559 SHA512 c6bb2eae4a7466bff77db7f5afd7c74e71342a0dd465ccd6dadc30396569738c7bcb20a31321cbea15de8aa69854ea2fc28aeb5bfd0f38c8f60cab0d41c294d6
-DIST thunderbird-bin_i686-60.0_beta9.tar.bz2 52442105 BLAKE2B ea9303278457245ee4518395734eabfc9e054294b499fd6b274f2782b3ed291fc27ba6b8449e7a63c794f693f38d4bf925456f4cd867b857eeb138ce13ee61e4 SHA512 aefb4b9ff823fd32d28d6a9774a709f47b946bc55fedcf3eb37ae7819d15cd5cf87a070e567bae535825eba5d23101c46865d0e5646666d1be07ae71c25fcf4b
-DIST thunderbird-bin_x86_64-58.0_beta2.tar.bz2 49163655 BLAKE2B e86e7d12c9402960d48be7d228df3b510683a76a77b02558d3a019784b4c1f9e12647b6fe157321d82d28714287606c6f8b13a0170d08b6b86e37c1bcfa3f8ca SHA512 13e76dc0aa0b4653c017d64f272e1d47bdb5b3265480cdfe7d7855c16d7f27a7b028dd01548eb0571b0b1673bd877492a8b6a26ad49084c45a9f37bf3ca449df
-DIST thunderbird-bin_x86_64-60.0_beta9.tar.bz2 50162415 BLAKE2B 4a8bb551fcc8edf5c3904ea5b104f1f33ee94f8b6dd97450a928acd8231cf91dabcb7be243ec78da218030d35bcc40c5739d191fc777f1a42678a74796e21481 SHA512 a6a64fa11aaaa89862ed58cd5744ac3a6c0fa8e65958cf46fca5ba45329e145586597879fbd783522bcb9f0d4ad1f78c5566360e994bddf971073c409fcf8be1
-EBUILD thunderbird-bin-58.0_beta2.ebuild 4525 BLAKE2B 4a2477fa06dffc722bd5e1433c32fa7ad5cc8802dd5008319b91198a35d054e29058dcbf7705c0a8aea1f7f11a0c0d55a0d0b2c34101dc373a7af10c40cf2d5b SHA512 02e99dcb674675ae372fe80f2c9a99e4d12010cce2a5df5192b76bf466f0b655348ad4e93d8a921499d40633af7a2a7950058a668e1efa90a662cd2836a70ec3
-EBUILD thunderbird-bin-60.0_beta9.ebuild 4530 BLAKE2B 71d4404bd061b89656020d2fdb8379ff04db893da7803089433a88ef26d42bed6c8ad2c77eac32b568086d44ec17ae77cfdd643d475a47b5e032b3afe9ec8e38 SHA512 84c5c7990063074183b1ec5ea8349ac8498595f78790cce92c0cdc14740d5d4046459752d809d4ceafe1f60d43ec764ab90b71fdcc4741dace76db0976213dc8
-MISC metadata.xml 325 BLAKE2B 852f3a57223cf7ca00cab9ce70edf4eb4151b5b1db0e5b8ed23bcefc602b949de31267d058daadb468a19c2176efa5afc68e61b12b0bc1bfbd33011b4c0c1879 SHA512 20a5a3c0abb2865a871ccd1386c2cf2a2dbbedec3affe0ab99d7e4b966270d5a47fe52813408b7472f94d316417e0ad709a961a037f86e4669b6edb907b6ac7c
diff --git a/mail-client/thunderbird-bin/files/10thunderbird-bin b/mail-client/thunderbird-bin/files/10thunderbird-bin
deleted file mode 100644
index f1338b8..0000000
--- a/mail-client/thunderbird-bin/files/10thunderbird-bin
+++ /dev/null
@@ -1 +0,0 @@
-SEARCH_DIRS_MASK="/opt/thunderbird"
diff --git a/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop b/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
deleted file mode 100644
index 481a9b7..0000000
--- a/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird (bin)
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird-bin
-Icon=thunderbird-bin-icon
-Terminal=false
-Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
deleted file mode 100644
index 5d26710..0000000
--- a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors", true);
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
deleted file mode 100644
index 7bbb429..0000000
--- a/mail-client/thunderbird-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- ischluff@mailbox.org
- Anton Schubert
-
-
-
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-58.0_beta2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-58.0_beta2.ebuild
deleted file mode 100644
index 153e7e0..0000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-58.0_beta2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.5"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=( de en-US )
-
-# 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}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
- amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
- x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-"
-# the below only works when upstream releases the xpi with all locales bundled
-# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="virtual/freedesktop-icon-theme
- dev-libs/atk
- >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- >=dev-libs/glib-2.26:2
- >=media-libs/alsa-lib-1.0.16
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10:2
- >=x11-libs/cairo-1.10[X]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/pango-1.22.0
- pulseaudio? ( !"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
- fperms 0755 /usr/bin/${PN}
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN}
-
- # Enable very specific settings for thunderbird-3
- insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
- newins "${FILESDIR}"/thunderbird-gentoo-default-prefs.js all-gentoo.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() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.0_beta9.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.0_beta9.ebuild
deleted file mode 100644
index 06d1292..0000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-60.0_beta9.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.8"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=( de en-US )
-
-# 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}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
- amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
- x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-"
-# the below only works when upstream releases the xpi with all locales bundled
-# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="virtual/freedesktop-icon-theme
- dev-libs/atk
- >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- >=dev-libs/glib-2.26:2
- >=media-libs/alsa-lib-1.0.16
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10:2
- >=x11-libs/cairo-1.10[X]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/pango-1.22.0
- pulseaudio? ( !"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
- fperms 0755 /usr/bin/${PN}
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN}
-
- # Enable very specific settings for thunderbird-3
- insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
- newins "${FILESDIR}"/thunderbird-gentoo-default-prefs.js all-gentoo.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() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}