bug fixes, proxy commit for mozilla team.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 71 insertions, 479 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index ed790dcee32b..ec9c043f368e 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.226 2009/08/01 00:38:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.227 2009/08/02 18:48:04 darkside Exp $
+
+*xulrunner-1.9.1.1-r2 (02 Aug 2009)
+
+  02 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/000_flex-configure-LANG.patch, -xulrunner-1.9.1-r1.ebuild,
+  -xulrunner-1.9.1.1.ebuild, -xulrunner-1.9.1.1-r1.ebuild,
+  +xulrunner-1.9.1.1-r2.ebuild:
+  bug fixes, proxy commit for mozilla team.
 
 *xulrunner-1.9.1.1-r1 (01 Aug 2009)
 
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 475c4ab8922e..01c092eca72c 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,4 @@
+AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
@@ -10,14 +11,11 @@ DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea6608
 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2
 DIST xulrunner-1.9.0.12-patches-0.1.tar.bz2 6548 RMD160 135cf202dd34c2dce5624d1585f17a71511d4f07 SHA1 8324eb60eb596973dcb5b708e3fc3260badc6a42 SHA256 c74569a54da3b95e1dac45041c9b31deb6ba6bd4b0b0c66bb87f7ab7e7d0574a
 DIST xulrunner-1.9.0.12.tar.bz2 34331369 RMD160 b3e37ef065c5ca1e5d565b90c6a71f4896610afe SHA1 50536925b1c58ffebaa79e1536979f3191cc1095 SHA256 797d705266444d6097e63b40f3ef32d2f1d43e11fb4fdff804402509a5a6931d
-DIST xulrunner-1.9.1-patches-0.2.tar.bz2 6489 RMD160 2515a20cbee831d070f6d60f04f09841fb34554f SHA1 d3a7d3dc6e230c478511fe9a4217966fde679a30 SHA256 84d997e226935012664574c5fa7d8730e3675d5d6c8e4c9dc08b2f90e4994ae0
 DIST xulrunner-1.9.1.1-patches-0.2.tar.bz2 8802 RMD160 3cf98265b06df75d55b60218ac3298ab0b624616 SHA1 e71d36c70badb542d9519a77e4fff78f9177f661 SHA256 5596db20453d628de98ff0d2cffa2643ec75e0fe7bbecb410c28089bcd7126bc
 EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c3d293 SHA1 af67a48b3c7690d996aef1caf0ce71a4bab1d4d6 SHA256 cbef00c1ae6f23becdad8b9754ed7d4a034a152e17e87334ac4f7dce483dc385
 EBUILD xulrunner-1.9.0.10.ebuild 4704 RMD160 4c9c1bd079a72df2da35ce654d42b4a8ef230a3f SHA1 59758a181a9b94fce9cf7b5f6fa11af77d56b2c1 SHA256 c88b9f9a01e10ecae1fb072c320771384f56f772e9c6cce8cf7e89b438aae7df
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
 EBUILD xulrunner-1.9.0.12.ebuild 4824 RMD160 6e4d98d2c292a68127819340f2756167ea4411a7 SHA1 a43a4f7d8c2664c01f1edeca689bd3dfd2f9fa29 SHA256 260e1f5bb66b2cc796d89d983ec6be78f6beba626ab0384c5e3c9871f5ace69f
