Version bump, bug 166932

Package-Manager: portage-2.1.2-r9

6 files changed, 318 insertions, 38 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 3f28b2a72df1..1e4f40fe5091 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.48 2007/01/08 01:22:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.49 2007/02/17 11:55:54 armin76 Exp $
+
+*enigmail-0.94.2-r1 (17 Feb 2007)
+*enigmail-0.94.2 (17 Feb 2007)
+
+  17 Feb 2007; Raúl Porcel <armin76@gentoo.org> -enigmail-0.94.1-r1.ebuild,
+  +enigmail-0.94.2.ebuild, +enigmail-0.94.2-r1.ebuild:
+  Version bump, bug 166932
 
   08 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> enigmail-0.94.1.ebuild,
   enigmail-0.94.1-r2.ebuild:
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index d37caf6d38d8..6b348d934a62 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50_enigmail_no_upgrade-1.patch 651 RMD160 1631ce4cb6e2758d2fe475327b9665fbefbcbe56 SHA1 e1964aa817320c56181cfcfad997bf975f8cbf46 SHA256 1dbbc22e22d4639c407b9690280cc37d9a86919fde694be10daa3eac6c44ada2
 MD5 fd7ac5cd0e3e465ce1c03909671c4a16 files/50_enigmail_no_upgrade-1.patch 651
 RMD160 1631ce4cb6e2758d2fe475327b9665fbefbcbe56 files/50_enigmail_no_upgrade-1.patch 651
@@ -23,6 +20,7 @@ RMD160 86461454b4723c19c43bb81b77a7067656e0f0ff files/firefox-1.5-visibility-fix
 SHA256 9d9afd53a6c16d81e43b779371bc7d38a95a44c599fe500e368c4024652c058a files/firefox-1.5-visibility-fix.patch 485
 DIST enigmail-0.94.0.tar.gz 508113 RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 SHA1 486c83b1dc2dc4965c95052b6fe235acbc9c3613 SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3
 DIST enigmail-0.94.1.tar.gz 513084 RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 SHA1 d507757c065b607edecd193406ad60fcb7a67ace SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1
+DIST enigmail-0.94.2.tar.gz 514823 RMD160 3a016e848798e9ac3a8d56f628cdeaf2fdc6bd1a SHA1 486cc52f84b17456536ff69ab45928e15b655dc5 SHA256 2263ec2c9bf3317472f33bed46b9cb6f91d64a766314167678125b4f3b6376b8
 DIST enigmail-ca-AD-0.9x.xpi 29484 RMD160 a338ad40279f43e13f0ae47b27719357806f56b8 SHA1 3022dd94cfd0c01b506195e276f5b5dfaf5cb7f5 SHA256 d3a5af60286e90c777a7473e9432db727a9349ae1b7d4670803b605e9c4ad405
 DIST enigmail-cs-CZ-0.9x.xpi 31992 RMD160 2aeb8484ed927c87e782548f8414dc6e4b246ae0 SHA1 81fc33ff0a1bf54acefbf335081d3435d45cee72 SHA256 3184737a5761b6fd136cd6bf903cd3c383194608b5ebc45f217734143eefa280
 DIST enigmail-de-0.9x.xpi 31569 RMD160 bcbe0a8adc3f024ddd0cda0d3adffc6831b55b87 SHA1 dc443a89903bd2aa61e41e7dd3023b42bbbf8ddc SHA256 15f542325dc1ed0fcce8424f2dbd04efeefabfa193116c8ba26511c42818d3da
@@ -48,13 +46,13 @@ DIST enigmail-zh-CN-0.9x.xpi 31747 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75
 DIST mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST mozilla-thunderbird-1.5.0.5-patches-0.1.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715 RMD160 a86a745963ad911da7c4e30eb9a673f1b657c5af SHA1 8e6f9fff11d06ee5f9f441527d466e6e1862263b SHA256 1f7af196a2342a27ebd37c1deed0ec6fb2e028d4b55faa9e3c5e761716b3352d
-DIST mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402 RMD160 28aa536c70aacedafaf8a136e6b390ec08f08229 SHA1 5d718f217891983752418e2f1a7ba7b632fcdfde SHA256 a3d0fc16b8d0f87e8e34dc8849e6b481a4ee2b4635a22bec3a46ede9e7b1bb76
 DIST mozilla-thunderbird-2.0_alpha1-patches-1.2.tar.bz2 63079 RMD160 ae0610540b2815594e870bc0bc2009be9f7bac3d SHA1 a052730f08e1098341ed94588d1e0beb072c9576 SHA256 92cfc062125efb5769f5b9d6a7e03c57323b39fb87c28b64636cffbcbab4100e
