Adding back since icecat-3.5.6 depends upon this version

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 279 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 8a271fe58fd8..6bf9df460f0f 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
 # 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.298 2010/03/04 14:36:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.299 2010/03/04 18:23:04 halcy0n Exp $
+
+  04 Mar 2010; Mark Loeser <halcy0n@gentoo.org> +xulrunner-1.9.1.6.ebuild:
+  Adding back since icecat-3.5.6 depends upon this version
 
   04 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   -xulrunner-1.9.1.6.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index ff52688ab5b6..1b445a0fba9e 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 301-xulrunner-xpctools.diff 550 RMD160 12d370d5473de5c54233a70533cd35e37305ef86 SHA1 e3812ce6a4446b0b9d496a9dd4760d03bf0de449 SHA256 6bf510f7df5a41f47501cbdbcffc46d0c04865e3597dc6a575cd4a9cfae1def4
@@ -7,6 +10,7 @@ AUX xulrunner-1.9.2-fix-pkgconfig-file.patch 397 RMD160 f1724e2476d21751e5984582
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
+DIST firefox-3.5.6.source.tar.bz2 46914620 RMD160 1002ff196eb8e281c06ef451154b64a903104664 SHA1 fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4 SHA256 60462020c1935702cf87928a886778b3b52e73b0121a8264630b72d370ea3fd1
 DIST firefox-3.5.8.source.tar.bz2 46954234 RMD160 97a4394d895fc0d8e7be34c090ebe75540108a90 SHA1 4bfb9a274113fb9ee590c00da69d995dc500d4cc SHA256 9b9b9b0f6e783fd4184a2f08264a3470de4cbf1c41cf9cf887a8373d220bb4db
 DIST firefox-3.6.source.tar.bz2 48206915 RMD160 4b44951e4281e57e391c98b4b9e2774ded91d4a2 SHA1 33226b45a0bcd795545a980cab475c5492f0ea69 SHA256 8d4f12fff7bc361d83e6b486f9ec4264c60114ed86c805e1221b3d30efec0a4b
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
@@ -20,8 +24,16 @@ DIST xulrunner-1.9.2-patches-0.4.tar.bz2 5742 RMD160 d67504884a5959704d8cb2cfa7f
 EBUILD xulrunner-1.8.1.19.ebuild 5164 RMD160 35f73e1a6e27b86f3e94e3000a6d5e197f5eff9b SHA1 0874e166bb9f80c0032bb79c881f8d281be9931d SHA256 53ef65858659ae8843234751632f2a806b73aec3a34cc846e9a42f175e4a6a2b
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4789 RMD160 9b685ad897cb07e281d9afef45f55dd19411ab6c SHA1 d2dd0af1f255f677af64dfaa139df237f7b4686c SHA256 2f65999d4351f7758eb8f7eb0e592c352363f00f527bbac4e8d5e74a5e3afa00
 EBUILD xulrunner-1.9.0.14.ebuild 4938 RMD160 90dab4447b3470cca3da354555665fe4b8b2f4fa SHA1 0c7a70964acad5a9a59e379199914a4f440fc979 SHA256 5927ce6c646f4bc73edef6d404a8c253d59af276ee6ca8050181f059289a4d70
+EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 b3bca093dcb0ae36a7d493cb2990d7fe519a6a0f SHA1 9acb71f4171a6bc79c5e62732e085342ac77f7c5 SHA256 a59d74e0e3594f387d707b26277dc819d713c27d0d813024ba636fffa9aa7cff
 EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12aad05 SHA1 5fb4b96ba83ef678ac01faa354d4b67b53149dbd SHA256 d2d1768a7ecf76e310cfec673961605fe9c36c836dc50242541b3a46e3fc2938
 EBUILD xulrunner-1.9.2-r2.ebuild 6738 RMD160 4a6d098f106050565296297af4f35b1933ec607e SHA1 2a6a61568fdcce7401076f5fce929642fff5c5fe SHA256 99bf8fb24f7ceae9bacf046f84c6b7ac207bc074ba60286a40a82e0b24c44528
 EBUILD xulrunner-1.9.2-r4.ebuild 6756 RMD160 1ca5973990667d0ed4ff6526299bf464d8ef2934 SHA1 76a1804e16762778689664b7745245fa7ebbfa27 SHA256 bf0570c5d952a522d5b3545cd6afd68232a77f4c0e8378374be8225dbef2c048
-MISC ChangeLog 40214 RMD160 85e9e26b2ad6a1688cd42090fcd5e9e4daf04ce7 SHA1 6857a98bc20f4063c75a5fe0e13385af00de5fdf SHA256 49ba2196b724a961f98dc8cebb65662608e1bbc4147c2fa5a1b5262c17afedd2
+MISC ChangeLog 40348 RMD160 59ca0aac37e237f16501d13d52aaecd56b2b54e3 SHA1 b5bc574902d3818f5dc8c69cfac994dfeef0f9e9 SHA256 b2711b94402b0c1e85b771420a1bec80d25fd4548c58d0e6482bb47ee45514da
 MISC metadata.xml 394 RMD160 87c4429eed631c2727f7d3372f664d39db20be7f SHA1 30b52729cbc65b0d0f683c576d3e9f8865d9e893 SHA256 c0acfe25d1d0e91b0df61729e61ce47fb8f97ec02a4eb94ca21fd48fda20102e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuP+pQACgkQCRZPokWLroRwEACgkuamPieLzWpMHTSfRKj8LaC3
+OnkAoKFEXl4upn6RYFFYMQfGilMbJt4S
+=oyqQ
+-----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.6.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.6.ebuild
new file mode 100644
index 000000000000..fde8648c76c1
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.1.6.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.6.ebuild,v 1.9 2010/03/04 18:23:04 halcy0n 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.6/3.5.6}"
+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
+}