Rework yasm dep

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

3 files changed, 25 insertions, 19 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 65c9d5acb16e..cef4d4ed50e0 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,9 @@
 # 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.83 2011/05/04 20:22:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.84 2011/05/10 04:58:57 polynomial-c Exp $
+
+  10 May 2011; Lars Wendler <polynomial-c@gentoo.org> icecat-4.0.1.ebuild:
+  Rework yasm dep.
 
   04 May 2011; Markos Chandras <hwoarang@gentoo.org> icecat-3.6.16-r1.ebuild:
   Stable on amd64 wrt bug #365323
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index a610d0333c24..c8260f97fa4d 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -161,23 +161,23 @@ DIST icecat-4.0.1-zu.xpi 236045 RMD160 6f622b647cf2fb3e534510e3cd6ea98f9d63db24
 DIST icecat-4.0.1.tar.bz2 65463427 RMD160 c6c53a317d5fecb21b43e6de12a8aa753ae7434d SHA1 584b540da4b4954e0e1dd1b84dbe4b3cb435f0c2 SHA256 e40f5adf31ee5085322cde468a14c53230f239b57558580bac07c6e16ca63fd1
 EBUILD icecat-3.6.16-r1.ebuild 8886 RMD160 94bfee75951a1cfa3791fc5b3b0f2f37e2271c2a SHA1 93e05332f2cb7ce169aed4b410a2ac01fa092c35 SHA256 1e77fed1fd1d230832a8848436b8d3240b55ca9ff7150826bbc516587de01679
 EBUILD icecat-3.6.16.ebuild 8724 RMD160 548f97a4eadb50ec9c0663095eec7021dace5301 SHA1 fa9fc647336b7bf09cf3f97f14683207e37e09ed SHA256 a2ad548e7c76ef33880948f9d8fee9d98b5a81c1ac9caf3f0f6a3c7c01834b1c
-EBUILD icecat-4.0.1.ebuild 7502 RMD160 efe8fa272791af1b2663992454f98d84d6f6f5f2 SHA1 8ba005701d13e48b6a1ca96483fcefc0703f215a SHA256 d8c2b763c70df97a1cbaec2546da3dc7f4c1005ce932972d18ef0aa489b9497b
-MISC ChangeLog 12213 RMD160 fbc3602efe04b6b95e6c6dcbbd188f5ea927fc14 SHA1 043793bb5e79e0badecb8ea2da8c3d03df55879b SHA256 8335f76077b697ca949d7596ed232d7a30f6f6709d1fe5c57dc740068bbea751
+EBUILD icecat-4.0.1.ebuild 7564 RMD160 8f235797958d1034c969b90adef6b5ae69c74f95 SHA1 b504d36d94bcb1de52784293d99961d28f8839ac SHA256 ac1e7f2de9a2fedd92990e22681132ba3a82b4f61773b9db50057c928657e1a9
+MISC ChangeLog 12312 RMD160 71c4e8ab6893915dce73d8bba047e4606acc7ba3 SHA1 d23a7003f81de6f9dec1776d79f1417e9095e16d SHA256 73386ab844d9027ca36377f1bda96164c5d16a09f47694f3c1df6e4dc5e0b592
 MISC metadata.xml 612 RMD160 72c8b176b20a114a9abbd78a62f4889326bfff95 SHA1 0660cc2cce93cf69eff8bf7478366da6d433a3ed SHA256 ef40414d079e49170aaf46332aeb7bdd95c45c68eb3f6a34718f59c192f43a06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNwbWfAAoJEPqDWhW0r/LCSOMQALlYp1KmP4zcvdGFNiDn0ICz