+DIST mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961 RMD160 d827aecf75158bc0a4dd23149caba7d79bc4e57b SHA1 77eaa42af3011159a71609bae8cdf54cd2383de3 SHA256 bfcaa6b4992993dc6323a3d4a102eef673c8cef99d2b1a6498049d26ae59edbe
 DIST thunderbird-1.5.0.4-source.tar.bz2 35872600 RMD160 27e88578d8857e48b46ee4dff2900f27b8a0f447 SHA1 492dd76460fc14543a70349263b64b0a2803bee9 SHA256 b665c89bfc18a84c57d85370889973cfc547e1e942aba5798321ea34e4ddbca7
 DIST thunderbird-1.5.0.5-source.tar.bz2 35998778 RMD160 aa32d59efa7d55eb516d967c1fb4cc6cc13f874b SHA1 475ae30ead41847120c36f432b3359f0d60ea9da SHA256 b6fc27b79d0a4dabb30011cc6ba6161080f991ccadae12e5214cac86d009b005
 DIST thunderbird-1.5.0.7-source.tar.bz2 35994957 RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 SHA1 9e5acff9bd098979dd798c0111805dc8d67479ad SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
-DIST thunderbird-2.0a1-source.tar.bz2 36476408 RMD160 40e6552f5dd397ddbd37f07852d87346b1b25c45 SHA1 63c91d9fda28c283d53a9b146fbb92c622580b52 SHA256 f62eb7e40d76df3001f6a46e3ffee0c83fad75887fb87007cf3ecc251cb16078
 DIST thunderbird-2.0b1-source.tar.bz2 37027006 RMD160 f1efeba3181c20e283f530f70bfca76abfd6317d SHA1 0edfe00dd32454b7e03c01c0eb773339fd74707a SHA256 da711ee9beaf0c1072ceb8e6e35984ae5b6c8f71cbe1255485a380ebde393f64
+DIST thunderbird-2.0b2-source.tar.bz2 37092627 RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 SHA1 cb5ee6baa2087908da56044f601e0aa5ffaec573 SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16
 EBUILD enigmail-0.94.0-r4.ebuild 4259 RMD160 d470a12a11e176c724c44404a7d303b2d34f7a9a SHA1 1f675f73eb60fddc3d3030ee108c2a27b196b390 SHA256 f59dfebdda57ec655a62e0d93b98dfb68b5d5db9b0ce822502fa711c1101dbae
 MD5 c42ca654687ebcbd6d7fb130e052c509 enigmail-0.94.0-r4.ebuild 4259
 RMD160 d470a12a11e176c724c44404a7d303b2d34f7a9a enigmail-0.94.0-r4.ebuild 4259
@@ -63,10 +61,6 @@ EBUILD enigmail-0.94.0-r5.ebuild 4270 RMD160 2d48fb34f728da647242be8996284caaf00
 MD5 ada9167aa3c500ca42747c69d40c2495 enigmail-0.94.0-r5.ebuild 4270
 RMD160 2d48fb34f728da647242be8996284caaf006662b enigmail-0.94.0-r5.ebuild 4270
 SHA256 1ef3d9139d0ed0e4b09f421a17c99ad7a9449069f5e9ab7d93f35389472b2ae1 enigmail-0.94.0-r5.ebuild 4270
-EBUILD enigmail-0.94.1-r1.ebuild 5703 RMD160 b2b9434a116caf0931f33c00daab5428ffc83411 SHA1 ff8112bff9368a91aa49a84a418ad77a09d9d499 SHA256 571c74fad89fa6d26d121447bd885f71be5ea75586fdd4c272e40f52934fa93f
-MD5 4384eea2608012b0732c30d4631caa69 enigmail-0.94.1-r1.ebuild 5703
-RMD160 b2b9434a116caf0931f33c00daab5428ffc83411 enigmail-0.94.1-r1.ebuild 5703
-SHA256 571c74fad89fa6d26d121447bd885f71be5ea75586fdd4c272e40f52934fa93f enigmail-0.94.1-r1.ebuild 5703
 EBUILD enigmail-0.94.1-r2.ebuild 5939 RMD160 8086cc325fecdadee4d832c4507563f5a5bd236f SHA1 0b0b8f9ea7634d0e2cfd59d7bafde3a91e4f5aec SHA256 9e0ff8d6ad02bf065739ff358fcb458cd3c604ed98c6ebf0fbd960674d37f850
 MD5 f1d4a8da0a78dd420d4334e2fe9fb8bb enigmail-0.94.1-r2.ebuild 5939
 RMD160 8086cc325fecdadee4d832c4507563f5a5bd236f enigmail-0.94.1-r2.ebuild 5939
