From 48a6d7151cac13fb08603e359e9cfb9daf8569bf Mon Sep 17 00:00:00 2001
From: Zhang Le <r0bertz@gentoo.org>
Date: Sun, 7 Jun 2009 00:17:09 +0800
Subject: bump xulrunner to xulrunner-1.9.1_beta4-r2

Signed-off-by: Zhang Le <r0bertz@gentoo.org>
---
 net-libs/xulrunner/Manifest                        |   2 +-
 net-libs/xulrunner/xulrunner-1.9.1_beta4-r1.ebuild | 185 ------------------
 net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild | 215 +++++++++++++++++++++
 3 files changed, 216 insertions(+), 186 deletions(-)
 delete mode 100644 net-libs/xulrunner/xulrunner-1.9.1_beta4-r1.ebuild
 create mode 100644 net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild

(limited to 'net-libs/xulrunner')

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-r1.ebuild
deleted file mode 100644
index c818246..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.1_beta4-r1.ebuild
+++ /dev/null
@@ -1,185 +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.1.ebuild,v 1.4 2008/07/30 10:42:58 armin76 Exp $
-EAPI="2"
-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"
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/1.9.1/3.5}"
-MAJ_PV="${PV/_*/}"
-
-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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="python"
-
-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.7.4
-	media-libs/alsa-lib
-	>=dev-db/sqlite-3.6.7
-	>=app-text/hunspell-1.2
-	>=media-libs/lcms-1.17
-	x11-libs/cairo[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 "${FILESDIR}/${PV}"
-	epatch "${FILESDIR}"/${PN}-1.9.1-gcc4.4.patch
-	if use mips; then
-		epatch "${FILESDIR}"/${PN}-mips-n32.patch
-		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"
-	# Gentoo install dirs
-	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
-		|| die "\${MAJ_PV} sed failed!"
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-
-
-	# We need to re-patch this because autoreconf overwrites it
-#	epatch "${FILESDIR}"/patch/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
-
-	# 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-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
-	mozconfig_annotate '' --disable-installer
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-xpctools
-	mozconfig_annotate '' --with-default-mozilla-five-home="${INSTALLDIR}"
-
-	#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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}"/usr/bin/xulrunner
-
-	dodir /usr/bin
-	dosym "${INSTALLDIR}/xulrunner" "${ROOT}/usr/bin/xulrunner-${MAJ_PV}"
-
-	# Add vendor
-	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-		>> "${D}/${INSTALLDIR}/defaults/pref/vendor.js"
-
-	if use java ; then
-		java-pkg_regjar "${D}/${INSTALLDIR}/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 "${INSTALLDIR}/python"
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup "${INSTALLDIR}/python"
-	fi
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild b/net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild
new file mode 100644
index 0000000..425b50b
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.1_beta4-r2.ebuild
@@ -0,0 +1,215 @@
+# 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.1.ebuild,v 1.4 2008/07/30 10:42:58 armin76 Exp $
+EAPI="2"
+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"
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/1.9.1/3.5}"
+MAJ_PV="${PV/_*/}"
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+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
+	media-libs/alsa-lib
+	>=dev-db/sqlite-3.6.7
+	>=app-text/hunspell-1.2
+	>=media-libs/lcms-1.17
+
+	x11-libs/cairo[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 "${FILESDIR}/${PV}"
+	epatch "${FILESDIR}"/${PN}-1.9.1-gcc4.4.patch
+	if use mips; then
+		epatch "${FILESDIR}"/${PN}-mips-n32.patch
+		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"
+	# Gentoo install dirs
+	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
+		|| die "\${MAJ_PV} sed failed!"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+
+
+	# We need to re-patch this because autoreconf overwrites it
+#	epatch "${FILESDIR}"/patch/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
+
+	# 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
+	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
+	mozconfig_annotate '' --enable-xpctools
+	mozconfig_annotate '' --with-default-mozilla-five-home="${INSTALLDIR}"
+
+	#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 "${INSTALLDIR}/xulrunner" "${ROOT}/usr/bin/xulrunner-${MAJ_PV}"
+
+	# Add vendor
+	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
+		>> "${D}/${INSTALLDIR}/defaults/pref/vendor.js"
+
+	if use java ; then
+		java-pkg_regjar "${D}/${INSTALLDIR}/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 "${INSTALLDIR}/python"
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup "${INSTALLDIR}/python"
+	fi
+}
-- 
cgit v1.2.3-65-gdbad