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
commit02e7e84b37ee70abe5d0f25024fc05ba02b079ac (patch)
tree9d09f455c8bf6cabdb70ad45533080ec8304c3bc /www-client
parentrework yasm dep, disable avx support bug #364551 (diff)
downloadhistorical-02e7e84b37ee70abe5d0f25024fc05ba02b079ac.tar.gz
historical-02e7e84b37ee70abe5d0f25024fc05ba02b079ac.tar.bz2
historical-02e7e84b37ee70abe5d0f25024fc05ba02b079ac.zip
rework yasm dep, disable avx support bug #364551
Package-Manager: portage-2.1.9.48/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox/ChangeLog5
-rw-r--r--www-client/firefox/Manifest14
-rw-r--r--www-client/firefox/firefox-4.0.1.ebuild9
3 files changed, 12 insertions, 16 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/Manifest b/www-client/firefox/Manifest
index c99eebee24a6..5cefa066254e 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
AUX firefox-3.0-solaris64.patch 416 RMD160 f59eaf44b797715d6116f0f151803ec6c26587c1 SHA1 c6cbd37cc2f20a1bdc347b33ff8cdd8b9e159424 SHA256 5d2f04928d820460b099a0baa92ed2d681d75b5634c21364997be216214f5597
@@ -318,13 +315,6 @@ DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a344549863612
EBUILD firefox-3.6.12.ebuild 9526 RMD160 09c1fbad806f8cc977bdfcf35e5661731dd8e63c SHA1 cf1b4648f7f1708c0fb33fa8ae4e2566ac73fdea SHA256 b9dbe985567f8f3e7051f73e4978e35f03e439b688eaf73c71a8a8cece7ad163
EBUILD firefox-3.6.16-r1.ebuild 9476 RMD160 af498c0e3c5783d1ed75173b14d58af5a840d789 SHA1 8bfe4954a07cab739a037e593d934f8231c9a49b SHA256 fc45024eb42483ebb403cf0a0e91295d5d14acca7e94452a5043a94ea3a2aee3
EBUILD firefox-3.6.17.ebuild 9471 RMD160 de5e3504836ee764ddf0f47bac73d642ed87528a SHA1 1c8a647863e43a37f5ef74e02a269546b23a584c SHA256 c4f91716011e63160f8fe47aaf1048526951d95fe4eed062cafa8a53bbecfe44
-EBUILD firefox-4.0.1.ebuild 7880 RMD160 14aaabdc9ef6afd70da4d6fc1fb7b6a34033e712 SHA1 86cf6b90124d39304856972d3337a7ff03d53c99 SHA256 6a5638cebed57336d36941290b1080bf9814909634c4dd41a65f66e571d5aa93
-MISC ChangeLog 127388 RMD160 af95e88bc8ad0a9828b329362b3773729a081dd2 SHA1 722d8b515d10d781cf750bf3121678bdb8b87a26 SHA256 793251c54bb6261a1b78197fbe0de21452c110db07e4f5316023926e282f915a
+EBUILD firefox-4.0.1.ebuild 7942 RMD160 b43f53bfa0dea5101f23a31328ffc373428b132f SHA1 b1f2ac9464752eb6d065c2689070e7e00dc20cf9 SHA256 31c12d109757f2cc191bcac7ee6375e30b575c83a848f203256b68e30477030c
+MISC ChangeLog 127512 RMD160 330f1c96a70adbb110f1944ad0db6e4e379df846 SHA1 5d9d350bd7622b34a97f79b4cdf0028ebaeb8517 SHA256 adaf969c0ac4ca0ee6f8b39d617f31ae31a2e16edfb6247eadeb711b29e90ab9
MISC metadata.xml 591 RMD160 4e13e501ffacdd9001cbc15bc92e3e901463454b SHA1 9ddb97472d099fb3f65193bc7cbfcbb26e6281dc SHA256 e91f4670e55c264903dbbd321565e1d817e510dfabadaa81c9e15c7317864b23
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk3FiTIACgkQuQc30/atMkAclgCdG+K7PD/mFuDJaECdCL5YLFJN
-kC8AniKXiZRiuazYz28yK9+1JtRwhnk7
-=yxNZ
------END PGP SIGNATURE-----
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