@@ -75,10 +69,18 @@ EBUILD enigmail-0.94.1.ebuild 5857 RMD160 836f959c129a5c3ccbd162e4f8678f39a36d95
 MD5 d5b2b4bae59aded6403021b596128a4f enigmail-0.94.1.ebuild 5857
 RMD160 836f959c129a5c3ccbd162e4f8678f39a36d95b6 enigmail-0.94.1.ebuild 5857
 SHA256 20a45ac21397e7e226ede1e1af3c280c9762b8d399497f5a23723c9a48adb897 enigmail-0.94.1.ebuild 5857
-MISC ChangeLog 7145 RMD160 05f0639a1004786e3344c5c12c35f08cc393f08a SHA1 2e28ca49b2a1e0f1d6cae5d2a2ed1c85f0056a97 SHA256 a67a8e64fd78c4e95d47d25e8447a638436dc7a4888d32d3b2d2f3c938e76e42
-MD5 d60b1443fc6dd02d372eda4fb9ac7e5f ChangeLog 7145
-RMD160 05f0639a1004786e3344c5c12c35f08cc393f08a ChangeLog 7145
-SHA256 a67a8e64fd78c4e95d47d25e8447a638436dc7a4888d32d3b2d2f3c938e76e42 ChangeLog 7145
+EBUILD enigmail-0.94.2-r1.ebuild 5945 RMD160 b87cb8ee2feb2294c164696afdb9367598b541bc SHA1 1467e82949031fb97d4770f4859de916c8f2097a SHA256 270a6cca6c47514f60f46ecf32d0e49eb8515e82a2782d97f03fff9b0f57b658
+MD5 e46653ed0b4f10c8493e461a522c1474 enigmail-0.94.2-r1.ebuild 5945
+RMD160 b87cb8ee2feb2294c164696afdb9367598b541bc enigmail-0.94.2-r1.ebuild 5945
+SHA256 270a6cca6c47514f60f46ecf32d0e49eb8515e82a2782d97f03fff9b0f57b658 enigmail-0.94.2-r1.ebuild 5945
+EBUILD enigmail-0.94.2.ebuild 5864 RMD160 89a771284cde798341b7375ca346d56bbb7111a0 SHA1 cbaf8daaf23197392e90cd070371e7e64778bb46 SHA256 4817d3ffa8fc49a776a66ebad60d8237f782be9d8dce95bf1260e8935673e1d4
+MD5 28b946f067fd93b4ccd8ef596696494e enigmail-0.94.2.ebuild 5864
+RMD160 89a771284cde798341b7375ca346d56bbb7111a0 enigmail-0.94.2.ebuild 5864
+SHA256 4817d3ffa8fc49a776a66ebad60d8237f782be9d8dce95bf1260e8935673e1d4 enigmail-0.94.2.ebuild 5864
+MISC ChangeLog 7372 RMD160 86e6f61d95e843f196f474de78344242f8ecee90 SHA1 9b3b5ddc52e374c6d5483185cb7fb3d4760cf9e2 SHA256 0a91fb9afd1bc8bff0f03d7ad62732daaab1067c58eac66c43c5ad8872c6478d
+MD5 b69c2711080e00499a69ba926f02593a ChangeLog 7372
+RMD160 86e6f61d95e843f196f474de78344242f8ecee90 ChangeLog 7372
+SHA256 0a91fb9afd1bc8bff0f03d7ad62732daaab1067c58eac66c43c5ad8872c6478d ChangeLog 7372
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
 MD5 22a1feabf45dadbfa2268b7fff3ce66e metadata.xml 238
 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 metadata.xml 238
@@ -92,16 +94,12 @@ SHA256 dffa6023cbb81b2a5810788ee8a7e8d5db0091329d28c4efa636477e35fcccd1 files/di
 MD5 188a7ef15afdbc6f9199705546fa563b files/digest-enigmail-0.94.1 6271
 RMD160 1a8117027484425b6fd0148e5ac2e7dcc6715009 files/digest-enigmail-0.94.1 6271
 SHA256 9340bfbff19f3dc997c2b96f853b58bd6c2ebf56d3e014fe0ddd93a39429e056 files/digest-enigmail-0.94.1 6271
