diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2010-06-23 15:19:52 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-06-23 15:19:52 +0000 |
| commit | 3b9940669cc734e18dcf784a47c8e994c969e1b3 (patch) | |
| tree | 6c9cc0c176dfcba7cbe6937c2686ff9ce5825595 /www-client/chromium | |
| parent | Use PYTHON_DEPEND instead of NEED_PYTHON. (diff) | |
| download | historical-3b9940669cc734e18dcf784a47c8e994c969e1b3.tar.gz historical-3b9940669cc734e18dcf784a47c8e994c969e1b3.tar.bz2 historical-3b9940669cc734e18dcf784a47c8e994c969e1b3.zip | |
Install resources.pak, bug #324645 by Mike Gilbert <floppymaster@gmail.com>. Drop cups patch, it's merged usptream, and enable WebM support
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 4 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 11 |
3 files changed, 11 insertions, 11 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 9f7a3f633798..d352bc72106a 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # 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.124 2010/06/21 09:25:10 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.125 2010/06/23 15:19:52 voyageur Exp $ + + 23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild: + Install resources.pak, bug #324645 by Mike Gilbert + <floppymaster@gmail.com>. Drop cups patch, it's merged usptream, and + enable WebM support 21 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> -chromium-5.0.375.70.ebuild, chromium-5.0.375.70-r1.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index b099e062840b..42a93504fa9f 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -14,6 +14,6 @@ DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e022107969 EBUILD chromium-5.0.375.70-r1.ebuild 5611 RMD160 2b6d6f5937ec91de14a996fa79a7932d7dc1cdd1 SHA1 df89526b66d81de5ba386bb413ce668d4bf72be8 SHA256 40188c74dd18e4d9946094e4916010b2cd8d4ee693bc97fb91820e880d8995fa EBUILD chromium-6.0.437.1.ebuild 6375 RMD160 be6be6f40fe24ad710314b4ddd10119686e5a69a SHA1 392b75700a9d76e65b9f5f1be4605d99e69e0754 SHA256 2f9b18544c81573161d9f1385c91f1f85c6110ce83f754b294806de44d7ee474 EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4 -EBUILD chromium-9999.ebuild 8015 RMD160 d42ee04d46b3f00eb694020e505d103f7a76962f SHA1 64e1b49da8ae87f0d2f5feb604e9c3e798b57203 SHA256 cefdee9259ee7a892234a688f5db13b812314d8379e4218ee40edb3fa18dc700 -MISC ChangeLog 27917 RMD160 a172e0d7639525daae0bb2379dfb1bbf3cd7be85 SHA1 64f714fafb1262a2717511ee460f104198b24029 SHA256 f8ac874f850c555ddfb1ede111ca2f489aa22881c9504bbd8722be49f76363cf +EBUILD chromium-9999.ebuild 7835 RMD160 a37905477b05ac842be39bd28905d42a34b31c32 SHA1 739965bcfb5f1eadd8178e83d527cfdff19655db SHA256 10ebdfba03e49f050c805d931f8e2b89d2d5682b033dea032dd0dbe8500b8d7e +MISC ChangeLog 28139 RMD160 b377f039eeb5836f4c1ec03e7fe365c4685ac3f5 SHA1 030f8435d0c5400498779e627cc7b772f6397159 SHA256 dfd4a86e42612e6994ba8fa77f8d333e0a94471518e4ac84aa27fac6714ae708 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index d3c832ae2cc0..5f6978f425b1 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.62 2010/06/21 09:25:10 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.63 2010/06/23 15:19:52 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-0.6[threads,vpx] cups? ( >=net-print/cups-1.3.5 ) sys-libs/zlib >=x11-libs/gtk+-2.14.7 @@ -102,12 +102,6 @@ remove_bundled_lib() { } src_prepare() { - # Disable VP8 until we have a recent enough system-provided ffmpeg. - epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch - - # Make dependency on cups optional, bug #324105. - epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch - remove_bundled_lib "third_party/bzip2" remove_bundled_lib "third_party/libevent" remove_bundled_lib "third_party/libjpeg" @@ -224,6 +218,7 @@ src_install() { insinto ${CHROMIUM_HOME} doins out/Release/chrome.pak + doins out/Release/resources.pak doins -r out/Release/locales doins -r out/Release/resources |