[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, eclass/, net-libs/xulrunner/

[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, eclass/, net-libs/xulrunner/

[Jory Pratt]

commit:     df7d4c4fe568fa10ad4feb3c3673bc91cb7ca265
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 03:36:04 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 03:36:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=df7d4c4f

enable crashreporter by default

---
 eclass/mozconfig-3.eclass                          |   16 +++++++++-------
 eclass/mozcoreconf-2.eclass                        |    8 ++++----
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |    2 +-
 net-libs/xulrunner/Manifest                        |    2 +-
 net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild |    2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 308fef1..f40bdef 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -7,7 +7,7 @@
 inherit multilib flag-o-matic mozcoreconf-2
 
 # use-flags common among all mozilla ebuilds
-IUSE="+alsa gnome +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
+IUSE="+alsa +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
 
 RDEPEND="app-arch/zip
 	app-arch/unzip
@@ -23,7 +23,7 @@ RDEPEND="app-arch/zip
 	virtual/jpeg
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( >=dev-libs/dbus-glib-0.72 )
-	gnome? ( libnotify? ( >=x11-libs/libnotify-0.4 ) )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
 	webm? ( media-libs/libvpx 
@@ -45,6 +45,9 @@ mozconfig_config() {
 
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
+	if has crashreporter ${IUSE} ; then
+		mozconfig_use_enable crashreporter
+	fi
 	mozconfig_use_enable dbus
 	mozconfig_use_enable debug
 	mozconfig_use_enable debug tests
@@ -85,12 +88,11 @@ mozconfig_config() {
 	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --disable-gnomevfs
-	mozconfig_annotate '' --enable-gio
-	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
 	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
 	mozconfig_annotate '' --enable-oji --enable-mathml
 	mozconfig_annotate 'broken' --disable-mochitest
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	mozconfig_annotate '' --enable-gio
 }

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
index 634b7d0..624117c 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -80,11 +80,11 @@ moz_pkgsetup() {
 
 mozconfig_init() {
 	declare enable_optimize pango_version myext x
-	declare XUL=$([[ ${PN} == *xulrunner ]] && echo true || echo false)
-	declare FF=$([[ ${PN} == *firefox ]] && echo true || echo false)
-	declare IC=$([[ ${PN} == *icecat ]] && echo true || echo false)
+	declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
+	declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
+	declare IC=$([[ ${PN} == icecat ]] && echo true || echo false)
 	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
-	declare TB=$([[ ${PN} == *thunderbird ]] && echo true || echo false)
+	declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
 	declare EM=$([[ ${PN} == enigmail ]] && echo true || echo false)
 
 

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 7cb8071..21ea340 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 7719 RMD160 7f093bcf2776b379331b6f748af336b7c39324f1 SHA1 3c4180d8ac64e0452ebae2bd5b234aa4026d8dc0 SHA256 8d648259dba4f5c4d596879d4e2ad95216b1b08919980653b31557f93a2881de
+EBUILD thunderbird-3.3_alpha2.ebuild 7734 RMD160 dc4b2e4643f4ca4b343ac5cdc05f7379daef5198 SHA1 52c9c057fd6496fe1be39e13f39d6eafdadeb959 SHA256 50c5e9b5c6e40095636db62a67b1aa2a6f57262e48e1d03d00e25ec55e1ead77

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index 007d463..252cb9a 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="bindist +crypt +lightning mozdom"
+IUSE="bindist +crashreporter +crypt +lightning mozdom"
 #PATCH="${PN}-3.1-patches-1.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 22e7171..473ac64 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,4 @@
 AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
 DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256 e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9
-EBUILD xulrunner-2.0_beta13_pre.ebuild 5387 RMD160 f23018d13f275b9722dcebe436c77d2d7521a61b SHA1 d2b300454388c1d2c3a16442b36de50fa1f2d1c2 SHA256 ddac6f714b23ee07c0293d7046492ced3bac0f3989a6209ece7c3f2a68d244da
+EBUILD xulrunner-2.0_beta13_pre.ebuild 5401 RMD160 1386e988bd63c5694ed937a0055a5fe0bc7360f5 SHA1 9521cc1287599c94a3d17b2d8a3bf5c4a56b5e4f SHA256 eb83048137a24f50572cddc46e1082aacdb5b6918b2813d804148b054f7a8236

diff --git a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
index 431aea1..782d89c 100644
--- a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
+IUSE="+crashreporter"
 
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"