Move over the latest revision from the overlay. USE=system-sqlite is used for toggling usage of internal/external sqlite + minor ebuild changes

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 284 insertions, 13 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 9c9d1e9d2f20..cf83621678dc 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.600 2010/03/02 20:20:37 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.601 2010/03/04 14:33:50 nirbheek Exp $
+
+*mozilla-firefox-3.6-r4 (04 Mar 2010)
+
+  04 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +mozilla-firefox-3.6-r4.ebuild, metadata.xml:
+  Move over the latest revision from the overlay. USE=system-sqlite is used
+  for toggling usage of internal/external sqlite + minor ebuild changes
 
   02 Mar 2010; Tobias Heinlein <keytoaster@gentoo.org>
   mozilla-firefox-3.5.8.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 4ea31f5314b4..fa4fff7c042e 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
@@ -287,12 +284,6 @@ EBUILD mozilla-firefox-2.0.0.19.ebuild 10225 RMD160 0012156030749abb2725f15cebb6
 EBUILD mozilla-firefox-3.5.6.ebuild 8549 RMD160 26b3de18f2ab361a6136a891c6861f2ccded746f SHA1 01a37203753043440d20a40f4dbae898ce1be371 SHA256 7e66f2385d442fdafefd81d68bbadcd05197225fc041e5a4d8c4b2239c93e2be
 EBUILD mozilla-firefox-3.5.8.ebuild 8551 RMD160 1ade6f7f07446b1da263d1a58fd6e0dad42dec1e SHA1 a7660c3308b5953d8b0a48f5e1beb75194ffcc3a SHA256 4c7154f594860a5471ba4d1b75a10edec968ff0cccd1f2426a355cf1521022ac
 EBUILD mozilla-firefox-3.6-r2.ebuild 8460 RMD160 e9767e15b762a6833b37735da34f9bd926207285 SHA1 b3e949b912a0877755c97970b56c7546a4b373e7 SHA256 18a099c475295f9f892d4773e9d45aca9759389f9dbb7ac0ce17ad7c131bb5b7
-MISC ChangeLog 111806 RMD160 aecb2136aa0ebcbe3a9c52f159bdc5374d5a8afe SHA1 131ca386fc13815b3be721952cb9df58f59a793f SHA256 4328e122a4eb40618a6f2f84be81f067adebb76ecdd9f591939e2169e549b6f0
-MISC metadata.xml 860 RMD160 9dc7089f75140dda59a5ee9eaff41c35febd25bc SHA1 df2fae94e9f4a9fba7399aea0bfe0a38a1d01e89 SHA256 783b95078850c3b150069dcdead96113fe1a44036e61cae9d035f15c3bd1660e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuNcyMACgkQt3UOBHx+2m/rjACgmM/CRy/oooHWl7n4qmwS6Hb2
-Ge4AnjBLOleo74xNKzevC6q/LOU6SA+P
-=E5en
------END PGP SIGNATURE-----
+EBUILD mozilla-firefox-3.6-r4.ebuild 8348 RMD160 caf39b927cbc6f74fe1a01bfb4cce246c0c192d0 SHA1 b8da1a5b711390aa9e9102e8edbf302bc6016bf0 SHA256 c04147caa1039360e8b4631d6ba99f268860984b4448f7b8c0ccbad7fceef106
+MISC ChangeLog 112094 RMD160 9e518792c967c259739282bea6f052582e6879e8 SHA1 b464a02cdaa3d82a6a74cbf8882fa49dcd8253e8 SHA256 c2665acf92c60ec60d7d9c7273a6cecf2b370b2a301dc77e7e40cd53b7e77818
+MISC metadata.xml 982 RMD160 72627f5b9f531bdfa343ec4b3de27c703ea654ab SHA1 6571ff9e9c410c60c0460cecacaba757ea166e14 SHA256 df643bc5baddfe7129e8309dd11af4a45d0c964dd9c434a9c45a35fc3d633ac2
diff --git a/www-client/mozilla-firefox/metadata.xml b/www-client/mozilla-firefox/metadata.xml
index 883aef0afe10..a27997431b2e 100644
--- a/www-client/mozilla-firefox/metadata.xml
+++ b/www-client/mozilla-firefox/metadata.xml
@@ -14,6 +14,8 @@
 	<flag name='restrict-javascript'>Pull in <pkg>www-plugins/noscript</pkg>
 		extension to disable javascript globally, putting the user fully in
 		control of the sites he/she visits</flag>
+	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
+		installation with secure-delete enabled</flag>
 	<flag name='xforms'>XForms is a standard to split up XHTML into XForms,
 		instance data, and user interface</flag>
 </use>
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6-r4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6-r4.ebuild
new file mode 100644
index 000000000000..37677c223e33
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6-r4.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6-r4.ebuild,v 1.1 2010/03/04 14:33:50 nirbheek Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
+
+LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
+ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
+ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+XUL_PV="1.9.2"
+MAJ_XUL_PV="1.9.2"
+MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
+DESKTOP_PV="3.6"
+MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
+PATCH="${PN}-3.6-patches-0.6"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa bindist java libnotify system-sqlite wifi"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.4
+	>=dev-libs/nspr-4.8
+	>=app-text/hunspell-1.2
+	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	alsa? ( media-libs/alsa-lib )
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	~net-libs/xulrunner-${XUL_PV}[java=,wifi=,libnotify=,system-sqlite=]"
+
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	dev-util/pkgconfig"
+
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
+
+S="${WORKDIR}/mozilla-1.9.2"
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack firefox-${MY_PV}.source.tar.bz2 ${PATCH}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix media build failure
+	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# 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=browser
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# 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
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# 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
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable !bindist official-branding
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	if ! use bindist ; then
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
+			${PN}-${DESKTOP_PV}.desktop
+	else
+		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
+			${PN}-${DESKTOP_PV}.desktop
+		sed -i -e "s:Bon Echo:Namoroka:" \
+			"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
+	fi
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
+	fi
+
+	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox
+
+	# Enable very specific settings not inherited from xulrunner
+	cp "${FILESDIR}"/firefox-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
+		die "failed to cp firefox-default-prefs.js"
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+
+	# very ugly hack to make firefox not sigbus on sparc
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${D}/${MOZILLA_FIVE_HOME}/application.ini" || \
+					 die "sparc sed failed"; }
+}
+
+pkg_postinst() {
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "any package that fails to build warrants a bug report."
+	elog
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}