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

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

[Nirbheek Chauhan]

commit:     947d06de9ddaf7e19fb97674d05fd00d82bce345
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 06:55:28 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 06:55:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=947d06de

Move over all the changes I made today from the tree

---
 mail-client/thunderbird-bin/Manifest               |    2 +-
 .../thunderbird-bin/thunderbird-bin-9.0.1.ebuild   |    1 +
 mail-client/thunderbird/Manifest                   |    2 +-
 mail-client/thunderbird/thunderbird-9.0.ebuild     |    7 ++++++-
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-10.0_beta6.ebuild       |    3 +--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index c391688..bc4decf 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -54,5 +54,5 @@ DIST thunderbird-9.0.1-zh-CN.xpi 426798 RMD160 d6cc996f801e93e8c1ebcd15477686e84
 DIST thunderbird-9.0.1-zh-TW.xpi 427201 RMD160 d3a47ee5b8283839b57bea335ae96a7f478d9122 SHA1 fa5fa533f16cf69be45493e885a7b8cd7521c370 SHA256 34dba557c5821410526bb910770bb8f9b22508a16bdcd4f729fd94dde6815924
 DIST thunderbird-bin_i686-9.0.1.tar.bz2 18995445 RMD160 46370c2e124fa71671a1374867a0835358313571 SHA1 ea6da4d1b46978cb13367cb66dc64123b0a1201d SHA256 9cc7a222ccf764696308cfe7a043af401cba322ee4f2a1a5897df128f12b9b5a
 DIST thunderbird-bin_x86_64-9.0.1.tar.bz2 22025281 RMD160 74ad4c1acf68aedb91e0e3be6fba80360a5c2558 SHA1 0e18402491a4c112fec633c6427db4a4b5ef9ec5 SHA256 536ab6fbdad0ff3bde2c9406b718888c3128f8def8d8d8c1f395a44611d849e8
-EBUILD thunderbird-bin-9.0.1.ebuild 2789 RMD160 e1bf9b10e891324807ea816984631d1a0e7e263f SHA1 1cf415456a98043b700e38b44062efbf7324aa3e SHA256 ec387770a0c7d973e99e8f5792ee5b7c33627129c79f78de08ca62b3aaf04cb8
+EBUILD thunderbird-bin-9.0.1.ebuild 2819 RMD160 5492e09d337837a62dad19ccd131916572aa2db2 SHA1 80c357917e47122cdd5f0a93e7f76a279e08317e SHA256 7e7bfa8a62ce068a795bfe9f419e1253d03f3860842e54a5fe66a5eeeb3f9567
 MISC metadata.xml 239 RMD160 1ae864a1acabe6bbce1c44a39d0ea55e04ccfaa7 SHA1 2760f4017fb87bfec958b0472cd86151bb3c3ab3 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0

diff --git a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
index 088b1ab..9b44b51 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXmu
 	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
 	crashreporter? ( net-misc/curl ) "
 
 S="${WORKDIR}/${MOZ_PN}"

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6d3888f..85d1519 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -56,4 +56,4 @@ DIST thunderbird-9.0-vi.xpi 429543 RMD160 8705ee88da51d9bd92fe063ac948aa875fc72d
 DIST thunderbird-9.0-zh-CN.xpi 426797 RMD160 13da2b2fe191b792546e274611ad1fc3d5cec351 SHA1 4f90b87183e41c71400d955a0eb6bfceebb61ca0 SHA256 7bc4f2a2cb338f57969630e0a1abd7b05360a66934170d52d383a69d877d45e7
 DIST thunderbird-9.0-zh-TW.xpi 427199 RMD160 28db91466f45b6c3395186cef32cd7ae3c921ed1 SHA1 7503c57eae25a435bef5bfec71ddb9561e12ceb3 SHA256 3f321e139f9f52eb1df044b4ef2c2cf35193a24e9ed2f3eafea905b7cfaeb959
 DIST thunderbird-9.0.source.tar.bz2 96194907 RMD160 12899236ee7106b32f8e1343c566396fc4980c85 SHA1 16fda096809d2eaf069458553ceb370f512337b3 SHA256 6f6c40b1c1e3c3cbf3de4dbd9465a5383b0596cb9a97ba8eee7daaade52aa40c
