summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2009-10-29 13:26:12 +0000
committerJory Pratt <anarchy@gentoo.org>2009-10-29 13:26:12 +0000
commit478d246ba3a92ee216abaf708ea0169600fce833 (patch)
tree255e70338809a2039b4df9ed071ae9007d6f007c /www-client
parentversion bump. bug 290702 (diff)
downloadgentoo-2-478d246ba3a92ee216abaf708ea0169600fce833.tar.gz
gentoo-2-478d246ba3a92ee216abaf708ea0169600fce833.tar.bz2
gentoo-2-478d246ba3a92ee216abaf708ea0169600fce833.zip
block xulrunner-1.9.2 from being permitted to updated
(Portage version: 2.1.7.1/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/mozilla-firefox/ChangeLog6
-rw-r--r--www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 4ebb1cf78e53..9a725282f22d 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
# 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.559 2009/10/29 00:31:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.560 2009/10/29 13:26:12 anarchy Exp $
+
+ 29 Oct 2009; Jory A. Pratt <anarchy@gentoo.org>
+ mozilla-firefox-3.5.4.ebuild:
+ block xulrunner-1.9.2 from being permitted to updated
*mozilla-firefox-3.5.4 (29 Oct 2009)
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild
index 089e34cb6b33..398febf8d2ec 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild
@@ -1,6 +1,6 @@
# 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.4.ebuild,v 1.1 2009/10/29 00:31:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.4.ebuild,v 1.2 2009/10/29 13:26:12 anarchy Exp $
EAPI="2"
WANT_AUTOCONF="2.1"
@@ -62,6 +62,7 @@ RDEPEND="
sqlite? ( >=dev-db/sqlite-3.6.10 )
alsa? ( media-libs/alsa-lib )
>=net-libs/xulrunner-${XUL_PV}[java=,sqlite=]
+ !>=net-libs/xulrunner-1.9.2
>=x11-libs/cairo-1.8.8[X]
x11-libs/pango[X]"