added xulrunner-1.9.0.9 and mips bus error patch

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

6 files changed, 19 insertions, 531 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 6ee203a..a1ad03c 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,16 +1,10 @@
 AUX xulrunner-1.9.0.5-gcc4.4.patch 1893 RMD160 8510bc33a55a1d3580439ed510e4705c3e217e57 SHA1 fcc5577e290e20bfa6bfa052a343dc5fad774250 SHA256 c21cc87796f0f1c3ec0f82e2e907b5a12c800a77d3a909f0d293879df1a23f05
+AUX xulrunner-mips-bus-error.patch 349 RMD160 7f41ad31da0b1964b43f694a96cc7a9e2c97998b SHA1 deb3cb873b7fc0d6cbadb743503fb3926d2e90ce SHA256 1e76e4a737987460fac134902536d9de0f31931e7c7cbcd57433ad888fd597df
 AUX xulrunner-mips-n32.patch 24738 RMD160 f00e1e41e8095e802d04aa30c3317b73f9a7f161 SHA1 aca45cffe563b36a2aa0447c1260b900a59d7de0 SHA256 caf7e7eceb00fb99f6c5b55b397540c4039cd3cd744e0cd6d7fa2d5dbc71624e
 AUX xulrunner-mips-o32.patch 17604 RMD160 5f1b38ccf24cf449b277a831e1284df7bd298fe9 SHA1 03391ff70005f480d616ab020f952f9a8f5f698c SHA256 13b1b3e8762040d648d8f9149ec76439d37b7e7e33bb95ba069788155ce98d41
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
-DIST xulrunner-1.9.0.5-patches-0.1.tar.bz2 6659 RMD160 6b77cd5f96e9b7c1eab7abd1d781853c425db6e2 SHA1 5b6d7e87a08dd779daf685a0516d149f4f83a071 SHA256 94c38808d4722fb5fe480af80cd88e4095a52fa82ffb6f0ea550f5decc780b4a
-DIST xulrunner-1.9.0.5.tar.bz2 34098825 RMD160 7bb4b42c9277ed1d16ebf40eac1e480664f999bf SHA1 f980f54d4ce5dd1e763eb41f9379c4e9729c066b SHA256 7d8c1f6338402fff99936d67b38fca21ce2099a7c9fdb0be91fdd3adbaf8742f
-DIST xulrunner-1.9.0.6.tar.bz2 34126711 RMD160 048b81087cabab371e04a5225597f2729fcc936a SHA1 d026d7d97a457e0f5695e72f322da7b11db63ff2 SHA256 c87065893bdab5d29e99e7f7312a4c5578c8c870210d0a35a1224054db11e00e
-DIST xulrunner-1.9.0.7-patches-0.1.tar.bz2 6826 RMD160 c5e50ec025356e9e84cb9ef43842bcb9ff6356cf SHA1 e1204a52b7e1fe4ed36133ec307d16926afd90ef SHA256 aa989f6be0468b041482fd99de8f7195f437f2529827f429f7dd907e4675f4c7
-DIST xulrunner-1.9.0.7.tar.bz2 34142409 RMD160 d94fe15798b8ec451049e86084b115de3ee615c6 SHA1 786b11fe080462a6cb105ef786f522686b8a9f69 SHA256 cafc49e2bc682d16402d68ec7c5241841cf6583277e28c7ee6bf4e57cabf6472
-DIST xulrunner-1.9.0.8.tar.bz2 34169400 RMD160 5b04b74bedfe6cdc023248b6b8e7b8a1a72499a2 SHA1 99adcd31779105778d03b2cfdbe59fb1d3607f7e SHA256 ac1dad103922f8c11f4f88174f21acd841e5a7fcb40ac9702707b59f0a287960
-EBUILD xulrunner-1.9.0.5.ebuild 5229 RMD160 95cd54f6b86249f40e0a6a728c852ee87819f6fd SHA1 798ad09a30da96e948d5fbdc8a48cdae54890338 SHA256 ee2669f66f7776c3014dfa146b9a133b8fc44a26edeaa3203c86df2331a8ea6b
-EBUILD xulrunner-1.9.0.6-r1.ebuild 5233 RMD160 18ec8b7e0bca9767da175776fa3978d67432aba6 SHA1 c9cdd681854f143b61b88596aa877c4e6e4a8e6d SHA256 811984464f69a8f7c47e02ba521baab45b0a1a83d10ce052af2ff000ceb34f2f
-EBUILD xulrunner-1.9.0.7.ebuild 5231 RMD160 293bd0adef8edf5e809d4c779ca963af5b915f67 SHA1 5c0d7baecf90df6acc0adc4b2c47d5f95f0579ba SHA256 f9d0ac970b298a8d1a9b07a0ac1dc7bdddc34285461a1121afc386021af8763c
-EBUILD xulrunner-1.9.0.8.ebuild 5223 RMD160 8fbe799707c506c9ccba4d37131082dc0596100a SHA1 bdcfe5eea77b54dbd7c641b642d2ab8d84960f89 SHA256 33917f9139ecf35b5d27669e22215bf5dabc09312ad1342e5b6b9f819eadf79a
+DIST xulrunner-1.9.0.9-patches-0.1.tar.bz2 7072 RMD160 36b8fd973da54f396adc276b7f0864c0bc5c0a73 SHA1 63f68e771136c1b048d87fc510370df3d60d24f9 SHA256 198dd2bceab568e21bc0b853e314edd07cf964833e4401ab9d15f2c60dc31425
+DIST xulrunner-1.9.0.9.tar.bz2 34147943 RMD160 977711d628752098d7a3ad6b48b5d4e42100bb33 SHA1 05531747889a2529eec1e87986e870c51007a21b SHA256 251a960faa180ff46c97570c45bb8d895215b66fa21406561a0280232252dae8
+EBUILD xulrunner-1.9.0.9.ebuild 5271 RMD160 aece7043e7bfa32cc1b14c706c3173ae8ec017b4 SHA1 11c6a491a1326e19aeb16cb313421320316751c2 SHA256 6cf7fd3394812606b423becce9450396f2336610ab350ec3e398c108ce098540
 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/files/xulrunner-mips-bus-error.patch b/net-libs/xulrunner/files/xulrunner-mips-bus-error.patch
