Version bump

Package-Manager: portage-2.1.4.4

3 files changed, 165 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 74dbaddc231e..1a1587579e42 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.110 2008/05/21 10:49:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.111 2008/06/05 14:01:54 armin76 Exp $
+
+*xulrunner-1.9_rc2 (05 Jun 2008)
+
+  05 Jun 2008; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.9_rc2.ebuild:
+  Version bump
 
   21 May 2008; Raúl Porcel <armin76@gentoo.org>
   -xulrunner-1.9_beta5-r1.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 0fc393cb0118..a0a59736c814 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -5,8 +5,10 @@ DIST xulrunner-1.8.1.13-patches-0.1.tar.bz2 61868 RMD160 99ae55b9a05904dd59bc700
 DIST xulrunner-1.8.1.14-source.tar.bz2 35394629 RMD160 1fe5ef106d4ada9c407f1571b8d308328dde815f SHA1 27ffc473514c2138e31a67c31a62dc0a23dbc133 SHA256 c04f0fad82fa3fdb9f24e0d3b0444f472ed2f706d86224a70213ac3cab80d661
 DIST xulrunner-1.9_rc1-patches-0.1.tar.bz2 5230 RMD160 18901efad18d420224a98897c68144b35ec13ef7 SHA1 4343a1b4323eec2ceffcf59ca4e41060b58eb69e SHA256 777634f6673bfb7219a651a090aa0888c0b3ce07e5f6be930ab065d2541d27ee
 DIST xulrunner-1.9_rc1.tar.bz2 34121215 RMD160 f255e6ce3362f8a62ca0e39a57fc57b2e48b7515 SHA1 3ec4a0601970bc35cf4508120b05f2aea60f91ea SHA256 1879aec636a0b6683cc21b1f19c1dfe695246ce195585d0bf7ef2d56cb8284f1
+DIST xulrunner-1.9_rc2.tar.bz2 34123193 RMD160 2cfc5986171aca4b83745b272eb7fb5808ace567 SHA1 912596b687542673c71aed685f3bb6e318d38baf SHA256 9ea7d306cc9d354e9fef07890d681e34465d4db3dc4ee8a48c8c308e182cc65e
 EBUILD xulrunner-1.8.1.11.ebuild 4858 RMD160 17de41e45e8b18be49bcbdc12d70ff06ced7ce60 SHA1 0e12768437e8dca58af17cc0330e003bca575e76 SHA256 d8fc4b0b29beecbd73135ed4d51bed81476dde139eb604e1a20fe3725dc453ab
 EBUILD xulrunner-1.8.1.14.ebuild 4839 RMD160 9d67ad5284e8c79fa5a1a6caf410da914daf9eba SHA1 8e16b5cbd7f9958968a5961ff188753ddf0f4f68 SHA256 0ac4923db88b52fccabb7684f98bca6c63f6364215eed867a1659b2c010e6ee8
 EBUILD xulrunner-1.9_rc1.ebuild 4837 RMD160 d332237b30684492d3f82c4dd293ea30bfd67662 SHA1 7eb6b9b780aaf542a2258a46aff9a1823c3bb270 SHA256 c3706ae9c3a777aab18ecca5f47a4cba681a10fa18f75e8f3ce75af4a8d72c75
-MISC ChangeLog 13592 RMD160 57164d65afa33e0967b6a52bb6f488df30348d88 SHA1 5b54eb8fab9d17ad653ee20fbfa9a8eaf6e04484 SHA256 f2296409fff4e49dc17b9fd00c6269c682c16b93a5c14d20c367554529190559
+EBUILD xulrunner-1.9_rc2.ebuild 4846 RMD160 d3db087ec534713afb47d37683dab83b7d35cd43 SHA1 9936a37db6acd362a5413fe5d39da150cbdd1282 SHA256 443c6e901b1a0da9804a56a5b977f825d31009897e447fbed73a822c276f5abb
+MISC ChangeLog 13718 RMD160 2c15330a3168c0cc12d079fe09d5e9efe3a0ea4d SHA1 b499b0b67394dfd123b66e9bec201ef06c535a28 SHA256 9cb7c092c943252382c6227b187b0a985952d053d02c6ccb5b340e5135c0b141
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/net-libs/xulrunner/xulrunner-1.9_rc2.ebuild b/net-libs/xulrunner/xulrunner-1.9_rc2.ebuild
new file mode 100644
index 000000000000..1a50e09a6cf3
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9_rc2.ebuild
@@ -0,0 +1,156 @@
+# 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_rc2.ebuild,v 1.1 2008/06/05 14:01:54 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_rc1-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
+	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=""
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12_rc4
+	>=dev-libs/nspr-4.7.1
+	>=app-text/hunspell-1.1.9
+	>=media-libs/lcms-1.17
+	>=dev-db/sqlite-3.5.6"
+
+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
+
+src_unpack() {
+	unpack ${A}
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	eautoreconf || die "failed  running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	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
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-xpctools
+	mozconfig_annotate '' --disable-libxul
+	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
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+	filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  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
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	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
+
+	X_DATE=`date +%Y%m%d`
+
+	# Add Gentoo package version to preferences - copied from debian rules
+	echo // Gentoo package version \
+		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.product\",\"Gecko\");" \
+		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.productSub\",\"${X_DATE}\");" \
+		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.productComment\",\"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
+}