Revision bump - proxy for Anarchy, bug #278698.

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

3 files changed, 314 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 1daf1fb0ba86..bc302d188e23 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.529 2009/08/09 16:06:37 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.530 2009/08/11 19:21:28 gengor Exp $
+
+*mozilla-firefox-3.5.2-r1 (11 Aug 2009)
+
+  11 Aug 2009; Gordon Malm <gengor@gentoo.org>
+  +mozilla-firefox-3.5.2-r1.ebuild:
+  Revision bump - proxy for Anarchy, bug #278698.
 
   09 Aug 2009; Gordon Malm <gengor@gentoo.org> mozilla-firefox-3.5.2.ebuild:
   Disable jemalloc on hardened, thanks to Anarchy in bug #278698 for the
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 9b21e818d34b..ae70f85f6c61 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -235,6 +235,7 @@ DIST mozilla-firefox-3.5.2-nn-NO.xpi 124691 RMD160 ab787fdf9e312dfbef861e3c5ee7f
 DIST mozilla-firefox-3.5.2-oc.xpi 108053 RMD160 b4962fec75b58b61818f6d034c5a294a986bb6e5 SHA1 b74206aad250bb4cd679d2a071a5026176318924 SHA256 20a4895d71844c9a09e978d6db3620299a4518bd3a8572a7a127d63c6242e8fb
 DIST mozilla-firefox-3.5.2-or.xpi 141767 RMD160 b90a2576afbe5b182370efcca4287477c2cbb8b8 SHA1 eaa39fe3af0a89543dd7d5a79b94c72ea8f014ea SHA256 2d18585a4cdb35007c11600a8f8e3456ac63f089893a243c37c2b94d0ebeb6e1
 DIST mozilla-firefox-3.5.2-pa-IN.xpi 141504 RMD160 50c634bc0d27c7fa249b7fcabdb54703b52764d9 SHA1 ace8e5af9dda948ccd11303fd29d679e26fce3d5 SHA256 70658aba992918c795e5ea93d7dae8a53aad0a38f04672d032abc8d78e14ef87
+DIST mozilla-firefox-3.5.2-patches-0.1.tar.bz2 7585 RMD160 521654db29da32baea833c6ffea2c9d5647b4bba SHA1 2e10464baaa07fe2505d98137f96f72a965f5b0c SHA256 6c2dd771098352d7b977ce9d478edbc952e0c92790d5b33f4459defb88503141
 DIST mozilla-firefox-3.5.2-pl.xpi 130197 RMD160 d2b1122492e08a5886feecc5a55f7050ea371b6f SHA1 aca29f3ce36bf9024d750f774387079db3ced914 SHA256 9d2eb784f5e88640211818ef01467350cb57e1d1a6404cbb5c3c8b57fcf56ffd
 DIST mozilla-firefox-3.5.2-pt-BR.xpi 124446 RMD160 04962c2ae0058926ad8d104cba0644a60f0aacd5 SHA1 5a0b05cb4fbeefc4407dcef276e7cd20ff637792 SHA256 9521006c27bf65d69292df922067e26077b32676dd2a59998c080706f99174e2
 DIST mozilla-firefox-3.5.2-pt-PT.xpi 124521 RMD160 5edcd9eb229f79e62ef2f42530f54849151bfa58 SHA1 17ba48fe8b26e10e52e72a371c7dea1bf13ae525 SHA256 e8d8f2c689bbf3b4496a0eb15c030e3c1fbfb8287a2de2beb477a0c73abcd8e9
@@ -261,6 +262,7 @@ DIST xulrunner-1.9.0.12.tar.bz2 34331369 RMD160 b3e37ef065c5ca1e5d565b90c6a71f48
 EBUILD mozilla-firefox-2.0.0.19.ebuild 10225 RMD160 0012156030749abb2725f15cebb675ec3f36dc38 SHA1 f22da33a29436b90976cd425010d50b59c7d6aba SHA256 6570c61d01f56fce139572d53b57a46751aea917783c2350f1420b39a197bc1c
 EBUILD mozilla-firefox-3.0.11.ebuild 9644 RMD160 760474c22e67fa906f49c6dd34477162b32d43d5 SHA1 6937fc89c56b7429136b11d0bfe39fbef3ae551e SHA256 0c8fe3c100e24d6930f05e7bbce980b626cd76a3a0bb88b973e644db4f83a478
 EBUILD mozilla-firefox-3.0.12.ebuild 9645 RMD160 52759ae736cb9d1021773e75c4686896e446e0aa SHA1 98ba8cf96be66f3990aa6b4c2f80da0e8db2573b SHA256 92da6aef3d177ac98c6d150d207e07318abe27717c709ec142e15ff70c60b215