-EBUILD xulrunner-1.9.1-r1.ebuild 6546 RMD160 0e921100a62e192a3bf1f532a66fc8281b9d867c SHA1 1413406be60c1a4a668ee4a96dee8db425b0600c SHA256 cfa8a752ef9c842402fd73be21673f7194b88751f549b0193ab0517388c9811e
-EBUILD xulrunner-1.9.1.1-r1.ebuild 7090 RMD160 1e4004ecb1429e23ccb52ad28abbe6949e05df6f SHA1 5c133e9524c8ff370dc56cb69e0fb6f4576bcc35 SHA256 df3ef1a5f9d2a36cbfe1f0cb5750e4122d521ba71dcedf64572278cba54f5744
-EBUILD xulrunner-1.9.1.1.ebuild 7087 RMD160 ff0478b602410a9cb135aea6ea9d4f3aebb37ce4 SHA1 ddeddef74f5b3d6194781ff300afd88b62f3b57c SHA256 c7cbe2a7dd9ad58b5659e9910657d651e63bb0783941716a5daf84458d194e6e
-MISC ChangeLog 29876 RMD160 bc3c431b28a21394a64366e22a46eb98c0769fb9 SHA1 9539d207b266a7840480693bd3ba62f18aa789a9 SHA256 3c639ad653970c7c7de497b7a3b6b7a1e02f1f5f2810248726a8b2cd56229e0c
+EBUILD xulrunner-1.9.1.1-r2.ebuild 7504 RMD160 6a929d5e3f4cd39c38d6548270760d8f5573e43e SHA1 ec1be2ce579400f5a45076b3608b3931559cb9f1 SHA256 8b36b19c4ac8bee5b89ceb4a53fc4d115ceefe72c75e080f7538440e08aaa080
+MISC ChangeLog 30167 RMD160 9b3cabfb81db4a789f6dfc180fc1f41798c2a056 SHA1 1ee20c762d49674cd390a6c3d9f280dfd4a040d6 SHA256 9f92e1c4b120a0af47131daeb824d475ac0418e9ab19e88dad46332b0a25b866
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/000_flex-configure-LANG.patch b/net-libs/xulrunner/files/000_flex-configure-LANG.patch
new file mode 100644
index 000000000000..6d32a8537508
--- /dev/null
+++ b/net-libs/xulrunner/files/000_flex-configure-LANG.patch
@@ -0,0 +1,41 @@
+The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
+option parsing, it may break.
+
+http://bugs.gentoo.org/103483
+
+--- configure~	2009-07-31 20:07:25.087663220 -0500
++++ configure	2009-07-31 20:07:37.987684452 -0500
+@@ -468,6 +468,16 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -856,16 +866,6 @@
+   esac
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+-
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild
deleted file mode 100644
index ca9a4ee62f5c..000000000000
--- a/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,226 +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.1-r1.ebuild,v 1.2 2009/07/31 15:02:26 arfrever Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-
-MY_PV="${PV/_beta/b}" # Handle betas
-MY_PV="${PV/_/}" # Handle rc1, rc2 etc
-MY_PV="${MY_PV/1.9.1/3.5.1}"
-MAJ_PV="${PV/_*/}"
-PATCH="${PN}-${MAJ_PV}-patches-0.2"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/${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="debug python" # qt-experimental
-
-#	qt-experimental? (
-#		x11-libs/qt-gui
-#		x11-libs/qt-core )
-
-# nspr-4.8 due to BMO #499144
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.3 )
-
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.3
-	>=dev-libs/nspr-4.8
-	media-libs/alsa-lib
-	>=dev-db/sqlite-3.6.7
-	>=app-text/hunspell-1.2
-	>=media-libs/lcms-1.17
-
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Same as in config/autoconf.mk.in
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-	# Gentoo install dirs
-	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
-		|| die "\${MAJ_PV} sed failed!"
-
-	# Enable gnomebreakpad
-	if use debug; then
-		sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
-			"${S}/build/unix/run-mozilla.sh"
-	fi
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	####################################
-	#
-	# 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 '' --enable-application=xulrunner
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	# 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
-	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-experimental
-#	if use qt-experimental; 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-experimental' --enable-default-toolkit=cairo-qt
-#	else
-		mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-#	fi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
-
-	#disable java
-	if ! use java ; then
-		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
-
-	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	dodir /usr/bin
-	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}"
-
-	# Install python modules
-	dosym "${MOZLIBDIR}/python/xpcom" "/$(python_get_sitedir)/xpcom"
-
-	# env.d file for ld search path
-	dodir /etc/env.d
-	echo "LDPATH=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed"
-
-	# Add vendor
-	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-		>> "${D}/${MOZLIBDIR}/defaults/pref/vendor.js"
-
-	if use java ; then
-		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"
-		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaGlue.jar"
-		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaInterfaces.jar"
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize "${MOZLIBDIR}/python"
-	fi
-
-	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
-	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
-	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup "${MOZLIBDIR}/python"
-	fi
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.1-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.1-r2.ebuild
index 6a3c84e5a97c..bd204312c2a3 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1-r1.ebuild,v 1.1 2009/08/01 00:38:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1-r2.ebuild,v 1.1 2009/08/02 18:48:04 darkside Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -21,7 +21,7 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="debug python" # qt-experimental
+IUSE="debug python +alsa" # qt-experimental
 
 #	qt-experimental? (
 #		x11-libs/qt-gui
@@ -29,16 +29,14 @@ IUSE="debug python" # qt-experimental
 
 # nspr-4.8 due to BMO #499144
 RDEPEND="java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.3 )
