Sync up with firefox-5.0-r2

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 54 insertions, 24 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 4ff83bc4a936..7c01238c975b 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.91 2011/06/28 22:07:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.92 2011/07/06 23:43:49 polynomial-c Exp $
+
+*icecat-5.0-r1 (06 Jul 2011)
+
+  06 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> -icecat-5.0.ebuild,
+  +icecat-5.0-r1.ebuild:
+  Sync with firefox-5.0-r2
 
 *icecat-5.0 (28 Jun 2011)
 
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index f5400797bad4..20d4f77f3638 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 2000-icecat-5_gentoo_install_dirs.patch 712 RMD160 e5a7d85c1d6e93b5f3afd356e5cf1c3707e35479 SHA1 1e91b1815ea1b2ebbbebaf9d80c1b44565fcd8d0 SHA256 4ee5ad201af91ead8ad788abb5399198fdb479304dfe1d554b773d623ea01f1a
 AUX 2000-icecat_gentoo_install_dirs.patch 712 RMD160 e5a7d85c1d6e93b5f3afd356e5cf1c3707e35479 SHA1 1e91b1815ea1b2ebbbebaf9d80c1b44565fcd8d0 SHA256 4ee5ad201af91ead8ad788abb5399198fdb479304dfe1d554b773d623ea01f1a
 AUX 5001_fix-prefs-directory.patch 964 RMD160 d025e72b21766c727e6a226cb610d21d9aa1e8e1 SHA1 eec373a65974f854122301c42668df5d9d593fc2 SHA256 0875663be4595296fa413a8727fa53f08e3e730c5161ef72e609d25f35ca0a0c
@@ -9,7 +12,7 @@ DIST ff3617.diff.xz 255324 RMD160 0bb953b177d1fcc1e9083fe6b9495e2294183aa2 SHA1
 DIST ff3618.diff.xz 20160 RMD160 7ed6b8d143b01e3998d867a2789e3116b541b472 SHA1 4a754fb15a10e5399f50f5eaef7fc4c3ac506ddd SHA256 1b2346f9bfde56a342e73a2a0c3a4f29a9873ea0b18137a60fd978fd11b62176
 DIST firefox-3.6-patches-0.4.tar.bz2 5791 RMD160 17944b3605138c3b651b31fcad306a432b73b80c SHA1 4ddff9a613cc703b34667aab3aea993187405920 SHA256 39bbbe412f70b50e8870e11dbd3f9e74ed7cbeaa23ed47dea1ea6ff72f48e54f
 DIST firefox-4.0-patches-1.0.tar.bz2 16462 RMD160 46755eac7eb04eb19f79c93af3fd2016289a62a4 SHA1 270afe97a49bc507bc0d1d3159ec23e69e9ec40f SHA256 db5e993bf309c316ca370186c7866a7505cb37ecc729a3449bd0f6538aa2eda0
-DIST firefox-5.0-patches-0.5.tar.bz2 7017 RMD160 b4482361dd01ec578cf9f3bbc93c5f0b4ef19ce8 SHA1 d58d2021c5b8377340db28eb4159ce85d508fe9c SHA256 c7bcf535d90863554190245dc1fb145dfc32a32e7b3dfc46b8b26dcb1f76fb29
+DIST firefox-5.0-patches-0.6.tar.bz2 7632 RMD160 96d8417c4212d9cee70e78ae4e446931eb7c9f9e SHA1 7e641526b87a9185d0994de876b22f39fe33cbfb SHA256 dc43801ea5a8a126d2d79d8f2d15061b316f0eacb933a464ae700be633f607b1
 DIST icecat-3.6.16-af.xpi 122498 RMD160 e697cd77c0d38ed7568bf2b0af8816ca70cdeca8 SHA1 9eb46b333ea44cecd4f431fcbeb53f1b1bc74a07 SHA256 8f47667318c75b36755bcb4d1ba700ea622fdabd46b3fa97475b54bf49591730
 DIST icecat-3.6.16-ar.xpi 133542 RMD160 cc6786228a479342b23cda51d4f6008188bad992 SHA1 fae0950500a26ee8d4311c22f66541b192e4273e SHA256 a42fea02793a6a9ef50854959fe5293a0851c8b2bf61ca9c94f28865b3fd8d4d
 DIST icecat-3.6.16-as.xpi 136725 RMD160 7eb162d472ba909214956e1d22d50c6c2ad6f9bf SHA1 534e85951bac6e718685b0a2e7a74b06b15ea2d9 SHA256 44725fea3ab711fb46eac81040058de39c41d502bfd26151836223771e0b6240
