Move extensions configuration to mozilla.eclass. Use edit_makefiles to reduce compilation RAM requirements

3 files changed, 27 insertions, 20 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 7aa14de77248..1d7a896148ae 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.26 2004/08/08 19:01:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.27 2004/08/08 19:09:25 agriffis Exp $
+
+  08 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  mozilla-thunderbird-0.7.3.ebuild:
+  Move extensions configuration to mozilla.eclass. Use edit_makefiles to reduce
+  compilation RAM requirements
 
   08 Aug 2004; <agriffis@gentoo.org> mozilla-thunderbird-0.7.3.ebuild:
   stable on ia64
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index ee2e6acd3e49..9009b9f5f130 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,23 +1,23 @@
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 8daac2215ecf846fb2e9f8caf1b5fc19 ChangeLog 1239
-MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
-MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
-MD5 4127932a257caa6696ff576486cc92c9 mozilla-thunderbird-0.7.3.ebuild 4818
-MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
 MD5 581fe6cf90a85277fa118f7461b82612 mozilla-thunderbird-0.6-r2.ebuild 8561
+MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
 MD5 b4f35fd5c0f308d527d81ec8c6446a1e mozilla-thunderbird-0.7.1.ebuild 8937
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
+MD5 8f3d3f04bbfff3264c29a548b04d2e54 mozilla-thunderbird-0.7.3.ebuild 4877
+MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
+MD5 9a770aa97ec8c9eb7904f2d533dc12b3 ChangeLog 1437
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 b8e2d94130909e157cb9797c7bad7807 files/digest-mozilla-thunderbird-0.7.1-r1 207
-MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3 207
 MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
-MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
-MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
 MD5 6efbd38338dcc7e43d21b85ae1990422 files/digest-mozilla-thunderbird-0.7.1 207
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3 207
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
index 0b158523f106..417a1964e09e 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild,v 1.6 2004/08/08 19:01:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild,v 1.7 2004/08/08 19:09:25 agriffis Exp $
 
 IUSE="crypt gtk2"
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic gcc eutils nsplugins mozilla mozilla-launcher
+inherit flag-o-matic gcc eutils nsplugins mozilla mozilla-launcher makeedit
 
 EMVER="0.85.0"
 IPCVER="1.0.7"
@@ -28,7 +28,6 @@ S=${WORKDIR}/mozilla
 # Would do in pkg_setup but that loses the export attribute, they
 # become pure shell variables.
 export MOZ_THUNDERBIRD=1
-export MOZ_ENABLE_XFT=1
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
@@ -65,8 +64,7 @@ src_compile() {
 	mozilla_conf
 
 	myconf="${myconf} \
-		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-		--enable-extensions=wallet,spellcheck"
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird"
 
 	####################################
 	#
@@ -76,6 +74,10 @@ src_compile() {
 
 	econf ${myconf} || die
 
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
 	emake MOZ_THUNDERBIRD=1 || die
 
 	# Build the enigmail plugin