-ELZbDpEP1zE97CIMRCz5o9wpf6WnluOulWd+ouzYZjqdrksH4KftxC+oZVWF6gGH
-LRtKG0Wo986wFh0YMdSs4AdPglZeEUWS1wkYcmv8tZ+4f2Rx9MGScVD5olCSX3lc
-sUhNbouVa0MCCqmFn9R0gNbSQwFLZE8AwDwW/RxJFuYZF/62bl+vk5Z35uwF0/M1
-4qMsD9dud3rUIbUItzW4UIdMA6x2RGBpBy7VfN+gixLkgMTmfHd9YzVDQQ1rf33p
-s3h/DJDm1ZGqaFnvAmwqiSsgMZzvgmkQUB6J7QzSxr1CFlZUq0DJd09FIBFLiFX7
-T8rvkPW4zo5cziTlYqaDzffP7WzSK4Hsj6DRTziLeEV70TjIl0Z0V7Ag/NMlokBe
-EkU10SyjefEStwNzEgy91WqtMLZsRi56hrAGVOIA6cnEdAJfAnQgQWt4eVJ3/qyF
-toD8qiKbI0fN+Gj/VQ+sDjD48fJ8JK7E1SsDOD3viT891dp/oX4/ErFSZYFrrxQ7
-Pt3JknK3UDcbnM40d0WcU0OpF4i/YGI4ldtFaCbIQ/au6LpUhrB2LYeZLp9UAIrW
-+rEgsT1aHRszrhJ/0WcotDDXEdIAMJHeWOF6CUZMMbmUPB4ct2NqgCNEf/eLHZY8
-cXU0CoVQFnShU1NhNumo
-=FtaA
+iQIcBAEBCgAGBQJNyMYXAAoJEPiazRVxLXTFxi4QAKFGcaBjYE+W+Rw9aLB/LTXD
+LwG4xfl7/CMxA8sJnDMerPauwgkU57TzlUDLZkpnYVRmdwlBcutOhbSfUTAGQW5K
+hJgOtRwZiNYm5MD7VY0StDHGZylxY67rNcJxhrLqWl2lGwwUfObBhZ9768wuPXBb
+rAxjUukIvTOhbIThLqX/JttZ3KANILdVQNnN20WKLJM+HVEpje75eljKcMHdqkM8
+ktZctpGh5xArqG6IIzI3b9FxJj0siWLbjxvaicqxLawk37Ibx339CGX/SBCN5/+j
+QLsr02e5fptYdAsa+xGkRwGgjAGi22mJ14yJdwKtrk8c0KPWgiXpRZOvxihHk/LS
+xQBRYZRa8vBvOLL99vRxRcMTpvKm3fYzK1ppiG0DbtoEGhrjYFq3R6Io6325H9Fj
+nh7rrDVCJmbeKwPDyPttoe5oNiHgnqxM5cKQ+pY5LUY4r+yqmfkqIQHefu7h5CZf
+ZAzKpaW1N/mUWeB2oysjZ6Muw/3YbYxpEAr1c5RAGTJ68XGfPjyRTU98bBLOhdzm
+Iheq8HtDkW3l96+cB+6acJx3zKzeuUgZSMdTKz9Ce9B4zOaxw0MgoNzcj9U74Lzh
+/IBDBmSc8JysKWq0+My+tGIfg4LO7qJQEyAZ68xTrajwEgiKTqkDAojajeVsEhrD
+96Y51QTlRo9ejPbhUstE
+=zDw5
 -----END PGP SIGNATURE-----
diff --git a/www-client/icecat/icecat-4.0.1.ebuild b/www-client/icecat/icecat-4.0.1.ebuild
index b7f3d89ed90a..7ae07b84e74b 100644
--- a/www-client/icecat/icecat-4.0.1.ebuild
+++ b/www-client/icecat/icecat-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/icecat/icecat-4.0.1.ebuild,v 1.1 2011/05/03 21:11:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1.ebuild,v 1.2 2011/05/10 04:58:57 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -28,12 +28,14 @@ SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}"
 
+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 language packs for alphas
 if ! [[ ${PV} =~ alpha|beta ]]; then