+EBUILD mozilla-firefox-3.5.2-r1.ebuild 9432 RMD160 7f7046542a0d753be08ed429d9efa1d7a6baf2c3 SHA1 bacdb5be903c4433f1e7e7ec58a6296834086c49 SHA256 7ce822b6c1e537369a7ee291676fa8a0566b79023900a313fd34f16c4ec11719
 EBUILD mozilla-firefox-3.5.2.ebuild 9472 RMD160 14b588810a3be50a94780836405a2423ae05dfbf SHA1 32592a7e33d7cc6edf6b67af59fafa5db73ee973 SHA256 3ec4f52701d4fb011b6a762f75cf3f159764b6ebd1620aefe026dc7951fc26f4
-MISC ChangeLog 100962 RMD160 5f19ddfd8e474763ebb512d411c6578c5a31e6d0 SHA1 3fb88d048a48a0d2c0f4a0e618a472d1c3a29dbe SHA256 66dfe9073832072d51b25fe18ae443c9116272b76b89fecaafc9896e449d1386
+MISC ChangeLog 101137 RMD160 e7e13807b8b068ba6e2a18f884ac2e0da84b798f SHA1 3db413735a066c7938f6e9181c2a97bdc6bcd071 SHA256 d53367bbb3e94b735d9cf033d7ea0de4bb04f7b5ed4f2ac42bc733479eb5cff0
 MISC metadata.xml 860 RMD160 9dc7089f75140dda59a5ee9eaff41c35febd25bc SHA1 df2fae94e9f4a9fba7399aea0bfe0a38a1d01e89 SHA256 783b95078850c3b150069dcdead96113fe1a44036e61cae9d035f15c3bd1660e
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..a5d8d7fbb870
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2009 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.5.2-r1.ebuild,v 1.1 2009/08/11 19:21:28 gengor Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension
+
+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 mn 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.1.2"
+MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
+DESKTOP_PV="3.5"
+MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI
+MY_PV="${PV/_/}" # Handle rcs for SRC_URI
+PATCH="${P}-patches-0.1"
+
+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 iceweasel java mozdevelop restrict-javascript" # qt-experimental
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
+	iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.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
+
+# Not working.
+#	qt-experimental? (
+#		x11-libs/qt-gui
+#		x11-libs/qt-core )
+#	=net-libs/xulrunner-${XUL_PV}*[java=,qt-experimental=]
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.2
+	>=dev-libs/nspr-4.7.3
+	>=dev-db/sqlite-3.6.7
+	>=app-text/hunspell-1.2
+	alsa? ( media-libs/alsa-lib )
+	>=net-libs/xulrunner-${XUL_PV}[java=]
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PDEPEND="restrict-javascript? ( >=www-plugins/noscript-1.8.7 )"
+
+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
+
+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() {
+	if ! use bindist && ! use iceweasel ; then
+		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
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use iceweasel ; then
+		unpack iceweasel-icons-3.0.tar.bz2
+
+		cp -r iceweaselicons/browser "${WORKDIR}"
+	fi
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	if use iceweasel ; then
+		sed -i -e "s:Minefield:Iceweasel:" browser/locales/en-US/chrome/branding/brand.* \
+			browser/branding/nightly/configure.sh || die "iceweasel sed failed!"
+	fi
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+
+	# We need to re-patch this because autoreconf overwrites it
+	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
+}
+
+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
+	# 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
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${XUL_PV}
+
+	# IUSE mozdevelop
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	#mozconfig_use_extension mozdevelop venkman
+
+	# 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 '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Enable/Disable audio in firefox
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+
+	if ! use bindist && ! use iceweasel ; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# 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"
+	rm "${D}"/usr/bin/firefox
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	if use iceweasel ; then
+		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
+		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
+			${PN}-${DESKTOP_PV}.desktop
+	elif ! 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:Minefield:" \
+			"${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
+
+	# Create /usr/bin/firefox
+	cat <<EOF >"${D}"/usr/bin/firefox
+#!/bin/sh
+export LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}\${LD_LIBRARY_PATH+":\${LD_LIBRARY_PATH}"}"
+exec "${MOZILLA_FIVE_HOME}"/firefox "\$@"
+EOF
+
+	fperms 0755 /usr/bin/firefox
+	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 xulrunner-default-prefs.js"
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+}
+
+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
+}