summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2011-05-10 01:42:37 +0000
committerJory Pratt <anarchy@gentoo.org>2011-05-10 01:42:37 +0000
commit2cc273d73453a25b37c534a5eaf76f8a0bf4f689 (patch)
tree18f5b1de69c4fab206dac84fb145a697711204af /www-client/firefox
parentrework yasm dep, disable avx support bug #364551 (diff)
downloadgentoo-2-2cc273d73453a25b37c534a5eaf76f8a0bf4f689.tar.gz
gentoo-2-2cc273d73453a25b37c534a5eaf76f8a0bf4f689.tar.bz2
gentoo-2-2cc273d73453a25b37c534a5eaf76f8a0bf4f689.zip
rework yasm dep, disable avx support bug #364551
(Portage version: 2.1.9.48/cvs/Linux x86_64)
Diffstat (limited to 'www-client/firefox')
-rw-r--r--www-client/firefox/ChangeLog5
-rw-r--r--www-client/firefox/firefox-4.0.1.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index ab2ddd8e230a..25635bc6ef40 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/firefox
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.69 2011/05/07 18:02:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.70 2011/05/10 01:42:37 anarchy Exp $
+
+ 10 May 2011; Jory A. Pratt <anarchy@gentoo.org> firefox-4.0.1.ebuild:
+ rework yasm dep, disable avx support bug #364551
07 May 2011; Raúl Porcel <armin76@gentoo.org> firefox-3.6.17.ebuild:
alpha/arm/ia64 stable wrt #365323
diff --git a/www-client/firefox/firefox-4.0.1.ebuild b/www-client/firefox/firefox-4.0.1.ebuild
index e0398d5bfffb..86c84ff77916 100644
--- a/www-client/firefox/firefox-4.0.1.ebuild
+++ b/www-client/firefox/firefox-4.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0.1.ebuild,v 1.1 2011/05/02 23:33:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0.1.ebuild,v 1.2 2011/05/10 01:42:37 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -28,12 +28,14 @@ REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
RDEPEND="
>=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
>=dev-libs/glib-2.26
- >=media-libs/libpng-1.4.7[apng]
+ media-libs/libpng[apng]
x11-libs/pango[X]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
@@ -42,7 +44,8 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-util/pkgconfig
- webm? ( dev-lang/yasm )"
+ webm? ( x86? ( ${ASM_DEPEND} )
+ amd64? ( ${ASM_DEPEND} ) )"
# No source releases for alpha|beta
if [[ ${PV} =~ alpha|beta ]]; then