@@ -238,6 +241,23 @@ DIST icecat-5.0.tar.bz2 66222560 RMD160 72bc9a591b807f4c5d5a4bd23567beaeab69c03e
 EBUILD icecat-3.6.16-r1.ebuild 8865 RMD160 7dd7d5480f85d2a1bf5e98b77c94d81451900ccc SHA1 73f6009b89e6cd3bdc8c9121b45e171a138d4eef SHA256 a3ed37f4b328df7ae42a70b780f9259b15ca4acf9981bcb76590e826e307acd6
 EBUILD icecat-3.6.16-r2.ebuild 8961 RMD160 cd95bebc03a4736d2c6fd693deddff6de66c9e19 SHA1 afa4ca7f086441dad89b08dba33f54299176e922 SHA256 85a95c1bd94f54a74d5f9637d0cb646633f94598def03b6d299ef2a01432f2dc
 EBUILD icecat-4.0.1-r1.ebuild 7616 RMD160 4fe20e8e5d02ba37fd6b40ff36cfbd7839741548 SHA1 9fd7329b0d662974022c56a3960966ebd9fe2651 SHA256 c8cb2a5e919baad27df2278c2967d2b97cb73c1bf74f9df4b09b511c6c88e3b2
-EBUILD icecat-5.0.ebuild 9486 RMD160 96f03c29644ce5fb5fb4123082d8b9403f744d5f SHA1 b3fa83ff0837e08db1287d4cbd3f5da8d7e215ad SHA256 bfecefcb49fe99068d8f24001dc5f634c7d5a68e07aa28a587ce020b70b23535
-MISC ChangeLog 13404 RMD160 e8241998165fb20d08e3e9a97d8519c4fec16d45 SHA1 39b75bc2f2cde9fbc1c245d846114af65b4c0e0d SHA256 dcc1fa0505ea888b4ce60177dc54a488cfc49e387e07e91c4731b3bb4ffc364d
-MISC metadata.xml 899 RMD160 f4646982a2ebde930786fa67b824458a91128f80 SHA1 969b576313fece496fe9bc151a958b4630c057ae SHA256 c8147d2d9b01799b6def2e5d9f796c100308fa9a8b83fbe964c4764e2472ef39
+EBUILD icecat-5.0-r1.ebuild 9492 RMD160 bfff8a1d4204702ea0c2a8f38fc9e852c1473331 SHA1 16a36845eb86a16f0b6b4d24ad50fd697a4a0583 SHA256 fd8019e00e7d19d621a879d8181483d7aec9ec4824fffa5f6ff8e05ab7b03f6e
+MISC ChangeLog 13561 RMD160 682d00c85b6b5f9bfdb8808b83fee3fd58bd961d SHA1 d2cc59d500a89d12d6bb66b10719be77ac814f9a SHA256 dee8fd5cd25ce6c6dc536f63d0329a5e75d951e5d9092fd7bf58ca675c63d62c
+MISC metadata.xml 974 RMD160 7532aab7831e78fc42ee499cab9f49d34ed159a3 SHA1 01cbca62b8574e05a11761a2bbe9756ead3f6f91 SHA256 7d43db1eab925b5a2499aac3ffda6b7e0d2933db44447760377119c30e7d8211
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOFPM7AAoJEPiazRVxLXTFJXEP/3rFFvwTdmHx8/psflInpVm6
+YEI5AtNBo3WwXAMKhipQAZfDNB1zxtTtWFQYeHwNNZBdmx8AHry7c8H55rmGY7FC
+nDw0uIdEHibgFimt4cRr65ZXLisXzJRkjuu0+Z/7V3gaY1tQRARwzVClf47NQ6zU
+2MVLdGoQfjtI+sHYx35m7VxJu/SmOmlwakEYfqfgZCnQ8/ZfmDWI5Ezct0eGFDqD
+4xzkjzW2mp+0OaBw2LPrM97+m+bWNZslWeAfqCAVMwX6cEW0Nre94WadOtJnQpjm
+xbx/aacEDunflipnvXMspKnFB0skH08wzK4+6KEGCMR9CrbgIANjYcxhtUDrPrpV
+NnbB9Vg/Y2Gu0p6mxf2NiGGQfIqeXYjeu4evaMKIt421akkrgw/ehGn/xbCQyBSZ
+35RAaHzanOBmK4gvssm/e9dL+J2iffaAjZaoIhuRn0hk/R56BuwC7vbURclDsBdh
+HZX6OXZVeqjgnTY+OowZB6/h4H4Y00YwB2tGh17Wv4iw6WLQQtzbJvo+5Drhisod
+oOTCQWvcQoUocRXHuvWHh/RHM06z7PGpWZel322J0hqYbcyxN9a6KuitHoongb0s
+Zmjdqk1N3IqUZ7IaqiUu/ekF52kigdbxnIuouAEDCnLWpGQw/AjqzGtrWdKhOzZ4
+uX6FcQGHMlf9H3yBpV2C
+=0151
+-----END PGP SIGNATURE-----
diff --git a/www-client/icecat/icecat-5.0.ebuild b/www-client/icecat/icecat-5.0-r1.ebuild
index 7d385b684951..b59c1d7106cb 100644
--- a/www-client/icecat/icecat-5.0.ebuild
+++ b/www-client/icecat/icecat-5.0-r1.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0.ebuild,v 1.2 2011/06/29 20:25:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild,v 1.1 2011/07/06 23:43:49 polynomial-c Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
 
