[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     73f2623973084ff7c0073faecc23e4fbc9064525
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 00:11:06 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 00:11:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=73f26239

change handling of bindist useflag

---
 eclass/mozconfig-3.eclass                          |    5 +++--
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |    2 +-
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-4.0_beta13_pre.ebuild   |    4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 5705b0a..308fef1 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -6,7 +6,8 @@
 
 inherit multilib flag-o-matic mozcoreconf-2
 
-IUSE="+alsa bindist gnome +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
+# use-flags common among all mozilla ebuilds
+IUSE="+alsa gnome +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
 
 RDEPEND="app-arch/zip
 	app-arch/unzip
@@ -38,7 +39,7 @@ mozconfig_config() {
 	    mozconfig_annotate -thebes --enable-default-toolkit=gtk2
 	fi
 
-	if [[ ${PN} = firefox || ${PN} = thunderbird ]]; then
+	if has bindist ${IUSE}; then
 		mozconfig_use_enable !bindist official-branding
 	fi
 

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 09df85d..c768344 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -58,4 +58,4 @@ DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f0824
 DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
 EBUILD thunderbird-3.1.9.ebuild 6843 RMD160 3cc4f7fcf528f1abd648f470039be917380af07e SHA1 be50da72ee4fae3e8684bedfee171368fc5ad6cf SHA256 a8f7adaef9d42b024c3eb31d08c3f0ae9e4ac4cc8d157253f86f7a3c6ff96a74
-EBUILD thunderbird-3.3_alpha2.ebuild 7866 RMD160 107cde4ce5d701ea1730876fafcd2ee37612ae14 SHA1 e2b51c8ba265085dbd34a44ff8c773f333e064d5 SHA256 98a0ca9cc2292a9d20637c9473ae4b2cefce17b378b63fff6fcf0357d0ece4a7
+EBUILD thunderbird-3.3_alpha2.ebuild 7874 RMD160 74a1aa7afbbc54d15f1b9ab155fb9247355c1e3a SHA1 929a852cda852c8ec66038deef0c4b6d3fd20aa8 SHA256 49682a6b6a96c65dbe81bd88075fdf52cd15805cfe394ec117286a715b0b62a4

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index 3e0ff66..585b54d 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+crypt +lightning mozdom"
+IUSE="bindist +crypt +lightning mozdom"
 #PATCH="${PN}-3.1-patches-1.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b835eb9..e7e8f5e 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,4 +3,4 @@ AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438
 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
 DIST firefox-4.0-patches-0.7.tar.bz2 4101 RMD160 6e006b1a047c1b750b7deb7449651b4bc30173e0 SHA1 9e47ce491edb9d12d9384949a73ea92377601542 SHA256 9fa9d0b407a084d7f0f9887d054263404626eda46dc560ccd5ffd5d8c91fa707
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
-EBUILD firefox-4.0_beta13_pre.ebuild 7432 RMD160 5cdfcfa204472b2f7b3bb91296ef4bb673a3bef2 SHA1 285564c4b2f1bbe77f0da874a57b4f02185fce7d SHA256 5fef389418cf8f01292bd5a8751c040ec0820d19c265e041754f5419aec16736
+EBUILD firefox-4.0_beta13_pre.ebuild 7439 RMD160 87dee6ef092d47a3e59d0d650ebc418265b34509 SHA1 e1d1e352becc63c72e056975a28c4aec55c03627 SHA256 ebb149ce660aab7918d9cc9b33e98fe960de7c118ecbf343dc6ea332d9e5a7fa

diff --git a/www-client/firefox/firefox-4.0_beta13_pre.ebuild b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
index 805f9d4..328690e 100644
--- a/www-client/firefox/firefox-4.0_beta13_pre.ebuild
+++ b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
+IUSE="bindist"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...