-EBUILD thunderbird-9.0.ebuild 8468 RMD160 047cdb23e949dcc19f6de5a3400e256f21b8a45b SHA1 d676cab261e8b1b6d889d11e6f38aec5b13079e7 SHA256 ad3a7560dcc0165e6715b62b74f150593062102c94b9053b4d98faa987e8dfbc
+EBUILD thunderbird-9.0.ebuild 8583 RMD160 38e1c6905c22da1b1a7e1ee309ff292e1176e81c SHA1 0bd6fef2e669d3f1cfe4fb836cf9e9b338ea2b63 SHA256 4e2334f51a5e4794f40aa22a200e0c7c4c3fc0a27fa64c7bfb58e19481109b9e

diff --git a/mail-client/thunderbird/thunderbird-9.0.ebuild b/mail-client/thunderbird/thunderbird-9.0.ebuild
index a174d9b..02977d2 100644
--- a/mail-client/thunderbird/thunderbird-9.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-9.0.ebuild
@@ -39,6 +39,8 @@ SRC_URI="${SRC_URI}
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
 
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
 RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.13.1
 	>=dev-libs/nspr-4.8.8
@@ -64,7 +66,10 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 		=app-crypt/gnupg-1.4*
 	) )"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
 
 S="${WORKDIR}"/comm-release
 

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 175994f..5fe5ea0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -2,4 +2,4 @@ AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260e
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-10.0-patches-0.2.tar.xz 7788 RMD160 94950ce48340fd774c9e2d742d633da8820396bc SHA1 f4d48aa446bc5d52bd8686fb8235591f68db0d88 SHA256 81a3bda55f8f15f2e985ff34c94b2e64ee09e5b019f523325762a122ebbeaa39
 DIST firefox-10.0b6.source.tar.bz2 75442266 RMD160 c841efc74a23f6c3317bf75bbc22940a1adf8d9c SHA1 90d207968ac4224d22406ce59b823612638d9791 SHA256 3fc5d2d598acbfec7eab1411bdd9b1442514b33e0b32f66c1e58370c99496693
-EBUILD firefox-10.0_beta6.ebuild 10001 RMD160 8984330cdf1c59cd5c4676dd839e6600636f1a09 SHA1 6b6560dd1f44b2da9fbe150a2e051287936b6847 SHA256 17e13f65fc6a0b7fbe3a6844cf284efc98365abe590b4cc374c640d268ced005
+EBUILD firefox-10.0_beta6.ebuild 9986 RMD160 2a885d245422d475ff5b51df8a4335b07c17d984 SHA1 d1136ea03d1ae74f5bbd80b7b3960575e4706ab4 SHA256 e44d0b85fb23c093d2d388532125c74bf7afc4bbdff9bf3277137cc453458a94

diff --git a/www-client/firefox/firefox-10.0_beta6.ebuild b/www-client/firefox/firefox-10.0_beta6.ebuild
index 73143e4..e23b21c 100644
--- a/www-client/firefox/firefox-10.0_beta6.ebuild
+++ b/www-client/firefox/firefox-10.0_beta6.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=media-libs/mesa-7.10
 	media-libs/libpng[apng]
 	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
 	webm? ( >=media-libs/libvpx-0.9.7
 		media-libs/alsa-lib )
 	crashreporter? ( net-misc/curl )"
@@ -88,7 +88,6 @@ pkg_setup() {
 		SESSION_MANAGER \
 		XDG_SESSION_COOKIE \
 		XAUTHORITY
-	gnome2_environment_reset
 
 	if ! use bindist; then
 		einfo