summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-client/firefox-bin/ChangeLog7
-rw-r--r--www-client/firefox-bin/firefox-bin-15.0.1.ebuild4
-rw-r--r--www-client/firefox-bin/firefox-bin-16.0.2.ebuild4
3 files changed, 12 insertions, 3 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 8b11034b8c44..62c36bfa0391 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/firefox-bin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.122 2012/10/29 16:02:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.123 2012/10/31 18:17:49 axs Exp $
+
+ 31 Oct 2012; Ian Stakenvicius <axs@gentoo.org> firefox-bin-15.0.1.ebuild,
+ firefox-bin-16.0.2.ebuild:
+ Interim solution to block net-libs/libproxy[spidermonkey] due to mozjs symbol
+ collisions that cause crashes, bug 439148
*firefox-bin-16.0.2 (29 Oct 2012)
diff --git a/www-client/firefox-bin/firefox-bin-15.0.1.ebuild b/www-client/firefox-bin/firefox-bin-15.0.1.ebuild
index 691f7a5f62c1..c18cf0c2a67b 100644
--- a/www-client/firefox-bin/firefox-bin-15.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-15.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-15.0.1.ebuild,v 1.1 2012/09/11 08:22:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-15.0.1.ebuild,v 1.2 2012/10/31 18:17:49 axs Exp $
EAPI="4"
@@ -45,6 +45,8 @@ RDEPEND="dev-libs/dbus-glib
>=x11-libs/gtk+-2.2:2
>=media-libs/alsa-lib-1.0.16
+
+ !net-libs/libproxy[spidermonkey]
"
S="${WORKDIR}/${MOZ_PN}"
diff --git a/www-client/firefox-bin/firefox-bin-16.0.2.ebuild b/www-client/firefox-bin/firefox-bin-16.0.2.ebuild
index 34a83e59c9d8..e3b0d54d1146 100644
--- a/www-client/firefox-bin/firefox-bin-16.0.2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-16.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-16.0.2.ebuild,v 1.1 2012/10/29 16:02:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-16.0.2.ebuild,v 1.2 2012/10/31 18:17:49 axs Exp $
EAPI="4"
@@ -45,6 +45,8 @@ RDEPEND="dev-libs/dbus-glib
>=x11-libs/gtk+-2.2:2
>=media-libs/alsa-lib-1.0.16
+
+ !net-libs/libproxy[spidermonkey]
"
S="${WORKDIR}/${MOZ_PN}"