bump xulrunner to xulrunner-1.9.1_beta4-r2

Signed-off-by: Zhang Le <r0bertz@gentoo.org>

2 files changed, 42 insertions, 12 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index bead861..f7d64a7 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -17,6 +17,6 @@ DIST firefox-3.5b4-source.tar.bz2 45782023 RMD160 d28d545f533f0f3b6b7e6e09813768
 DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8318afe192e435e42 SHA1 8a48e53951216c330d4908def93a5c0201f5a890 SHA256 bc0c0d26258bc17ffa5cd513089fe94395ff8f6c17023cd363fac30cdd675410
 DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea660870a8c096 SHA1 926d9042557e2d767db91b1d183327713fb090d3 SHA256 fe4091f4de50278567b4e26effea66a998dd41f455077e1e37cff8b3417a8f34
 EBUILD xulrunner-1.9.0.10.ebuild 4924 RMD160 812e4fb1216d76dd84c1041365001bb9291cb448 SHA1 1843a099e8dbf0475cc37ebd41c6e477165579db SHA256 d0fc674b97a2cf9d2a499ec5d7b915c570ca4e88873882c7cc4157500415d59e
-EBUILD xulrunner-1.9.1_beta4-r1.ebuild 5331 RMD160 0f6d8dfda3dc2f9823ef3e1aed4253e9718f2a70 SHA1 20a9011f98325713849afb93cbe03b6ccc85ae0a SHA256 b2dbe4fea199223e86e7db89f6fef1b802655d605dea36b226041c1495ddf0a4
+EBUILD xulrunner-1.9.1_beta4-r2.ebuild 6046 RMD160 804916b8d318df6654e26253ac62fb443c85e7d1 SHA1 f6cd4eb980b32bfb3d28de03ac0311ee029b5b67 SHA256 c217cd68a3e3c5e25ce5c3177750f8f86921fae75dab0855b260f3cb92bb604e
 MISC ChangeLog 20231 RMD160 53d013acdc632eee5a57c68cc91590a9d97d322b SHA1 50a8a72f61cdf952923a6c40d3ddbdafa10682fc SHA256 4dc8981ad9cda5b06ff6f5e7b826a01d32082c6a306879ee1e3923a8aa93a449
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/xulrunner-1.9.1_beta4-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild
index c818246..425b50b 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1_beta4-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild
@@ -18,10 +18,14 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="python"
+IUSE="debug qt python"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	python? ( >=dev-lang/python-2.3 )
+	qt? (
+		x11-libs/qt-gui
+		x11-libs/qt-core )
+
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.3
 	>=dev-libs/nspr-4.7.4
@@ -29,6 +33,7 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 	>=dev-db/sqlite-3.6.7
 	>=app-text/hunspell-1.2
 	>=media-libs/lcms-1.17
+
 	x11-libs/cairo[X]
 	x11-libs/pango[X]"
 
@@ -59,6 +64,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-mips-bus-error.patch
 	fi
 
+
 	# Same as in config/autoconf.mk.in
 	INSTALLDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
@@ -97,24 +103,40 @@ src_configure() {
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --enable-application=xulrunner
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-mochitest
 	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --enable-system-sqlite
 	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
-	#mozconfig_annotate '' --enable-js-binary
-	mozconfig_annotate '' --enable-embedding-tests
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --enable-system-lcms
-	mozconfig_annotate '' --with-system-bz2
 	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
 	# regardless of java setting.
 	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
+
+	# System-wide install specs
 	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --enable-system-sqlite
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-system-lcms
+	mozconfig_annotate '' --with-system-bz2
+
+	# IUSE qt
+	if use qt; then
+		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
+		ewarn "Usage is at your own risk"
+		ewarn "Known to be broken. DO NOT file bugs."
+		mozconfig_annotate '' --disable-system-cairo
+		mozconfig_annotate 'qt' --enable-default-toolkit=cairo-qt
+	else
+		mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	fi
 
 	# Other ff-specific settings
 	mozconfig_annotate '' --enable-jsd
@@ -126,6 +148,14 @@ src_configure() {
 		mozconfig_annotate '-java' --disable-javaxpcom
 	fi
 
+	# Debug
+	if use debug; then
+		mozconfig_annotate 'debug' --disable-optimize
+		mozconfig_annotate 'debug' --enable-debug=-ggdb
+		mozconfig_annotate 'debug' --enable-debug-modules=all
+		mozconfig_annotate 'debug' --enable-debugger-info-modules
+	fi
+
 	# Finalize and report settings
 	mozconfig_final