Remove Thunderbird ebuild (Mozilla overlay has newer ebuilds)

11 files changed, 0 insertions, 1396 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
deleted file mode 100644
index 30fe9ee..0000000
--- a/mail-client/thunderbird/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX icon/thunderbird-unbranded.desktop 228 SHA256 6d6857476dc288d2470211869b3ad13241f938f2995ae273831fefefdeb64fe9 SHA512 c118873cd701f3582d18ebf5c9622b4c593bd9bae51079ec3daf9fd54aceb4b1406f2de20cc08499ced752cc7b4b2183de6777693c5e6853e47714a4df2a6e4a WHIRLPOOL 2df96beec8c941dddeb5e60d6c811f2456453e050e94e3552bcddddd0e951bfa589b64980bd9756e55a2d98611565d092d26d1d2d171b5651a7431ac077c5bca
-AUX icon/thunderbird.desktop 218 SHA256 9e801b52b5f22086d38c3609dec28fc709708a5be1101809c68d17762bd596d6 SHA512 0cbe132759012c0da6f81f37d4ede62d2f4138f0d95e590da6259d7593ad858de28467b393e5d6129a6d37d61afa9b078df0f5a8b6a259189860653c44350a72 WHIRLPOOL 96425123ccc3cbf656c841dbd58812a76802a76b4acf4409ba171792ab0b1c120dc75dea8541a1cd6a2db1ab7ef32bf29477ef7670bf97adacd2e353bef042fd
-AUX musl/thunderbird-38.3.0-updater.patch 1344 SHA256 5f07ba110fcc1ee39e352af94786428d4e2c8c7924fe3a337942ffb572da0229 SHA512 56ebff8aaa054ae3a8e9859e77cee5c0b94867d5565399594d89b76f21a6eb1bd6546a878a259229d59c6eed9458e23c64da07c337a43c677cce1bc1d00d2a62 WHIRLPOOL 8fab4d24141c139cac5ac3779838967089d6692e94a2963b85302f619b74c8d53e83d14c07d3b9a0322a941dd90925495eba6c45a35916e6791520f67cac5dd9
-AUX musl/thunderbird-44.0b1-remove-libevent-sysctl.patch 3165 SHA256 edc8df0ab0965296d137896708e90e6efd5d1cc1fd56c467f73ab14ec5145fd3 SHA512 39e103477edc8ef0bcb4c81d3257827d64d5fa9eeaff3291445e81eb7f37f50dbf7a8948dac18baa2ae1706c3829a19af491feee91d87a6035840b06bc107a80 WHIRLPOOL 85e23a3fd8304519b047ed239c6aee1758941fb35ccacfcbd5dc7048a852b9c04c4d66bb2aa4ba0ca915fc38ae91c31650086fdb5ce4582659079204ec8aca30
-AUX thunderbird-44.0_beta1-fix-preferences-gentoo.patch 410 SHA256 39031668367067c3547e6ac1b561ce71eb80b4097a23bc7ac51127f997c61fd7 SHA512 9c43f79a1501567d2fccfc70635076c25a86fa6cc031ecc497667a0c1bab483136289faa2561dcb984a0c9e2190f866b46d25a95903776a12581a498a94f8c7d WHIRLPOOL 1ea97ec062b6944977748db9fccec8fcb0e80355b18c01290fc4c9a64225d17f6b7a7357948a3613bcc77afceb56d409862c792af513aa997077cbe4fb216dbb
-AUX thunderbird-gentoo-default-prefs-1.js-1 509 SHA256 a14a5d01ebb639ea7279b07edc4ed350cb87310d769596715e26deeec3ec6e39 SHA512 d9374ce873ca4d723eea29c2ba28b5a18e5d19dadff87720353d402348daca28d2e69bc5c0f9ce53dc68f06858505e06d8b915c309caef3e90d1502c4223d599 WHIRLPOOL 6cf9d914cb4155b1c6140db6f7a97ed7aeda3e0269768b6c4c651cfcf678e14f180527a2525be8a7570e5143b5052f6a1ef44277fd7f609962aa8ebef50b74d8
-DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
-DIST firefox-44.0-patches-0.4.tar.xz 14240 SHA256 cf17d24e19c8e64501582c77e010a10bf8cc65fc1d7620f7a8dd98706195eda0 SHA512 4f597f9885366a6ccbd7cf424fd68bc7d2377eeb5de4741b21d6f51272a9f4f6a57ff2b5a848593097e79d51a7ae7e6e261aea9155f4b3d719e74ebbdf7279f1 WHIRLPOOL 097eb79a5aba97f76d50f5f51da8b089c3d85b34c6a41d6ca782a85381f024d8865062d95ff4bb2235426e3806b660344d3ddf067da0889cda66f0b24cb97912
-DIST firefox-45.0-patches-0.1.tar.xz 14232 SHA256 8b4926d538a5652b909ee4c174f0160da082defa988559275e105fb18f08f5d8 SHA512 9bfffce906a84ee984a0b553d30006fbf200b5e17ccb4782ee00f2bb13377d5368d6feedbc3b74b906608602ca95a0b8b2b16632dd1d34a1416b60a7167c0f80 WHIRLPOOL 8d335e6c5a899658fa478af19a77dde45d8199025393a365c18dc41600be111a21445b8add8198527512d1769f7b76e439440102616514bb44354b23b03828bb
-DIST firefox-45.0-patches-03.tar.xz 15980 SHA256 5bc13bb36d3e907dcffe4d57c7ace78478859bfdbe84a6b99fa76502592e0291 SHA512 6384773ea4944db15dc131a05cf61bb96505899fb5077d54c5e7227f07423656627c81321a3c207d7a3b4ad0830dd9a53d66aca832dc1ee177964516489aab30 WHIRLPOOL c3626f501434c3dc9ec4a7ba3d02e50ff8b9d011005fb334d5dedf5177d6af778e541cb7cb4ebe7d281563434bace214008c54299809e823dd83c5a5de535247
-DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
-DIST gdata-provider-2.6.tar.xz 83884 SHA256 b872dde3eafccec88c5548833530b88c85eb044e3a222f6f198d924829512f0d SHA512 b1b954babd775e183a36e913013b1d056778b12d50dd089c329aa322cc9820ad563e7e02e5eca7b1ae52c5ebed2cfdc52d11bdb973dc3ebe41cffd0c585d5c7b WHIRLPOOL eb6197ab474e8852eefabf608b0b66d12e6dea3bfe5c94f18225211d286293dc2e52ad85c7e94a8688946de33c174c72d001b5f591b47a616b07d6c475a8457a
-DIST lightning-4.0.5.tar.xz 2312932 SHA256 8386208ecb915172a48d77fc758f5040933c13619c0f9d820903ce37ba610184 SHA512 9f1fbec0520d24158af78ffe8a790502fd2843facd17bac2e278006d7b1998067b5803e1fa2e3172511d298cebb4e0b7047edb7b0aa18a8dc4712d0f1e2e08d3 WHIRLPOOL 8f6074f6038fda3a4946ea8fe788194cb2eda0c7e4a6c68a7c349781b8acb7602a70baf66bd5148ebd712e197cf4974268b5f40cedec520280c355e4f03de701
-DIST lightning-4.7.tar.xz 1929596 SHA256 6368d6438131c1b64a4089b073bd46aa45c1baa1dc9d1e65fb2146b2491ae75e SHA512 537f586da73bc0bac2851fe2930f84fe7406170711290a37cd4076197a3580cd95619e82be3428e7330dde5cb93c89fcd7ed03367b9921a4c6c678c8b6745113 WHIRLPOOL 68b39e241bcc820a3c5febf15f15ab2ac680004154b18df786a77f61611573b71b8726f3054f97ad95aff20969e1d59830c4c13966ed6d88aa6b1d8dc9de7a7b
-DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
-DIST thunderbird-44.0b1.source.tar.xz 199016060 SHA256 335d2af71bd3767b643a09b558800ebf2182688f9e61fbf98b713a2b43fa418c SHA512 677119247061b6b89f781952c287d924fa77f841f6c67313808f5bfc9b7088322c22170a4981c5666b9f5b9779792f055394b18e077a1cbfc2076f2beddaf960 WHIRLPOOL b543f2fff5efdce908e4fe1b74485ce48c61cf494c69a716365a5d4fd0e97ab58bcf3f91c3a1690df4e27d1c1fcf5b99db4bf6c1ac1d710d8688acb449d02949
-DIST thunderbird-45.0b2.source.tar.xz 200900072 SHA256 60a6b21f28a40b823e056474744eadcd7fca582fa885ee6ba49d28798d5af911 SHA512 a76fda0d897b7ebfe537935e1bf644401a8cea5be464ab83d4c42e5e376925b416833675d88129b1d862ced99995526895ded88f6950e50019ed375b9945a587 WHIRLPOOL de9c2fde2aaf8509a5b48cd3fdd41eff6e4f78670ebee187d303073cdf00618c2254ed8ef16ff996988322b1a076df6e91868ccd06a3da593ed316501ce073df
-DIST thunderbird-45.0b3.source.tar.xz 200670352 SHA256 44d62e47c07deb6c18e60e46fc914e155ffa7909b9d8ceece01921a8282bff86 SHA512 389b7275778ec7bae294c4daf6fa8fdb0be23d346813181f14d3c200083752b8392c8fb2fcbf72e0dc293b4a9496d5c1f060c1a95b6c0d14ddd2986fa56b4d27 WHIRLPOOL 50532fcc5f0f2149d8f2ea3a5a4e4531e31326bb13d472c7f9e09d419db642969596de5f0d0779b491e43d8d96ecc56006eea6c0b26a893a1509efddbc98ad01
-EBUILD thunderbird-44.0_beta1-r99.ebuild 12140 SHA256 433ecb01abefe4d281fced7b438c6b93c6266f5b3d421c368dfbde08a1527dfa SHA512 b3b8ab4850fd4a6de2aafb6692476728e1a6efc7806d15e5d920ed400be9e86a40f9a447a73cf58b6b1c4e980e345b598f6e460ed52cc12be557746b5f0bc5c9 WHIRLPOOL 2b861d5df1380b751c8453011246152e7506cf5f6e09e68e3d0cc36854dfdadfdcb5b0be58e6a7ee8ac11e582187bbf5e086dec073c3a09e902b1c1f671c748f
-EBUILD thunderbird-45.0_beta2-r1.ebuild 12158 SHA256 5071764071311ef7ef61b4e80e0289bf4458b0f807e3077d6e4e4d1e80d7d30f SHA512 23b1acc1342f56d5531527f9a63f5bbe1753f5693e15fd2adc2e47871fd0a00fedaf8e7ad223fd69c0bf544fdbe98fb9c28000e94dc6100590becc389312186e WHIRLPOOL e1ef443eb5f3792bf27d806881693588f7a5bf85bd031abdb1ca0199af62fea4a4e4bfa203feb64aaee57b01e961413dd634e25e232b8833e51894625365dd13
-EBUILD thunderbird-45.0_beta3-r1.ebuild 12157 SHA256 6390730136c86d98513d59835df0d0de5879a759c7ef981959ca107826aed696 SHA512 3e4ec42925a2c695fb65c2a5df0e8302cdf66b7a8921a32735b45cb0b6de5a6aa8411cdfe300fddbc735e6f506068c6873b518f41293f62a3bf70e6ae0cd63ec WHIRLPOOL b7104970dfcaa99635abe4e6d745ae5d1d79214ac834ffe68b14c4863ee920e9b2706807f465c0ec52d21de48f0228987b728c2f0395df8dcfac7048058178cd
-MISC metadata.xml 1499 SHA256 9e77bf6b427591dfdb3ef9962bbc1f2cf06c56c40481fb01ff4dde58b384ada5 SHA512 9b221808f226c1e1cc0cebd0abdf3b262eaed0c3392e8302fd1933141bf95840ab40bb1869b998d51d59a85fb83709963a21c114406c2a720f89d09bc0838d39 WHIRLPOOL c0398b529a65726b321968da4bbab0c156f418a01be51d2b7533589e726a93c28200035c4e664dbea4b90622d285f68464d4774e53e5c72d8292a1910233f36e
diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
deleted file mode 100644
index f9d87be..0000000
--- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon-unbranded
-Terminal=false
-Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
deleted file mode 100644
index f9c31eb..0000000
--- a/mail-client/thunderbird/files/icon/thunderbird.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon
-Terminal=false
-Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch b/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch
deleted file mode 100644
index ce892d6..0000000
--- a/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1428142217 -7200
-#      Sat Apr 04 12:10:17 2015 +0200
-# Node ID c04cc88f3bb26e254356df6de06583a542ae6796
-# Parent  90adc073cbc6398f4fab9b1cd07b685368559f34
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1157850
-updater: no fts.h and MAXNAMLEN
-
-diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/common/updatedefines.h
---- a/mozilla/toolkit/mozapps/update/common/updatedefines.h	Thu Apr 02 08:10:00 2015 -0400
-+++ b/mozilla/toolkit/mozapps/update/common/updatedefines.h	Sat Apr 04 12:10:17 2015 +0200
-@@ -109,7 +109,7 @@
- # include <sys/wait.h>
- # include <unistd.h>
- 
--#ifdef SOLARIS
-+#if 1
- # include <sys/stat.h>
- #else
- # include <fts.h>
-diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/updater/updater.cpp
---- a/mozilla/toolkit/mozapps/update/updater/updater.cpp	Thu Apr 02 08:10:00 2015 -0400
-+++ b/mozilla/toolkit/mozapps/update/updater/updater.cpp	Sat Apr 04 12:10:17 2015 +0200
-@@ -3338,7 +3338,8 @@
-   return rv;
- }
- 
--#elif defined(SOLARIS)
-+#elif 1
-+//#defined(SOLARIS)
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
-   int rv = OK;
-@@ -3346,7 +3347,7 @@
-   NS_tchar foundpath[MAXPATHLEN];
-   struct {
-     dirent dent_buffer;
--    char chars[MAXNAMLEN];
-+    char chars[NAME_MAX];
-   } ent_buf;
-   struct dirent* ent;
- 
diff --git a/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch b/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
deleted file mode 100644
index 99ff67c..0000000
--- a/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- thunderbird-44.0b1/mozilla/ipc/chromium/src/third_party/libevent/arc4random.c.orig	2016-01-24 12:09:11.209680105 +0100
-+++ thunderbird-44.0b1/mozilla/ipc/chromium/src/third_party/libevent/arc4random.c	2016-01-24 12:17:06.616663364 +0100
-@@ -58,9 +58,6 @@
- #include <unistd.h>
- #include <sys/param.h>
- #include <sys/time.h>
--#ifdef _EVENT_HAVE_SYS_SYSCTL_H
--#include <sys/sysctl.h>
--#endif
- #endif
- #include <limits.h>
- #include <stdlib.h>
-@@ -167,85 +164,6 @@
- }
- #endif
- 
--#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
--#if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
--#define TRY_SEED_SYSCTL_LINUX
--static int
--arc4_seed_sysctl_linux(void)
--{
--	/* Based on code by William Ahern, this function tries to use the
--	 * RANDOM_UUID sysctl to get entropy from the kernel.  This can work
--	 * even if /dev/urandom is inaccessible for some reason (e.g., we're
--	 * running in a chroot). */
--	int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
--	unsigned char buf[ADD_ENTROPY];
--	size_t len, n;
--	unsigned i;
--	int any_set;
--
--	memset(buf, 0, sizeof(buf));
--
--	for (len = 0; len < sizeof(buf); len += n) {
--		n = sizeof(buf) - len;
--
--		if (0 != sysctl(mib, 3, &buf[len], &n, NULL, 0))
--			return -1;
--	}
--	/* make sure that the buffer actually got set. */
--	for (i=0,any_set=0; i<sizeof(buf); ++i) {
--		any_set |= buf[i];
--	}
--	if (!any_set)
--		return -1;
--
--	arc4_addrandom(buf, sizeof(buf));
--	memset(buf, 0, sizeof(buf));
--	arc4_seeded_ok = 1;
--	return 0;
--}
--#endif
--
--#if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_ARND
--#define TRY_SEED_SYSCTL_BSD
--static int
--arc4_seed_sysctl_bsd(void)
--{
--	/* Based on code from William Ahern and from OpenBSD, this function
--	 * tries to use the KERN_ARND syscall to get entropy from the kernel.
--	 * This can work even if /dev/urandom is inaccessible for some reason
--	 * (e.g., we're running in a chroot). */
--	int mib[] = { CTL_KERN, KERN_ARND };
--	unsigned char buf[ADD_ENTROPY];
--	size_t len, n;
--	int i, any_set;
--
--	memset(buf, 0, sizeof(buf));
--
--	len = sizeof(buf);
--	if (sysctl(mib, 2, buf, &len, NULL, 0) == -1) {
--		for (len = 0; len < sizeof(buf); len += sizeof(unsigned)) {
--			n = sizeof(unsigned);
--			if (n + len > sizeof(buf))
--			    n = len - sizeof(buf);
--			if (sysctl(mib, 2, &buf[len], &n, NULL, 0) == -1)
--				return -1;
--		}
--	}
--	/* make sure that the buffer actually got set. */
--	for (i=any_set=0; i<sizeof(buf); ++i) {
--		any_set |= buf[i];
--	}
--	if (!any_set)
--		return -1;
--
--	arc4_addrandom(buf, sizeof(buf));
--	memset(buf, 0, sizeof(buf));
--	arc4_seeded_ok = 1;
--	return 0;
--}
--#endif
--#endif /* defined(_EVENT_HAVE_SYS_SYSCTL_H) */
--
- #ifdef __linux__
- #define TRY_SEED_PROC_SYS_KERNEL_RANDOM_UUID
- static int
-@@ -340,16 +258,6 @@
- 	if (0 == arc4_seed_proc_sys_kernel_random_uuid())
- 		ok = 1;
- #endif
--#ifdef TRY_SEED_SYSCTL_LINUX
--	/* Apparently Linux is deprecating sysctl, and spewing warning
--	 * messages when you try to use it. */
--	if (!ok && 0 == arc4_seed_sysctl_linux())
--		ok = 1;
--#endif
--#ifdef TRY_SEED_SYSCTL_BSD
--	if (0 == arc4_seed_sysctl_bsd())
--		ok = 1;
--#endif
- 	return ok ? 0 : -1;
- }
- 
diff --git a/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch b/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
deleted file mode 100644
index ec26160..0000000
--- a/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mail/installer/package-manifest.in	2012-02-12 09:04:32.000000000 -0600
-+++ b/mail/installer/package-manifest.in	2012-02-12 09:05:17.000000000 -0600
-@@ -336,6 +336,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; default pref files
-+@RESPATH@/defaults/pref/all-gentoo.js
- @RESPATH@/defaults/pref/all-thunderbird.js
- @RESPATH@/defaults/pref/channel-prefs.js
- @RESPATH@/defaults/pref/composer.js
diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
deleted file mode 100644
index 87fb7a5..0000000
--- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
+++ /dev/null
@@ -1,10 +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("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("mail.shell.checkDefaultClient", false);
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.autoDisableScopes", 0);
-pref("mail.serverDefaultStoreContractID", "@mozilla.org/msgstore/maildirstore;1");
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
deleted file mode 100644
index 71406ae..0000000
--- a/mail-client/thunderbird/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mozilla</herd>
-<use>
-	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
-		are not binary-redistributable according to upstream.</flag>
-	<flag name='crypt'> Enable encryption support with enigmail</flag>
-	<flag name='mozdom'>Enable Mozilla's DOM inspector</flag>
-	<flag name='lightning'>Enable app-global calendar support
-		(note 38.0 and above bundles calendar support when this flag is off)</flag>
-	<flag name='custom-optimization'>Fine-tune custom compiler optimizations
-		(-Os, -O0, -O1, -O2, -O3)</flag>
-	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
-	<flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
-	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
-		instead of bundled.</flag>
-	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
-		instead of bundled.</flag>
-	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
-		instead of bundled.</flag>
-	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
-		instead of bundled.</flag>
-	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-		installation with secure-delete enabled</flag>
-	<flag name="minimal">Remove the software development kit and headers</flag>
-</use>
-</pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-44.0_beta1-r99.ebuild b/mail-client/thunderbird/thunderbird-44.0_beta1-r99.ebuild
deleted file mode 100644
index 1e59959..0000000
--- a/mail-client/thunderbird/thunderbird-44.0_beta1-r99.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.0.5"
-MOZ_LIGHTNING_GDATA_VER="1.9"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM 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 mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.8.2"
-
-# Patches
-PATCHFF="firefox-44.0-patches-0.4"
-
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.44 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-# URI for upstream lightning package (when it is available)
-#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	lightning? (
-		https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-		https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
-	)
-	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.19.2
-	>=dev-libs/nspr-4.10.10
-	!x11-plugins/enigmail
-	elibc_musl? ( sys-libs/queue )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.1.8
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${CDEPEND}
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/${PN}-${MOZ_PV}"
-else
-	S="${WORKDIR}/comm-esr${PV%%.*}"
-fi
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	epatch "${FILESDIR}"/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
-
-	## patches for building with musl libc
-	if use elibc_musl; then
-		epatch "${FILESDIR}"/musl/thunderbird-38.3.0-updater.patch		# bug 1157850, not fixed as of today
-		epatch "${FILESDIR}"/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-		eqawarn "The version of lightning used for localization differs from the version"
-		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	fi
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	if use crypt; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
-		econf
-		popd &>/dev/null ||die
-	fi
-}
-
-src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake -j1 xpi
-		popd &>/dev/null || die
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	if use crypt ; then
-		local enigmail_xpipath="${WORKDIR}/enigmail/build"
-		cd "${T}" || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
-	fi
-
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-
-	# workaround to make thunderbird find libmozalloc.so on musl
-	into /
-	echo "LDPATH=${MOZILLA_FIVE_HOME}" > "${T}"/20thunderbird
-	doenvd "${T}"/20thunderbird || die
-
-}
-
-pkg_postinst() {
-	if use crypt; then
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gtk*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-			ewarn "You may be prompted for your password in an inaccessible shell!!"
-			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-			;;
-		esac
-	fi
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-45.0_beta2-r1.ebuild b/mail-client/thunderbird/thunderbird-45.0_beta2-r1.ebuild
deleted file mode 100644
index 2e9ea63..0000000
--- a/mail-client/thunderbird/thunderbird-45.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.7"
-MOZ_LIGHTNING_GDATA_VER="2.6"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM 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 mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.8.2"
-
-# Patches
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-0.1"
-
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZ_FORCE_UPSTREAM_L10N=1
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.44 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-# URI for upstream lightning package (when it is available)
-#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.21
-	>=dev-libs/nspr-4.11
-	!x11-plugins/enigmail
-	elibc_musl? ( sys-libs/queue )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${CDEPEND}
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-#	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
-#			8011_bug1194520-freetype261_until_moz43.patch" \
-
-	if use elibc_musl; then
-		epatch "${FILESDIR}"/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-		eqawarn "The version of lightning used for localization differs from the version"
-		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	fi
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	if use crypt; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
-		econf
-		popd &>/dev/null ||die
-	fi
-}
-
-src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake -j1 xpi
-		popd &>/dev/null || die
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	if use crypt ; then
-		local enigmail_xpipath="${WORKDIR}/enigmail/build"
-		cd "${T}" || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
-	fi
-
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	if use crypt; then
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gtk*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-			ewarn "You may be prompted for your password in an inaccessible shell!!"
-			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-			;;
-		esac
-	fi
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-45.0_beta3-r1.ebuild b/mail-client/thunderbird/thunderbird-45.0_beta3-r1.ebuild
deleted file mode 100644
index 4ab68a2..0000000
--- a/mail-client/thunderbird/thunderbird-45.0_beta3-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.7"
-MOZ_LIGHTNING_GDATA_VER="2.6"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM 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 mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.8.2"
-
-# Patches
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-03"
-
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZ_FORCE_UPSTREAM_L10N=1
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.44 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-# URI for upstream lightning package (when it is available)
-#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.21
-	>=dev-libs/nspr-4.11
-	!x11-plugins/enigmail
-	elibc_musl? ( sys-libs/queue )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${CDEPEND}
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-#	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
-#			8011_bug1194520-freetype261_until_moz43.patch" \
-
-	if use elibc_musl; then
-		epatch "${FILESDIR}"/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-		eqawarn "The version of lightning used for localization differs from the version"
-		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	fi
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	if use crypt; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
-		econf
-		popd &>/dev/null ||die
-	fi
-}
-
-src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake -j1 xpi
-		popd &>/dev/null || die
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	if use crypt ; then
-		local enigmail_xpipath="${WORKDIR}/enigmail/build"
-		cd "${T}" || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
-	fi
-
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	if use crypt; then
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gtk*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-			ewarn "You may be prompted for your password in an inaccessible shell!!"
-			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-			;;
-		esac
-	fi
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}