[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/

[anarchy@gentoo.org]

commit:     3dd4c9d2a3d6b11f7532e8eb88d4397b3481a01f
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 06:04:50 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 06:04:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3dd4c9d2a3d6b11f7532e8eb88d4397b3481a01f

remove wanring to rebuild enigmail from portage, block on installed
enigmail

---
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index f135ed8..b8837ff 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -59,4 +59,4 @@ DIST thunderbird-3.1.7-zh-TW.xpi 220637 RMD160 0b4268075f3e625f0f3a1ebc87605fd54
 DIST thunderbird-3.1.7.source.tar.bz2 65948060 RMD160 c5e25004565decf1467a9b452139c0aedec4299e SHA1 c2d6cdedfe399c1ab41c00045e4fce835cc0b36f SHA256 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662
 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
 EBUILD thunderbird-3.1.7-r2.ebuild 7831 RMD160 4619228769a31891bf0ae3b002045f18f1f3bc44 SHA1 faefa67d3b1d223383ce0fc9328f523e663e7071 SHA256 b5ef015484c4d67a77e5c9b2a6c7f1a5ee4fd61b97a586dd07c735314185483f
-EBUILD thunderbird-3.3_alpha2.ebuild 9018 RMD160 406e3ac74ca2d0797931f97365d02c4579742787 SHA1 2632b1798136df348b149ebf5e446cc8e9df5a2b SHA256 5564b4be84365808158ef9675f08c9dc081d16e5f7d21ee575699432f792afa4
+EBUILD thunderbird-3.3_alpha2.ebuild 8896 RMD160 66a6e71349213860c8a5401f5665943f83fc3293 SHA1 e35f5e1ffa67ef5f8c880f4734dab75d080dba1c SHA256 035b692e860929ebb14a3d7c0742aeca2d47713834a9ae4b405d67b9877afa2b

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index f3fd549..72c045e 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
@@ -59,6 +59,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] )
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning
+	!x11-plugins/enigmail
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
 			|| (
@@ -278,9 +279,6 @@ src_install() {
 
 	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
 
-	# Warn user that remerging enigmail is neccessary on USE=crypt
-	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}."
-
 	# Enable very specific settings for thunderbird-3
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
 		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \