Bump xulrunner from mozilla overlay (same release, new patch tarball and ebuild changes by Anarchy)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 251 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 845894de2a95..e9859b6efac5 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # 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.222 2009/07/22 17:45:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.223 2009/07/31 14:22:01 nirbheek Exp $
+
+*xulrunner-1.9.1.1 (31 Jul 2009)
+
+  31 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +xulrunner-1.9.1.1.ebuild:
+  Bump xulrunner from mozilla overlay (same release, new patch tarball and
+  ebuild changes by Anarchy)
 
 *xulrunner-1.9.0.12 (22 Jul 2009)
 
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index f0e4162f0ed2..79b6f5776611 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -10,10 +10,12 @@ DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d6979
 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 6560 RMD160 fbe1531ef8b5d708a223aafe997698a2d2f05ccf SHA1 e2ef18545deacc69c882e61a65e918bc672909b4 SHA256 3c668cec862f878e21745d9ce6a2745e0a4475ed52e625f7ae469873ed7fd2d1
-MISC ChangeLog 29047 RMD160 b6fc1de09348bee3655f3115f4f48b9a29e9471f SHA1 6a81ae0d97fd60bfeeed93d6fd6fb1402155516c SHA256 4057f2f17bbeb007dd9f937e15d64c46eab0d7c735988431caae9fbcb5db8e84
+EBUILD xulrunner-1.9.1.1.ebuild 7082 RMD160 2bab351408db017a958e437c76729f2f5423c99d SHA1 1aa4fa109e1dd2c2f612fd9af8461678fd7dc579 SHA256 4970f5937c32b39e6a6bde1fabacdf560c51ca071f174099c035f5d413602319
+MISC ChangeLog 29270 RMD160 8eeb17420757ceb1a67fd9a586cbb557463d2631 SHA1 05f56f94505efdb26a705bdafcc27e457f59938c SHA256 e15e1472fcb6915d877b3896f29642fe368b03b3b3df133059d3b386e8188d8c
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
new file mode 100644
index 000000000000..85e16c79cc95
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild
@@ -0,0 +1,240 @@
+# 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.1 2009/07/31 14:22:01 nirbheek 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" "${ROOT}/usr/bin/xulrunner-${MAJ_PV}"
+
+	# Install python modules
+	dosym "${MOZLIBDIR}/python/xpcom" "${ROOT}/$(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"
+
+	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
+}