-
+	python? ( >=dev-lang/python-2.3[threads] )
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.3
 	>=dev-libs/nspr-4.8
-	media-libs/alsa-lib
+	alsa? ( media-libs/alsa-lib )
 	>=dev-db/sqlite-3.6.7
 	>=app-text/hunspell-1.2
 	>=media-libs/lcms-1.17
-
 	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/pango[X]"
 
@@ -67,6 +65,7 @@ src_prepare() {
 	# Same as in config/autoconf.mk.in
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
 	# Gentoo install dirs
 	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
 		|| die "\${MAJ_PV} sed failed!"
@@ -81,6 +80,10 @@ src_prepare() {
 
 	cd js/src
 	eautoreconf
+
+	# Patch in support to reset all LANG variables to C
+	# Do NOT add to patchset as it must be applied after eautoreconf
+	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
 }
 
 src_configure() {
@@ -145,6 +148,10 @@ src_configure() {
 	mozconfig_annotate '' --enable-xpctools
 	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
 
+	# Disable/Enable audio support based on USE
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+
 	#disable java
 	if ! use java ; then
 		mozconfig_annotate '-java' --disable-javaxpcom
@@ -171,6 +178,9 @@ src_configure() {
 	#
 	####################################
 
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
 	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	econf || die
@@ -202,7 +212,8 @@ src_install() {
 	echo "LDPATH=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed"
 
 	# Add our defaults to xulrunner and out of firefox
-	cp "${FILESDIR}"/xulrunner-default-prefs.js	"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "cp failed"
+	cp "${FILESDIR}"/xulrunner-default-prefs.js \
+		"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "failed to cp xulrunner-default-prefs.js"
 
 	if use java ; then
 		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
deleted file mode 100644
index 29153c8a8cf1..000000000000
--- a/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
+++ /dev/null
@@ -1,240 +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.1.1.ebuild,v 1.3 2009/08/01 00:31:41 darkside Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-
-MY_PV="${PV/_beta/b}" # Handle betas
-MY_PV="${PV/_/}" # Handle rc1, rc2 etc
-MY_PV="${MY_PV/1.9.1.1/3.5.1}"
-MAJ_PV="${PV/_*/}"
-PATCH="${PN}-${MAJ_PV}-patches-0.2"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	http://dev.gentooexperimental.org/~anarchy/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="debug python" # qt-experimental
-
-#	qt-experimental? (
-#		x11-libs/qt-gui
-#		x11-libs/qt-core )
-
-# nspr-4.8 due to BMO #499144
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.3 )
-
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.3
-	>=dev-libs/nspr-4.8
-	media-libs/alsa-lib
-	>=dev-db/sqlite-3.6.7
-	>=app-text/hunspell-1.2
-	>=media-libs/lcms-1.17
-
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla-1.9.1"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Same as in config/autoconf.mk.in
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-	# Gentoo install dirs
-	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
-		|| die "\${MAJ_PV} sed failed!"
-
-	# Enable gnomebreakpad
-	if use debug; then
-		sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
-			"${S}/build/unix/run-mozilla.sh"
-	fi
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-	if use python; then
-		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
-	fi
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=xulrunner
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	# 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
-	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-experimental
-#	if use qt-experimental; 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-experimental' --enable-default-toolkit=cairo-qt
-#	else
-		mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-#	fi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
-
-	#disable java
-	if ! use java ; then
-		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
-
-	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
-	dodir /usr/bin
-	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}"
-
-	# Install python modules
-	dosym "${MOZLIBDIR}/python/xpcom" "/$(python_get_sitedir)/xpcom"
-
-	# env.d file for ld search path
-	dodir /etc/env.d
-	echo "LDPATH=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed"
-
-	# Add our defaults to xulrunner and out of firefox
-	cp "${FILESDIR}"/xulrunner-default-prefs.js	"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "cp failed"
-
-	if use java ; then
-		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"
-		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaGlue.jar"
-		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaInterfaces.jar"
-	fi
-}
-
-pkg_postinst() {
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize "${MOZLIBDIR}/python"
-	fi
-
-	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
-	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
-	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
-	einfo
-	einfo "All prefs can be overridden by the user. The preferences are to make"
-	einfo "use of xulrunner out of the box on an average system without the user"
-	einfo "having to go threw and enable the basics."
-}
-
-pkg_postrm() {
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
-	if use python; then
-		python_mod_cleanup "${MOZLIBDIR}/python"
-	fi
-}