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

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

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

Do not force -j1 for building

---
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |    4 +---
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-4.0_beta13_pre.ebuild   |    6 ------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index c768344..7cb8071 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 7874 RMD160 74a1aa7afbbc54d15f1b9ab155fb9247355c1e3a SHA1 929a852cda852c8ec66038deef0c4b6d3fd20aa8 SHA256 49682a6b6a96c65dbe81bd88075fdf52cd15805cfe394ec117286a715b0b62a4
+EBUILD thunderbird-3.3_alpha2.ebuild 7719 RMD160 7f093bcf2776b379331b6f748af336b7c39324f1 SHA1 3c4180d8ac64e0452ebae2bd5b234aa4026d8dc0 SHA256 8d648259dba4f5c4d596879d4e2ad95216b1b08919980653b31557f93a2881de

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index 585b54d..007d463 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
@@ -194,9 +194,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
+	emake || die
 
 	# Only build enigmail extension if crypt enabled.
 	if use crypt ; then

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index e7e8f5e..3a9ce0b 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 7439 RMD160 87dee6ef092d47a3e59d0d650ebc418265b34509 SHA1 e1d1e352becc63c72e056975a28c4aec55c03627 SHA256 ebb149ce660aab7918d9cc9b33e98fe960de7c118ecbf343dc6ea332d9e5a7fa
+EBUILD firefox-4.0_beta13_pre.ebuild 7251 RMD160 583afac44c2b7b279f5d34d44a5ddfc54388f35b SHA1 c59e4cf50f27b7ed61ed5bdb1fd705f2c81ae821 SHA256 240cf9cb0b385405cc6cb03c045293ee602091a3e1f33c5a75b4f8a2e67b3585

diff --git a/www-client/firefox/firefox-4.0_beta13_pre.ebuild b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
index 328690e..1187a27 100644
--- a/www-client/firefox/firefox-4.0_beta13_pre.ebuild
+++ b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
@@ -188,12 +188,6 @@ src_configure() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
 }
 
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-}
-
 src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"