new file mode 100644
index 0000000..d9a4304
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-mips-bus-error.patch
@@ -0,0 +1,10 @@
+--- xpcom/glue/nsTArray.h.orig	2009-04-26 01:21:58.000000000 +0800
++++ xpcom/glue/nsTArray.h	2009-04-26 01:21:33.000000000 +0800
+@@ -168,6 +168,7 @@
+ 
+     // The array's elements (prefixed with a Header).  This pointer is never
+     // null.  If the array is empty, then this will point to sEmptyHdr.
++    void   *padding;
+     Header *mHdr;
+ };
+ 
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild
deleted file mode 100644
index 59880f1..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild,v 1.12 2008/12/31 03:40:00 mr_bones_ Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-PATCH="${P}-patches-0.1"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 -sparc x86"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="java debug"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12
-	>=dev-libs/nspr-4.7.1
-	>=app-text/hunspell-1.1.9
-	>=media-libs/lcms-1.17"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export MOZ_CO_PROJECT=xulrunner
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "Cairo is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
-		die "Cairo needs X"
-	fi
-
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "Pango is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge pango."
-		die "Pango needs X"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Apply our patches
-	cd "${S}" || die "cd failed"
-	epatch ${FILESDIR}/xulrunner-mips-o32.patch
-	epatch ${FILESDIR}/xulrunner-mips-n32.patch
-	epatch ${FILESDIR}/xulrunner-1.9.0.5-gcc4.4.patch
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/patch
-
-	eautoreconf || die "failed  running eautoreconf"
-
-	# We need to re-patch this because autoreconf overwrites it
-	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-#	if use python; then
-#		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
-#	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	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 '' --enable-safe-browsing
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	use debug && mozconfig_annotate '' --enable-debug
-
-	#disable java
-	if ! use java ; then
-		mozconfig_annotate '-java' --disable-javaxpcom
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use amd64 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector -fstack-protector-all
-		fi
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		"${S}"/config/autoconf.mk \
-		"${S}"/toolkit/content/buildconfig.html
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	dodir /usr/bin
-	dosym ${MOZILLA_FIVE_HOME}/xulrunner /usr/bin/xulrunner-1.9
-
-	# Add vendor
-	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-
-	if use java ; then
-	    java-pkg_dojar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-	    rm -f "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-	fi
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.7.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.7.ebuild
deleted file mode 100644
index 591328d..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.0.7.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.7.ebuild,v 1.1 2009/03/05 17:13:59 armin76 Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-PATCH="${PN}-1.9.0.5-patches-0.1"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.2
-	>=dev-libs/nspr-4.7.3
-	>=app-text/hunspell-1.1.9
-	>=media-libs/lcms-1.17"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export MOZ_CO_PROJECT=xulrunner
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "Cairo is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
-		die "Cairo needs X"
-	fi
-
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "Pango is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge pango."
-		die "Pango needs X"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Apply our patches
-	cd "${S}" || die "cd failed"
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/patch
-	epatch "${FILESDIR}"/${PN}-mips-o32.patch
-	epatch "${FILESDIR}"/${PN}-mips-n32.patch
-	epatch "${FILESDIR}"/${PN}-1.9.0.5-gcc4.4.patch
-
-	eautoreconf || die "failed  running eautoreconf"
-
-	# We need to re-patch this because autoreconf overwrites it
-	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-#	if use python; then
-#		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
-#	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	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 '' --enable-safe-browsing
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	#disable java
-	if ! use java ; then
-		mozconfig_annotate '-java' --disable-javaxpcom
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		"${S}"/config/autoconf.mk \
-		"${S}"/toolkit/content/buildconfig.html
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	dodir /usr/bin
-	dosym ${MOZILLA_FIVE_HOME}/xulrunner /usr/bin/xulrunner-1.9
-
-	# Add vendor
-	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-
-	if use java ; then
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaGlue.jar
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaInterfaces.jar
-	fi
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.8.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.8.ebuild
deleted file mode 100644
index f32bb08..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.0.8.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.8.ebuild,v 1.6 2009/03/30 15:06:29 armin76 Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-PATCH="${PN}-1.9.0.7-patches-0.1"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 -sparc x86"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.2
-	>=dev-libs/nspr-4.7.3
-	>=app-text/hunspell-1.1.9
-	>=media-libs/lcms-1.17"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export MOZ_CO_PROJECT=xulrunner
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "Cairo is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
-		die "Cairo needs X"
-	fi
-
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "Pango is not built with X useflag."
-		eerror "Please add 'X' to your USE flags, and re-emerge pango."
-		die "Pango needs X"
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Apply our patches
-	cd "${S}" || die "cd failed"
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/patch
-	epatch "${FILESDIR}"/${PN}-mips-o32.patch
-	epatch "${FILESDIR}"/${PN}-mips-n32.patch
-	epatch "${FILESDIR}"/${PN}-1.9.0.5-gcc4.4.patch
-
-	eautoreconf || die "failed  running eautoreconf"
-
-	# We need to re-patch this because autoreconf overwrites it
-	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-#	if use python; then
-#		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
-#	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	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 '' --enable-safe-browsing
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	#disable java
-	if ! use java ; then
-		mozconfig_annotate '-java' --disable-javaxpcom
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		"${S}"/config/autoconf.mk \
-		"${S}"/toolkit/content/buildconfig.html
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	dodir /usr/bin
-	dosym ${MOZILLA_FIVE_HOME}/xulrunner /usr/bin/xulrunner-1.9
-
-	# Add vendor
-	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-
-	if use java ; then
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaGlue.jar
-	    java-pkg_regjar "${D}"${MOZILLA_FIVE_HOME}/sdk/lib/MozillaInterfaces.jar
-	fi
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.6-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.9.ebuild
index e35d71a..5525fd3 100644
--- a/net-libs/xulrunner/xulrunner-1.9.0.6-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.0.9.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.6-r1.ebuild,v 1.1 2009/02/05 19:50:32 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.9.ebuild,v 1.1 2009/04/22 18:03:32 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-PATCH="${PN}-1.9.0.5-patches-0.1"
+PATCH="${P}-patches-0.1"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${PATCH}.tar.bz2
 	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE=""
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.2
-	>=dev-libs/nspr-4.7.3
+	>=dev-libs/nspr-4.7.4
 	>=app-text/hunspell-1.1.9
 	>=media-libs/lcms-1.17"
 
@@ -65,6 +65,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-mips-o32.patch
 	epatch "${FILESDIR}"/${PN}-mips-n32.patch
 	epatch "${FILESDIR}"/${PN}-1.9.0.5-gcc4.4.patch
+	epatch "${FILESDIR}"/${PN}-mips-bus-error.patch
 
 	eautoreconf || die "failed  running eautoreconf"