-MD5 4c94696d716af82d1a3628c5cc5c6d5d files/digest-enigmail-0.94.1-r1 6274
-RMD160 2b5df6e1fa557b635a9471d007dafd4099257fb8 files/digest-enigmail-0.94.1-r1 6274
-SHA256 de14b9cf7a22281381c9d9b0203aba6a5b91c0fb9e70d4cee13a840d2b56879f files/digest-enigmail-0.94.1-r1 6274
 MD5 3a1caddf274d66bcb2451b3436ee120f files/digest-enigmail-0.94.1-r2 6274
 RMD160 5f7af6acb1b60acb2b7f7a4e42d1779d7d0b3a48 files/digest-enigmail-0.94.1-r2 6274
 SHA256 48c5476c1182415a09a16f3b6d18d63c36a720b4d96642e0261b603be2832cb7 files/digest-enigmail-0.94.1-r2 6274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFoZyPugEuf3OQ0akRAnluAKCAnyLT433hpSZHWbqkv0dJAeo/nQCcDLvu
-+MJLL5O0SpzaW+iZwTvS3PI=
-=H5F+
------END PGP SIGNATURE-----
+MD5 2684664383510bdc06f91853828b3cd8 files/digest-enigmail-0.94.2 6271
+RMD160 93bb8ebd5b19899545d95969e2b91d2f2bad87c3 files/digest-enigmail-0.94.2 6271
+SHA256 ac200a25ce2813e1e199149c5d8e5be290fcedaf17fc1bee0b06f8ac66ee75ab files/digest-enigmail-0.94.2 6271
+MD5 3bfc3833fc7fec27d8334be20943a814 files/digest-enigmail-0.94.2-r1 6271
+RMD160 1a0fac57b5c65292acc598c2c296fba00daaa27f files/digest-enigmail-0.94.2-r1 6271
+SHA256 dd39d13b6ef8ef49e915197007cdcc65571d9896ea8b66626943a35ea8ff3e86 files/digest-enigmail-0.94.2-r1 6271
diff --git a/x11-plugins/enigmail/enigmail-0.94.1-r1.ebuild b/x11-plugins/enigmail/enigmail-0.94.2-r1.ebuild
index 9eeabba67d4b..fa4da9c6f59f 100644
--- a/x11-plugins/enigmail/enigmail-0.94.1-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-0.94.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.1-r1.ebuild,v 1.3 2007/01/06 17:44:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.2-r1.ebuild,v 1.1 2007/02/17 11:55:54 armin76 Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 WANT_AUTOCONF=2.1
@@ -10,17 +10,18 @@ LANGS="de el es-AR es-ES nb-NO pt-BR sv-SE zh-CN"
 SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO nl-NL pl-PL pt-PT ru-RU sk-SK sl-SI sv-SE"
 
 EMVER=${PV}
-TBVER="2.0a1"
-MY_TBVER="2.0_alpha1"
-TBPVER="1.0"
+TBVER="2.0b2"
+MY_TBVER="2.0_beta2"
+TBPVER="0.1"
 
 DESCRIPTION="Gnupg encryption plugin for thunderbird."
 HOMEPAGE="http://enigmail.mozdev.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
+	http://dev.gentooexperimental.org/~anarchy/dist/mozilla-thunderbird-${MY_TBVER}-patches-${TBPVER}.tar.bz2
 	mirror://gentoo/mozilla-thunderbird-${MY_TBVER}-patches-${TBPVER}.tar.bz2
 	http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ia64 mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2"
 IUSE=""
