summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-06-01 20:22:14 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-06-01 20:22:14 +0000
commit975f449a8d21d997b4a8a306c4ea47343abab096 (patch)
tree8683f59d9ccbde3e1d570fbd9c9ae9dafef9f5ae /www-client/chromium
parentadd ~x64-macos, bug 322229 (diff)
downloadhistorical-975f449a8d21d997b4a8a306c4ea47343abab096.tar.gz
historical-975f449a8d21d997b4a8a306c4ea47343abab096.tar.bz2
historical-975f449a8d21d997b4a8a306c4ea47343abab096.zip
Depend on live ffmpeg to fix compilation for now, bug #321159
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog5
-rw-r--r--www-client/chromium/Manifest14
-rw-r--r--www-client/chromium/chromium-9999.ebuild4
3 files changed, 8 insertions, 15 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 487e74a73caa..7c4ea7f365a0 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.105 2010/05/29 17:12:28 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.106 2010/06/01 20:22:14 voyageur Exp $
+
+ 01 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild:
+ Depend on live ffmpeg to fix compilation for now, bug #321159
29 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
chromium-5.0.375.55.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9ba0193ac593..7427f9f905d1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9
@@ -14,13 +11,6 @@ EBUILD chromium-5.0.375.53.ebuild 5427 RMD160 4851dffda9bd8bdfaf8f300f42f597cf2a
EBUILD chromium-5.0.375.55.ebuild 5557 RMD160 8b55ac12b49b688ae7a312551f2813c28a839de7 SHA1 9e08e458665814a152fdff97489a9e29f967ae12 SHA256 2563280afb8865e643be623b38ca5ec30c1c913836b057b539d66a1b60d37279
EBUILD chromium-6.0.401.1.ebuild 5263 RMD160 4a58c94f482757a42e4d11d8a4c4f6c34f49d194 SHA1 c2e2521e6c06e3ecd70cebbcf8ccebfc8ffaf5a3 SHA256 54de518788f9bd04e7a3cc63d7840a074dca33e6d889fef4e4b4b255036b431c
EBUILD chromium-6.0.408.1.ebuild 5014 RMD160 8401919f4e64dee18965d8ab3fc7a4c48e2368ab SHA1 a8b05a36e8ee74837f108177ac5aff4c663aebd4 SHA256 29cf2c643d7aee5ae9136f0705923ab243d89b935f66dde21d8e925910cb0ef4
-EBUILD chromium-9999.ebuild 6767 RMD160 1e012da7ef74265659676f256d0da4cab72cdfdf SHA1 dd8723f99d2d211eee6d2ee044f63df048fe9440 SHA256 924248fbf0eabd3b1ef15a3034391cfc6d779497a773a1f197fbb941d923cd4d
-MISC ChangeLog 24341 RMD160 6a37ff1c467761c98be67ee5aa586dad76cdf5f0 SHA1 3befbf69920a2955cc87436442fd0c6ad6be86ee SHA256 f87f17503b09632c00e20f572b1b184abc7d79c80987bf98d274b99452402f8e
+EBUILD chromium-9999.ebuild 6772 RMD160 eb54d7f001653be6d892facd980f8e9fc412a3a4 SHA1 c20b929adefde13a2ccdb5d1e26f4e303dc1a9da SHA256 40a1575e3fd82c70e09837edf0e9ce2c779bbf19c72ebd2c73732f9b75902bf7
+MISC ChangeLog 24487 RMD160 0725205b234c8f043649f4b3721bdeacb1394110 SHA1 d5a4842a8be0e938b103696f1635ab35308dd761 SHA256 7db4d8145a4b1c48e474bba587886cc1c6bb38b2205d28f10f6b86894f537fbc
MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwBSwUACgkQV3J2n04EauyTbgCeO0YsdlYRIVsXHzus7uM1G5X3
-j0MAnilCF79xMsayFKrKVDFQ4/k4XoIG
-=ygee
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 90c677b25323..6dc1250343ce 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.53 2010/05/26 06:35:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.54 2010/06/01 20:22:14 voyageur Exp $
EAPI="2"
@@ -26,7 +26,7 @@ RDEPEND="app-arch/bzip2
>=media-libs/alsa-lib-1.0.19
media-libs/jpeg:0
media-libs/libpng
- media-video/ffmpeg[threads]
+ >=media-video/ffmpeg-9999[threads]
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
x11-libs/libXScrnSaver"