stability bump

(Portage version: 2.1.7.16/cvs/Linux x86_64)

2 files changed, 268 insertions, 1 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index f14c8869d340..ea08cb14240c 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.285 2010/01/02 18:29:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.286 2010/01/08 02:58:41 anarchy Exp $
+
+*xulrunner-1.9.1.7 (08 Jan 2010)
+
+  08 Jan 2010; <anarchy@gentoo.org> +xulrunner-1.9.1.7.ebuild:
+  Update for stability issues
 
   02 Jan 2010; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9.1.6.ebuild:
   alpha/arm/ia64/sparc stable
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.7.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.7.ebuild
new file mode 100644
index 000000000000..7eda354b0195
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.1.7.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2010 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.7.ebuild,v 1.1 2010/01/08 02:58:41 anarchy 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.7/3.5.7}"
+MAJ_PV="1.9.1" # from mozilla-* branch name
+PATCH="${PN}-1.9.1.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="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
+	http://dev.gentoo.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="+alsa debug python sqlite" # 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 )
+	>=dev-lang/python-2.3[threads]
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.3
+	>=dev-libs/nspr-4.8
+	sqlite? ( >=dev-db/sqlite-3.6.20-r1[fts3] )
+	alsa? ( media-libs/alsa-lib )
+	>=app-text/hunspell-1.2
+	>=media-libs/lcms-1.17
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]
+	x11-libs/libXt"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/mozilla-${MAJ_PV}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
+	if use sqlite ; then
+		elog "You are enabling system sqlite. Do not file a bug with gentoo if you have"
+		elog "issues that arise from enabling system sqlite. All bugs will be considered"
+		elog "invalid. All patches are welcomed to fix any issues that might be found with"
+		elog "system sqlite. If you are starting with a fresh profile you can enable sqlite"
+		elog "without any major issues."
+		epause 10
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_EXCLUDE="136-fix_ftbfs_with_cairo_fb.patch" \
+	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 -i -e "s:@PV@:${MAJ_PV}:" "${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 || die "sed failed!"
+	fi
+
+	eautoreconf
+
+	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
+	cd "${S}"
+	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
+}
+
+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 '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-system-lcms
+	mozconfig_annotate '' --with-system-bz2
+
+	if use sqlite ; then
+		mozconfig_annotate 'sqlite' --enable-system-sqlite
+	else
+		mozconfig_annotate '-sqlite' --disable-system-sqlite
+	fi
+
+	# 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/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
+	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-flags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+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}" || die
+
+	# Install python modules
+	dosym "${MOZLIBDIR}/python/xpcom" "/$(python_get_sitedir)/xpcom" || die
+
+	# 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 "failed to cp xulrunner-default-prefs.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() {
+
+	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 through and enable the basics."
+
+	einfo
+	ewarn "Please remember to rebuild your browser(s) after update to prevent an xpcom error."
+	ewarn "This bump is needed in order to bring icecat to the tree to replace iceweasel useflag."
+}
+
+pkg_postrm() {
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+
+	if use python ; then
+		python_mod_cleanup "${MOZLIBDIR}/python"
+	fi
+}