@@ -176,6 +177,9 @@ src_install() {
 	cd ${D}${MOZILLA_FIVE_HOME}/extensions/${emid}
 	unzip ${S}/dist/bin/*.xpi
 
+	# Fix module to work with 2.0_beta1
+	sed -i -e "s/2\.0a1/2.0b1/" ${D}${MOZILLA_FIVE_HOME}/extensions/${emid}/install.rdf
+
 	# these files will be picked up by mozilla-launcher -register
 	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
 	insinto ${MOZILLA_FIVE_HOME}/chrome.d
diff --git a/x11-plugins/enigmail/enigmail-0.94.2.ebuild b/x11-plugins/enigmail/enigmail-0.94.2.ebuild
new file mode 100644
index 000000000000..0da896624e18
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.94.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.2.ebuild,v 1.1 2007/02/17 11:55:54 armin76 Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+WANT_AUTOCONF=2.1
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
+
+LANGS="de el es-AR es-ES nb-NO pt-BR sv-SE zh-CN"
+SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO nl-NL pl-PL pt-PT ru-RU sk-SK sl-SI sv-SE"
+
+EMVER=${PV}
+TBVER="1.5.0.7"
+TBPVER="0.1"
+
+DESCRIPTION="Gnupg encryption plugin for thunderbird."
+HOMEPAGE="http://enigmail.mozdev.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
+	mirror://gentoo/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2
+	http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2"
+IUSE=""
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://www.mozilla-enigmail.org/downloads/lang/0.9x/${PN}-${X}-0.9x.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+done
+# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://www.mozilla-enigmail.org/downloads/lang/0.9x/${PN}-${X}-0.9x.xpi )"
+	IUSE="${IUSE} linguas_${X%%-*}"
+done
+#( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
+
+DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.4.5
+	>=www-client/mozilla-launcher-1.37"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_CO_PROJECT=mail
+
+linguas() {
+	linguas=
+	local LANG
+	for LANG in ${LINGUAS}; do
+		if hasq ${LANG} en en_US; then
+			hasq en ${linguas} || \
+				linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif hasq ${LANG} ${LANGS//-/_}; then
+			hasq ${LANG//_/-} ${linguas} || \
+				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		else
+			local SLANG
+			for SLANG in ${SHORTLANGS}; do
+				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+					hasq ${SLANG} ${linguas} || \
+						linguas="${linguas:+"${linguas} "}${SLANG}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2 || die "unpack failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_unpack ${PN}-${X}-0.9x.xpi
+	done
+
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch ${WORKDIR}/patch
+
+	# Unpack the enigmail plugin
+	cd ${S}/mailnews/extensions || die
+	unpack enigmail-${EMVER}.tar.gz
+	cd ${S}/mailnews/extensions/enigmail || die "cd failed"
+	makemake2
+
+	cd ${S}
+
+	# Use the right theme for thunderbird #45609
+	sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn
+
+	# Don't allow upgrades via the browser
+	epatch ${FILESDIR}/50_enigmail_no_upgrade-1.patch
+
+	# Fix installation of enigmail.js
+	epatch ${FILESDIR}/70_enigmail-fix.patch
+
+	eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_annotate '' \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-user-appdir=.thunderbird
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# thunderbird
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf  || die "econf failed"
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	# Only build the parts necessary to support building enigmail
+	emake -j1 export || die "make export failed"
+	emake -C modules/libreg || die "make modules/libreg failed"
+	emake -C xpcom/string || die "make xpcom/string failed"
+	emake -C xpcom || die "make xpcom failed"
+	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
+
+	# Build the enigmail plugin
+	einfo "Building Enigmail plugin..."
+	emake -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+
+	# Package the enigmail plugin; this may be the easiest way to collect the
+	# necessary files
+	emake -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
+	declare emid
+
+	cd ${T}
+	unzip ${S}/dist/bin/*.xpi install.rdf
+	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+	cd ${D}${MOZILLA_FIVE_HOME}/extensions/${emid}
+	unzip ${S}/dist/bin/*.xpi
+
+	# Fix registration on AMD64 per bug #143158
+	if use amd64; then
+		sed -i -e "s/_x86_64-gcc3//" \
+		${D}${MOZILLA_FIVE_HOME}/extensions/${emid}/install.rdf
+	fi
+
+	# these files will be picked up by mozilla-launcher -register
+	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
+	insinto ${MOZILLA_FIVE_HOME}/chrome.d
+	newins ${S}/dist/bin/chrome/installed-chrome.txt ${PN}
+	echo "extension,${emid}" > ${D}${MOZILLA_FIVE_HOME}/extensions.d/${PN}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${PN}-${X}-0.9x
+	done
+}
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.1-r1 b/x11-plugins/enigmail/files/digest-enigmail-0.94.2
index 35ac1a2f17aa..67625d0dad3c 100644
--- a/x11-plugins/enigmail/files/digest-enigmail-0.94.1-r1
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.2
@@ -1,6 +1,6 @@
-MD5 b255e7a77ecea435934bfa1872e99f6a enigmail-0.94.1.tar.gz 513084
-RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 enigmail-0.94.1.tar.gz 513084
-SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1 enigmail-0.94.1.tar.gz 513084
+MD5 cc1ba2bec7c3a2ac408ef24fbf1884de enigmail-0.94.2.tar.gz 514823
+RMD160 3a016e848798e9ac3a8d56f628cdeaf2fdc6bd1a enigmail-0.94.2.tar.gz 514823
+SHA256 2263ec2c9bf3317472f33bed46b9cb6f91d64a766314167678125b4f3b6376b8 enigmail-0.94.2.tar.gz 514823
 MD5 2f7b87d93cb4fcb831690ae7438e4f0e enigmail-ca-AD-0.9x.xpi 29484
 RMD160 a338ad40279f43e13f0ae47b27719357806f56b8 enigmail-ca-AD-0.9x.xpi 29484
 SHA256 d3a5af60286e90c777a7473e9432db727a9349ae1b7d4670803b605e9c4ad405 enigmail-ca-AD-0.9x.xpi 29484
@@ -67,9 +67,9 @@ SHA256 afa3b754d9372cc531752e83909c6147cdc10d7a5ef42f364dc8cbbc686af93c enigmail
 MD5 ea388891cc3e67a5c69345608e2ca127 enigmail-zh-CN-0.9x.xpi 31747
 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 enigmail-zh-CN-0.9x.xpi 31747
 SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512 enigmail-zh-CN-0.9x.xpi 31747
-MD5 3dc083017f58607b4704278455559540 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
-RMD160 28aa536c70aacedafaf8a136e6b390ec08f08229 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
-SHA256 a3d0fc16b8d0f87e8e34dc8849e6b481a4ee2b4635a22bec3a46ede9e7b1bb76 mozilla-thunderbird-2.0_alpha1-patches-1.0.tar.bz2 23402
-MD5 70adf3ca4838d114f8b6dffc6e004388 thunderbird-2.0a1-source.tar.bz2 36476408
-RMD160 40e6552f5dd397ddbd37f07852d87346b1b25c45 thunderbird-2.0a1-source.tar.bz2 36476408
-SHA256 f62eb7e40d76df3001f6a46e3ffee0c83fad75887fb87007cf3ecc251cb16078 thunderbird-2.0a1-source.tar.bz2 36476408
+MD5 02c06f7c12807daf4d990db5519696e6 mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715
+RMD160 a86a745963ad911da7c4e30eb9a673f1b657c5af mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715
+SHA256 1f7af196a2342a27ebd37c1deed0ec6fb2e028d4b55faa9e3c5e761716b3352d mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715
+MD5 c3933149147567471000e53dbeac7429 thunderbird-1.5.0.7-source.tar.bz2 35994957
+RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 thunderbird-1.5.0.7-source.tar.bz2 35994957
+SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9 thunderbird-1.5.0.7-source.tar.bz2 35994957
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.2-r1 b/x11-plugins/enigmail/files/digest-enigmail-0.94.2-r1
new file mode 100644
index 000000000000..2fc6685bb4d5
--- /dev/null
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.2-r1
@@ -0,0 +1,75 @@
+MD5 cc1ba2bec7c3a2ac408ef24fbf1884de enigmail-0.94.2.tar.gz 514823
+RMD160 3a016e848798e9ac3a8d56f628cdeaf2fdc6bd1a enigmail-0.94.2.tar.gz 514823
+SHA256 2263ec2c9bf3317472f33bed46b9cb6f91d64a766314167678125b4f3b6376b8 enigmail-0.94.2.tar.gz 514823
+MD5 2f7b87d93cb4fcb831690ae7438e4f0e enigmail-ca-AD-0.9x.xpi 29484
+RMD160 a338ad40279f43e13f0ae47b27719357806f56b8 enigmail-ca-AD-0.9x.xpi 29484
+SHA256 d3a5af60286e90c777a7473e9432db727a9349ae1b7d4670803b605e9c4ad405 enigmail-ca-AD-0.9x.xpi 29484
+MD5 d605fb750c353e8a4c5d853aae1594ef enigmail-cs-CZ-0.9x.xpi 31992
+RMD160 2aeb8484ed927c87e782548f8414dc6e4b246ae0 enigmail-cs-CZ-0.9x.xpi 31992
+SHA256 3184737a5761b6fd136cd6bf903cd3c383194608b5ebc45f217734143eefa280 enigmail-cs-CZ-0.9x.xpi 31992
+MD5 a6d521392385d55d9de6dbe093def72c enigmail-de-0.9x.xpi 31569
+RMD160 bcbe0a8adc3f024ddd0cda0d3adffc6831b55b87 enigmail-de-0.9x.xpi 31569
+SHA256 15f542325dc1ed0fcce8424f2dbd04efeefabfa193116c8ba26511c42818d3da enigmail-de-0.9x.xpi 31569
+MD5 1ea24fe218e37a12c307c542ae5909f5 enigmail-el-0.9x.xpi 37047
+RMD160 b655be606c1f84a626969b29d34ea4b139aaebf5 enigmail-el-0.9x.xpi 37047
+SHA256 1bda2a0f2f081c5b5a9e612890dff16469f2b794ce21e10fca249f758ea3eebe enigmail-el-0.9x.xpi 37047
+MD5 ba2c0188476992ecfcd389ea1b9e150b enigmail-es-AR-0.9x.xpi 28723
+RMD160 56a8c4ee531adf40dedcfb0a6d4930cddfb73c9a enigmail-es-AR-0.9x.xpi 28723
+SHA256 8e58e443d89cfc8ae574a8ba6a27f0b3143306673e79f1a65300a2a2e13a6405 enigmail-es-AR-0.9x.xpi 28723
+MD5 4e147df61d36030bb2754ab702da8491 enigmail-es-ES-0.9x.xpi 30493
+RMD160 57feebbf302d16eff8ff0003d98fcaf3c5a2c992 enigmail-es-ES-0.9x.xpi 30493
+SHA256 a4ae0282c991cd66f75a980d840cdb39cd357d4257338015ddcd84ee239665b4 enigmail-es-ES-0.9x.xpi 30493
+MD5 3b4bc4aaa900a1d60ceb1eaf792fb19c enigmail-fi-FI-0.9x.xpi 29256
+RMD160 e8b41b374f344823d7664927c0dbbd4a2d49b942 enigmail-fi-FI-0.9x.xpi 29256
+SHA256 c7268fdaa65c4c4c2150f76c3f3c011cdeda42471aca16e5cb7bdda06a6cdc19 enigmail-fi-FI-0.9x.xpi 29256
+MD5 e8d57b69a0bb74d0f28e940b067280db enigmail-fr-FR-0.9x.xpi 31804
+RMD160 644d479a1610b8a026e721e5edaa3926ad988282 enigmail-fr-FR-0.9x.xpi 31804
+SHA256 724d22f9b5ca947ed354541b7c662ee80a0f59822f924529a94c9bf328d9967f enigmail-fr-FR-0.9x.xpi 31804
+MD5 536f455838438e0655663192619a5d99 enigmail-hu-HU-0.9x.xpi 32616
+RMD160 4f778ec903635bc63436e8525362196f3ba2ef8a enigmail-hu-HU-0.9x.xpi 32616
+SHA256 59bc30fa38c31b7401ad35a001fbccaa0a2492e06946d38d0ee095e6dc5b178f enigmail-hu-HU-0.9x.xpi 32616
+MD5 f7793ca6bdfae7d5913c8eb1b6f8a619 enigmail-it-IT-0.9x.xpi 30519
+RMD160 5deb7db1ab7793e69d965d5c97d69dab680af6ab enigmail-it-IT-0.9x.xpi 30519
+SHA256 c87c42804b93e43d5370c3b4a89f247fd05bee721db93fb606e69b2c64d8ed96 enigmail-it-IT-0.9x.xpi 30519
+MD5 8ab69cdf5c57a150c3c1bd4dbf9bb81e enigmail-ja-JP-0.9x.xpi 32354
+RMD160 b5db0a3ecd1c645694e2247a5d65f0a619ca4b57 enigmail-ja-JP-0.9x.xpi 32354
+SHA256 9806667ea37130eb91670e7b6712ca1ca3cdffdccaae17cf445e03a626804b71 enigmail-ja-JP-0.9x.xpi 32354
+MD5 040116419375d9ca520282d6a2493454 enigmail-ko-KR-0.9x.xpi 25212
+RMD160 8fe6915b20a2f3960686c05e0a83c26bdbfd0974 enigmail-ko-KR-0.9x.xpi 25212
+SHA256 00bc694cf33db3016ac37d48d4f7ead907cb418771f98667bb70c09bd1f94440 enigmail-ko-KR-0.9x.xpi 25212
+MD5 2aa5734f939734bdc05a29e0f2cf1c3e enigmail-nb-NO-0.9x.xpi 28466
+RMD160 756a7e63d557d1eff49232d1eaec322cfc01f2f0 enigmail-nb-NO-0.9x.xpi 28466
+SHA256 09f61fb75f0df03a8779a89b9b39cba2aafdaab257909537c6d9c89eb7f57270 enigmail-nb-NO-0.9x.xpi 28466
+MD5 1a74b915c98e544cc7f087db3ea9511d enigmail-nl-NL-0.9x.xpi 30856
+RMD160 05a95188580bbe32b42dadf84506d1c0cb1e83ac enigmail-nl-NL-0.9x.xpi 30856
+SHA256 b4297116275852d644cf9dfc5aec702ad3bbca41abc1477150cea8baffd4e774 enigmail-nl-NL-0.9x.xpi 30856
+MD5 5061fb4a0b321644a1716aea831cf281 enigmail-pl-PL-0.9x.xpi 30929
+RMD160 e69e3550c0c8271bd47e914181d4e5d44d7e80c7 enigmail-pl-PL-0.9x.xpi 30929
+SHA256 534f0082c83944c6cfb2c9777bb59c2d835b8267f6da1eaa208c19420d3d9f8b enigmail-pl-PL-0.9x.xpi 30929
+MD5 0e66502ea16233bca180b81fd91b05d8 enigmail-pt-BR-0.9x.xpi 31760
+RMD160 ec1dd0e3c7c837fa70d936a76f627b2f9533be38 enigmail-pt-BR-0.9x.xpi 31760
+SHA256 3636acc459e65059da15245aa5009df84526b1e5b98421692463eb1eeb06bc92 enigmail-pt-BR-0.9x.xpi 31760
+MD5 990a07caf21353ad46a689a2fa1ed1c5 enigmail-pt-PT-0.9x.xpi 30799
+RMD160 1f87d7467d6338ae3508c735a2937b00ad1cbbd8 enigmail-pt-PT-0.9x.xpi 30799
+SHA256 279ce324872bd14408c9c496d112d454130da0388ff138de0fbc902bc98c9403 enigmail-pt-PT-0.9x.xpi 30799
+MD5 2febfba49fcc6819eb99997a7c2082ff enigmail-ru-RU-0.9x.xpi 35218
+RMD160 12298cf592f1c47ac1367e65de7ad3688d7e408c enigmail-ru-RU-0.9x.xpi 35218
+SHA256 3b85d935f75836fd313ba45b8515957455caddf4e839945f756cbba0734ddef1 enigmail-ru-RU-0.9x.xpi 35218
+MD5 9c83e23d94412f53c42e8879a5634511 enigmail-sk-SK-0.9x.xpi 30121
+RMD160 105c14a5aed02105148989ababc17277ccc1d381 enigmail-sk-SK-0.9x.xpi 30121
+SHA256 0aa026f8debfe6037124f3861155cb00d8ccf5d8a223f7827f2718c611b00d0e enigmail-sk-SK-0.9x.xpi 30121
+MD5 dc9257ced51632aee9872ecb210ddc84 enigmail-sl-SI-0.9x.xpi 30090
+RMD160 3f2f81d526c4665100f154231310a36c4aeeab36 enigmail-sl-SI-0.9x.xpi 30090
+SHA256 c58675c3efdc68ca197f85b4955123d12a5baf4e1bbe01710bc5bbffddcea992 enigmail-sl-SI-0.9x.xpi 30090
+MD5 8850c1eab91e441d30a2e536b3b31a3b enigmail-sv-SE-0.9x.xpi 30803
+RMD160 5f4259a55e6753a6ec61a7a5eac64b365d3a1973 enigmail-sv-SE-0.9x.xpi 30803
+SHA256 afa3b754d9372cc531752e83909c6147cdc10d7a5ef42f364dc8cbbc686af93c enigmail-sv-SE-0.9x.xpi 30803
+MD5 ea388891cc3e67a5c69345608e2ca127 enigmail-zh-CN-0.9x.xpi 31747
+RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 enigmail-zh-CN-0.9x.xpi 31747
+SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512 enigmail-zh-CN-0.9x.xpi 31747
+MD5 60a10c483711c4db0ca8a768fa9c6e4b mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
+RMD160 d827aecf75158bc0a4dd23149caba7d79bc4e57b mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
+SHA256 bfcaa6b4992993dc6323a3d4a102eef673c8cef99d2b1a6498049d26ae59edbe mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
+MD5 b633623c460ffef9ba805dd071729890 thunderbird-2.0b2-source.tar.bz2 37092627
+RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 thunderbird-2.0b2-source.tar.bz2 37092627
+SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16 thunderbird-2.0b2-source.tar.bz2 37092627