-MAJ_XUL_PV="5.0"
 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
-XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
 FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
-PATCH="firefox-5.0-patches-0.5"
+PATCH="firefox-5.0-patches-0.6"
 
 DESCRIPTION="GNU project's edition of Mozilla Firefox"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
@@ -22,7 +20,7 @@ HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="gconf hardened +ipc pgo system-sqlite +webm"
+IUSE="+methodjit +ipc pgo system-sqlite +webm"
 
 # More URIs appended below...
 SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2
@@ -31,12 +29,13 @@ LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
+# Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	>=dev-libs/glib-2.26
+	>=media-libs/mesa-7.10
 	media-libs/libpng[apng]
 	dev-libs/libffi
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
@@ -114,10 +113,16 @@ pkg_setup() {
 		XDG_SESSION_COOKIE \
 		XAUTHORITY
 
-	if ! use hardened && use pgo; then
+	if ! use methodjit ; then
+		einfo
+		ewarn "You are disabling the method-based JIT in JägerMonkey."
+		ewarn "This will greatly slowdown JavaScript in ${PN}!"
+	fi
+
+	if use pgo ; then
 		einfo
-		ewarn "You will do a double build for profile guided optimization. This will result in your"
-		ewarn "build taking at least twice as long as before."
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
 	fi
 }
 
@@ -208,20 +213,20 @@ src_configure() {
 	mozconfig_annotate '' --prefix=/usr
 	mozconfig_annotate '' --libdir=/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --disable-mailnews
 	mozconfig_annotate '' --enable-canvas
 	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
-	use hardened && mozconfig_annotate 'hardened' --disable-methodjit
 
 	# Other browser-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
 	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable gconf
+	mozconfig_use_enable methodjit
 
 	# Allow for a proper pgo build
-	if ! use hardened && use pgo; then
+	if use pgo ; then
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
 	fi
 
@@ -293,10 +298,8 @@ src_install() {
 		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
 	fi
 
-	if use hardened; then
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container
-	fi
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container
 
 	# Plugins dir
 	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
diff --git a/www-client/icecat/metadata.xml b/www-client/icecat/metadata.xml
index 2ba3f5979618..fec8205a6e04 100644
--- a/www-client/icecat/metadata.xml
+++ b/www-client/icecat/metadata.xml
@@ -5,10 +5,11 @@
 <use>
 	<flag name='custom-optimization'>Fine-tune custom compiler
 		optimizations</flag>
-	<flag name="gconf">Add support for setting of default browser using
-		<pkg>gnome-base/gconf</pkg>. Useful only for GNOME 2 users.</flag>
         <flag name="ipc">Use inter-process communication between tabs and plugins.
                 Allows for greater stability in case of plugin crashes</flag>
+	<flag name="methodjit">Enable JIT for JavaScript using MethodJIT for faster 
+                JS performance. Hardened users can disable this USE-flag to use MPROTECT
+                on grsecurity kernels.</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
 		for faster binaries. This option will double the compile time.</flag>
 	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>