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

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

commit:     8eab8cf4fd337fdcaf12c764a8c11cddc78c0490
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 01:12:43 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 01:12:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=8eab8cf4

add minimal useflag to control sdk install

---
 mail-client/thunderbird/Manifest                |    2 +-
 mail-client/thunderbird/thunderbird-10.0.ebuild |    7 ++++++-
 www-client/firefox/Manifest                     |    2 +-
 www-client/firefox/firefox-10.0.ebuild          |    7 ++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 8fae316..6461b72 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -57,4 +57,4 @@ DIST thunderbird-10.0-zh-CN.xpi 431229 RMD160 ff491c003702b77587c9c29403219ad47c
 DIST thunderbird-10.0-zh-TW.xpi 431822 RMD160 bded27fe855ad1e4cf1d12486e1f7d51f8f1f7bd SHA1 df1171db0cd7265071eba70983ad95fdb18cd375 SHA256 fa9011c615d20cf8337e9fbd0dbfd5ee668cbf76d8f797d353b3c5cde8d9d032
 DIST thunderbird-10.0.source.tar.bz2 97700962 RMD160 cd3acaf16e38fe4a1f04badedb50db1cdb51c29e SHA1 4765446295a20cc3b4d73a7bc244d19011136581 SHA256 ea5d3df1227f0c344224eeaf4b24c12391425b9746515e784875edd6863ebcfd
 DIST thunderbird-9.0-patches-0.1.tar.xz 696 RMD160 986ad69f21f6eddf46b73258b0a2aa8eb85fb9c4 SHA1 62dd6e724e2e3a1b76eaed3d165e2e9f47385f8a SHA256 64028e8ca37e1259ed196dfe6e8a87cd08153047f80639ca36cfd276eaa9aaea
-EBUILD thunderbird-10.0.ebuild 8382 RMD160 f874949be7eb519b86accb912300820e4e7e36cb SHA1 04058164ed4420f84f5947d4c624733b1266a82d SHA256 2dcb66e8a451ba3705510699d7ee1ff98604d06427b81a13cf2afa2081154e3f
+EBUILD thunderbird-10.0.ebuild 8544 RMD160 3d0f8553edf05dd44d5cd0c5c56dc8658da6e175 SHA1 3c2b548a7ca8cae21738c2ba8c4a50312a047231 SHA256 14278d0e8e9a741b4e2fdd44933783aaf0f87580b3ebeb00045aeaf21a8ea2b0

diff --git a/mail-client/thunderbird/thunderbird-10.0.ebuild b/mail-client/thunderbird/thunderbird-10.0.ebuild
index d7b49f3..cbe1f48 100644
--- a/mail-client/thunderbird/thunderbird-10.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
+IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
 
 PATCH="thunderbird-9.0-patches-0.1"
 PATCHFF="firefox-${PV}-patches-0.5"
@@ -267,6 +267,11 @@ src_install() {
 		die "failed to cp thunderbird-gentoo-default-prefs.js"
 
 	share_plugins_dir
+
+	if use minimal; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
 }
 
 pkg_postinst() {

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 06f0215..11e0465 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -86,4 +86,4 @@ DIST firefox-10.0-zh-CN.xpi 256543 RMD160 d8f1c6554c9cdb1a59752e675044db1bad377b
 DIST firefox-10.0-zh-TW.xpi 257487 RMD160 899ab1ff8b090dc595e6757dcbbb24c93b8057d5 SHA1 d54f419ebf680711d49bda3b279f4eadcbf03db2 SHA256 31cd7b3369ce5bf31676ab7a9fedf5f7612f843c7a96c7467197abe7ccc384cd
 DIST firefox-10.0-zu.xpi 246390 RMD160 bc01dbc63d760a66cb888a14edce6e592fbc5059 SHA1 7ec656dd3369ef2ac9084cc0e3d57785942eac80 SHA256 9ff09a88ea8780162f3bec509a64ed1f79eaf84d581a50fdc8dac2a15374dd48
 DIST firefox-10.0.source.tar.bz2 75538360 RMD160 5ebd640a4ce858c4c3c88dc5a8c2981d60016853 SHA1 cbf1fb0efe0a3a2b2dafaa324b136736e93de70c SHA256 b7392508c75ee5f326168883f696ea5ba6ae6ad57926588889e46648e5cfedb1
-EBUILD firefox-10.0.ebuild 10175 RMD160 34cd984706121fd635f87259c44c92d2839c8d03 SHA1 49a0833bdea971f1c9b5e1cda7d9ef2e7a334a83 SHA256 6f5cf70cd6314cfe86b41c8b4f2166261a11552b9922c3f6a37f7b899ce789fb
+EBUILD firefox-10.0.ebuild 10337 RMD160 ea108dabb7ec39c87293f29edd4d3f0ca630ebca SHA1 2b89615bf794fa17323ee89c12b6d5dc27a63ee0 SHA256 356626a16d0f85722d833fcfd9b277031f89750ca8c8de0d886a9301e60b639f

diff --git a/www-client/firefox/firefox-10.0.ebuild b/www-client/firefox/firefox-10.0.ebuild
index 9a2d0f5..8d86577 100644
--- a/www-client/firefox/firefox-10.0.ebuild
+++ b/www-client/firefox/firefox-10.0.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm"
+IUSE="bindist +crashreporter +ipc +minimal pgo system-sqlite +webm"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -309,6 +309,11 @@ src_install() {
 	# Plugins dir
 	share_plugins_dir
 
+	if use minimal; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+
 	# very ugly hack to make firefox not sigbus on sparc
 	# FIXME: is this still needed??
 	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \