Dev channel bump. Make it possible to compile against system libav (bug #464676 by Nikos Chantziaras). Fix build with system ffmpeg (bug #466866 by jlec). Remove old.

Package-Manager: portage-2.1.11.55/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

5 files changed, 115 insertions, 18 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6b96dfe46869..81bdcc6c0bea 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.878 2013/05/09 00:42:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.879 2013/05/09 20:59:28 phajdan.jr Exp $
+
+*chromium-28.0.1500.5 (09 May 2013)
+
+  09 May 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-ffmpeg-r5.patch, -chromium-28.0.1496.0.ebuild,
+  +chromium-28.0.1500.5.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Make it possible to compile against system libav (bug
+  #464676 by Nikos Chantziaras). Fix build with system ffmpeg (bug #466866 by
+  jlec). Remove old.
 
   09 May 2013; Mike Gilbert <floppym@gentoo.org>
   -files/chromium-icu50-tests-r0.patch, -files/chromium-mesa-r0.patch,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c4c92e084699..5319d91a1f75 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,6 +13,7 @@ AUX chromium-smhasher-r0.patch 741 SHA256 dece763d41b41bb6876b8eba0346612a754191
 AUX chromium-speech-dispatcher-0.8-r0.patch 562 SHA256 4f92686cb785a48a0e91de1346b14dc2140f81a26251584087917f6fd244ef05 SHA512 6fb93b5680ac90a5d12d5fd65cfca6ba685cc7e1e30db567040ebcece1bcc6472303ab750fe82f0355ecd345794832120c5b3d74030b903b4f2518f5361dafed WHIRLPOOL 37c91ce8cd6c0a5117d4b2dc09edea15e8c3f288a404f66f3afe32c50fade7dffca12a8b53c2e3de29389d025d010139ddf6f29c78c94f01a27060b336ea3196
 AUX chromium-system-ffmpeg-r2a.patch 6627 SHA256 8344737762508e33f748a04a81fc460c82e1752ad49d214abf4ff670ecd06925 SHA512 fb7828ab03c6fe54945f37e829ba1e1b9ecb482b4df9c31e0e93a04065903a54b6887766806402aa1e9b13c63fb3a59eab1f0ce73207ab3ca6bcce362a2c3677 WHIRLPOOL 91891f9053fe1447808b3a3c015e9c8f08103cccd1944171c07bd3254ee85dfa88abdfb689b97949ae80a6cda59e6f561ab8a89fd45ab52bced9118d0679326b
 AUX chromium-system-ffmpeg-r4.patch 1237 SHA256 749c646c0084fea6ba90fbdd21e6185a7f3ad0d2c8633403fd1b3df3ffe5f7a8 SHA512 d50b103a28a51452d88bb3866d1daebf05eed038b091504f909020d84aa2b7f814321fee6b52df8c257767eb00978955f6096dcfadded7fca90e30f1daddd234 WHIRLPOOL 5c5eb0e86943ea43c9c19a7a0b8a92b1413ac18818277f88727c99e35d41c93d0dd6c5a235482b292fcd50dd9ec81aec63fb591c192b72f3515bfcbcc191fbb5
+AUX chromium-system-ffmpeg-r5.patch 3015 SHA256 b9b35f885f5662897e7d14a7335c9a2cd134a8763064bd3f1459dcec1b7b0cec SHA512 c52f20f3eeee5e2b0ede40e60d8f5da780f5e1fe91eaf83dc2aea206bbb54b0202acaf37e62bb1f456a3e4aefa4cd47285994b43abd1682aa0dab6a04a990bf4 WHIRLPOOL 57c1dce3f1aed33c8fa6f93acb9bece0d31d043e559a9bc29f04666604889f03cad99180d7c90936ca05a06fc926760484ae07420b7df651bfb80585883859b2
 AUX chromium-system-icu-r0.patch 434 SHA256 bfd5690c93dbdb56cbe93016b267c84be3dc67f7f8ed6c9e157dca9867260875 SHA512 5d697f97834315071fe9fb70979546a17b2432ce126f9d6e275a2a2cbdf0f64ace29e4c1d4285facaea6af35138d66046d7150ec71d2b3ed9e56da35daeecb53 WHIRLPOOL 79ad140bf926e4bbd0cb34d29a111162294c7e05001728da2e150dfb8ed968747cccd353f7cc4993d4977d352ba0930b2438ab9f5bfba25749ca9912d3a0fd50
 AUX chromium-system-libvpx-r0.patch 411 SHA256 9adf50fd15cab5e62fa4713e0e15f4525844d3d322f5f91304dd85e46d9b2b0e SHA512 0c0498656cb1162d1490191f8a5a70e274e27467c357b859adbc1b958e76235311654ef517c512dde12212ca9efc9f2ec7362fc2dc11bd85c3eb3529aa049a3d WHIRLPOOL acca1227aefc894606bac0a4a90e0a8b7a94d3ce8e0d15ce1157b40858f6533f45442009423369a6f742b9b796dcfb6208d2ec4898c5a10812f866a7b8aa877b
 AUX chromium-system-v8-r0.patch 397 SHA256 9b69099db82e3d4def410f887eb0b0b9006f4e68b59b8eb72d3b33c79a42da7c SHA512 83d44848d637d545aa851cdf2df81b24964d6febbde4ab28ff600f82ebd0c60a66059fc87a96bb1464363d2e2f098fe151ca3a9911f9ca2f3c11ba36bbf7e653 WHIRLPOOL 8fc87b7c1a0f8aca41ee17bef0d415d0f73619a2191807f5f0ce7340052ccb2fc0e34af033285fe62eb41b895b556b241f8c1182fa5daf68c6cc0d658a05af0f
@@ -26,24 +27,24 @@ DIST chromium-27.0.1453.73-lite.tar.xz 108370752 SHA256 b9ee6a9c6d4e21d2086a00d7
 DIST chromium-27.0.1453.73-testdata.tar.xz 138707228 SHA256 a6b75a301f6bc1aedf9332206901ad3cd9d57456d55fcf3b707325d1356c3374 SHA512 f77b0bd10eeaa695621edf96e7d88bc50a618f116631b4a7211ed70c9256cfb460a3aaa35358cd6842e7d39eeba8c53457d39cbcb6ad72a3a36c2a943d0c7c26 WHIRLPOOL 3d70576d572875e1856a28505570e2e336ff846c0bf85f32887fe71e2c08c4b701f9fa7bc9de0c10faa4b1ba5e8cfa526ab2af429953a80d8453f4d220687faa
 DIST chromium-27.0.1453.81-lite.tar.xz 108366660 SHA256 0069f205631de5c28653d4438fc6a40e60652501a5fa4bd96a610bd48bed0776 SHA512 5f54c29308a8c235d98399111eb51406fb32d80580b93c0164a791dbcd7c6b243fbebd38aedfedb71206f579e1a52929a17ad427b89a394731c3ab4ffe661554 WHIRLPOOL 6865a699603ffbff2b41857db49ac21e91d7788b9a87ad8815e11b4707d19509d2385f4a8a6572bd2f780cdce0ee8eb27f8f39f10ab504bd93de2763b58d381d
 DIST chromium-27.0.1453.81-testdata.tar.xz 138717828 SHA256 4b2f3d5b61c7196d46a677a5d7343ce7b1ef24e1536bf108e541fd3274a2611b SHA512 7247f058fd02aa8a5704b75287b3a831ff06ee03fe8bb019bd2b2526843d28bd18eaaa5cb36d4093217774ddde8635ca6092204a6fab35917bb3d472d335d143 WHIRLPOOL 0a288dc44e4aa9a6b804ce4d86f4ad6bcf19d14be447f331977139a300681a48a91e05d7b12429894a6ca8525c0c5f18c7346420d6c8b66de9fbca384def0fb0
-DIST chromium-28.0.1496.0-lite.tar.xz 113325276 SHA256 eca3e685d769498ce8c19d4b565f7be259116df62e1ceaabac48285d85434864 SHA512 93e16d8fc3d61419f8b9f43f284390d892dcda03f62e70bdc46870d0503887aa1ebfab22c3a76ce88af6c13591175c44352ab643f894df9801155828fb49d3fa WHIRLPOOL 739ae58d3e9b6ce512a0b8ce03e62cd08c28e8bdcadb0f081b15477631aed63570ad722b2ed20841d5a18cdaa474cc7389356e7da14daae70f36f4706b4fc588
-DIST chromium-28.0.1496.0-testdata.tar.xz 140539068 SHA256 a281f67272413112bd9ac5c1a0aee475d273a587c41857e6e46362cd426ee036 SHA512 6de4bcf0ddea2fb889156a71e8ec0f3b1af14b55f14c07209def3c616d18f3649f863abe4b0a458b21e432d075f7ac2253011292ff1c980fd14ae74a84f5daa0 WHIRLPOOL 612dc33549cadea923f09002ce94875b893769e0886e71638193a53b4dccab361af472ba884d70edda90258c1a09d745cbcc6a5cc5642743a733d0ea1f27bafe
 DIST chromium-28.0.1500.3-lite.tar.xz 113621772 SHA256 3d8b00a17d3a1c66f5c6dbcb5d033dc81ecfce1ea9fa0f9444d8fc0cd1535aa2 SHA512 5fb1e793c79c558f9d19f47c46638db1baca85fec00efccb0cc596fabcb903e7ed551a0ee27913101cf94e1eed6d24b620121edfef6ad6152e3d5e736bbab0bf WHIRLPOOL 9bd7811c5687d5c6d6396bd9ec259ed8b62c28d3e81d74daab61bcb1b17e7bc97d801c261e605dd73fbd629adedf73a6d6412c7727a733ce6f68fac40a316fb0
 DIST chromium-28.0.1500.3-testdata.tar.xz 141007852 SHA256 c49fba8420bcec4c847f76bece223ecbc8ff5c6625834e308e58d4c1afd74dff SHA512 d9a1ac5db99db0ae5b0aa8a1389b8e8fd167be3fa2403743b3bea0eeff886425be9b0eb5097977503a89787c36086480f8dbca791afacde9ee12052ac326e895 WHIRLPOOL 76adcf61d380ad72ec31902f28a4fdbf4571dae37a16f6c2610f506170a5230c4841cd9b940b98fd9c5fba3f5f16f96866e0c54cf83d0593dd3e8427c8550d5c
+DIST chromium-28.0.1500.5-lite.tar.xz 113619608 SHA256 df595c3433ec3ba25c68409c2eac03a6b2a4510e5ad641e7c2166359d130369a SHA512 cc735348abd40ab307a74fb378c28a69ec12c719415164ddf45362448e722eacd0208814d2cb07b47a544e49497846222738ae62d866b6d234848d9487c545d4 WHIRLPOOL 80490e39e15dd7416cbb12954413e810c7a34fcbca8e9ca0fe841131a68b042a12ecda19bb84ca273442f2c6c6206bff3ad591e86cc2fa3586ac09d194cb4015
+DIST chromium-28.0.1500.5-testdata.tar.xz 141039596 SHA256 94c85633060cb9d964edd75e9614b13050ef7f0bf17fd487bdcef189ac50bcfa SHA512 ca2fa9c44fd6eabfa050e03381cdc4bb7d0cac02418699e6047a9c9aeb5e5a49d85764da187b183993694cd97e4a162fbc9ac7ce8812b21c7855d44aaef8bf94 WHIRLPOOL 28913edced799ca4f632e1ae22dfc98c3ce117303ab5c3141fb95c8e013e5d9f8405eea0f3f4c552d3b98a3a14f5d91ea4e6a140c246b58f95ba557258f2e7ce
 EBUILD chromium-26.0.1410.43.ebuild 16049 SHA256 f49f9ed4a82964f84e51f5ce9832e2cdb492a56db24203b466f0303a6df1cbc7 SHA512 e4dbfa9a35657136a9128c9895d37278d801430ee7f2548e2b95792c5485b76a25a229fe2351e01f35378bad1b13bdcb037da18d2349f10bfd2b249fc2b545e4 WHIRLPOOL 7fc8f4fc871c60d02e1b7dba8ca4344a07c5c661e029217c0c2dae9ef4764588e5aa98ff22946d94eeef9fbb53cbf6fac0363b8b268e6e84df151ee8e8ab94ce
 EBUILD chromium-26.0.1410.63.ebuild 16166 SHA256 a01a9e49f044e3dd7194eee0127b267b72581771271bf86f19d8236523069b67 SHA512 415c50c72c5270dc4e80486b4dd328995269e3e48dbb5e74603aed5f2a9cddcf341b52d5fa2a8825c20691146617395c0900c886731f9927683a5dd6763d0a85 WHIRLPOOL 3fa509516c609ea34da827491fa6dfbcd10f7dbdca68fc58331403bf2bc9f80f36db8ec13f6e74a5e7ddc32ee5c795c9a0b31a1760922de08404a95410155dcc
 EBUILD chromium-27.0.1453.73.ebuild 17110 SHA256 d95379e469b18d477f6b45ebcb54e03876b65d43b28083bb43a45cf3f11ab792 SHA512 e72fbd92e870c6ae02c95363e5d459d51e3874e5920c119e45b843de944c3f5e47cf527e30bc0e590842810099ee523bc14312c7dfe955e271c7317fb244bacd WHIRLPOOL f2077fc138a7e1b2c3578e57f615f5591e6f459f32d034ce7961deb575307e5cd0ef57faa51febfaf5c8dd60ab68dd4f4d209b9d2c98095ba6532c6948090ead
 EBUILD chromium-27.0.1453.81.ebuild 17110 SHA256 cb49bf0075c5c50fc40f7cb82802595b04b12ac59c14a4206ee5faecd3cfd349 SHA512 36b74e47be9436ff7c6eeb7a1c736fbabc1b93ea8c6e2fef88d4721b9acd949a69c2bb40d2ded9c70c0cffd1eea33bc7b1db86c673ea4c42fde9f084b06a228d WHIRLPOOL 41192eaccb1fd81d662be6f441031acbbe1bfab2a84d67257ebc9d0aaab4c64248c8c8f0fea98f4fd8094222b6b24b4ceb9c212d5645f355aefd6060051ea7c1
-EBUILD chromium-28.0.1496.0.ebuild 16979 SHA256 346de32635f9d0785a03b5a0095b0168b493508f088954cfa42d35d9b63f7be6 SHA512 5ba12f735aeceeebbe5b716c6a8562b3d52b4d504d8357d2a92b80c91bde81ea880a223c0682fe5d7a058c5e175a1e82388cb3da037e64f2e9abe2728d323f06 WHIRLPOOL 77a30fcfa9fa16e4d8c99cd8c5ec9373d6b2480b65e8409d1678aaadbe91c3d6ef357512348dd3c33ede1e9df739da16dddb17bf97e6a1ce4547d140e3e0e9cc
 EBUILD chromium-28.0.1500.3.ebuild 17197 SHA256 1c70499513f83aaa35aed7dc3d4fc61ffb15e118a0e6bf08bd881c57ccd667bb SHA512 e7a02f994c52124e4c6366deb0f0c090f472c85762f7ee31c6e2071a567b67bf5fcea6b1bfb63e4a6905be292426491b610b574f27be71069714ebfc810edc4a WHIRLPOOL c3a18d2a786f2343392df6882eb0e1af333422316f74b2082a84bc134e12354d5d49005e14ca99fe77dd39c1292c742b1f287dc2c4c152e60ec3b225c451150f
-EBUILD chromium-9999-r1.ebuild 18590 SHA256 f812b793c25568bfc34479d55518017cd9df6288efcc04a87acf293aafdbc7f5 SHA512 d45d0af27c5fe95ff3ef3a220136b302ed338e2036e834a2aa8ea766eecda616ff2c4e01c9c660d3ff0ffa517d45091cf5b8b1e6eed7f3a4b8331e4c714c4a04 WHIRLPOOL c5ec604b24e6400b3cc86ce05367b4962e686e18a1c7a15365b2b8e626f5041a0b5455b22027b4e370e324ddede7cd59f51b7766bab7d956d00a779e895d5b66
-MISC ChangeLog 68549 SHA256 645c07857f92db81d682f093477fe9d6079a043365b85c9a5abdd95f3f397f2f SHA512 6106cc5262ca6ca2eb82201d57bc61d6ba5ef6d506ee930292bedd1b5f187f02f942dc00d08f35cfc6231b863a77add1de372bd799d34ac70b6b12200e279ac2 WHIRLPOOL aec6fb4033d4620ed00eccd57fa06979b84f204d1c2c029ecfda6b636c560b50321afff8df2883cd0a38074963a4da12e43b57eaaab89129b52647c6d6923e46
+EBUILD chromium-28.0.1500.5.ebuild 17241 SHA256 34301655111734d2b3af9a6123ba37292d980ff7503655715cc8c6acb9ba1494 SHA512 fbf0063dfc00e430b037dd7f3d831a4a28c04f6c83b1739e8c597bdd78672ff27303edbf4b19be691c100bec6294cd0247ab27bc74397cd5dbb726ed5c77cebc WHIRLPOOL c278815b8827684988e8e44a544aa2e35ddc2a7ce78a04692852a4c95e3ade59285c883026b78c46d0939f11235073e6ecb0e1a1ec504e665d4e2e52a89f2583
+EBUILD chromium-9999-r1.ebuild 18634 SHA256 6c70673d9ac374e288ed7525dbee8e277847f7c4027307c78fd3b970f71fb657 SHA512 0a46f65d60f5ceb38216314f2854107542641d26b55df38aea57dd6ce7009355431d877fb16b743072dcdec6017b6b5221d7e73c47eceebc20e3110c9ee4f7de WHIRLPOOL 000589ec5fe1d5dbfce233b310d15c59ec4d4597b0f8a02b771aab87a6d13358635a5006a9c33fcefc143dfda4fa8433878458cf1334c0c4d164191b3fff2933
+MISC ChangeLog 68947 SHA256 21a727ff545fc6157cfdbe928b3ec26392c0903a83e56ee96eedb806142919b2 SHA512 bd44ffa1c522596139552ec970d33ce082dd602bfe2d466adc2f3358f043b3c34e0c3ee09b70bfec598b46e7b325a7c180b480a23a6a1ae7048091c285a92c83 WHIRLPOOL 646f20248bf0cbe969b455c0793669f38674c4aa97030ec28d5c4f401167b5e996e0fa19be8146ba0f7950e104632f019ccc7628c94247af86621d8d9cf2d5be
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGK8QMACgkQC77qH+pIQ6TB/AEAnzpOXiXO5jJdm0gA42AALIew
-tKb8VC4QHW/TKonc1+oBAJ6hcUOV2pTWhn/5ju+Re+17LKCiY0tKEh0K9QgW2zKz
-=QCbt
+iEYEAREIAAYFAlGMDjgACgkQuUQtlDBCeQKwxQCgg7By16FwZGw5Dkf1nwT7fLUs
+h0IAnAxkYyPcaZvL6/3/Qr4XRo7HbaFq
+=mhFm
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-28.0.1496.0.ebuild b/www-client/chromium/chromium-28.0.1500.5.ebuild
index f11d09f58fbe..5457d2e49d94 100644
--- a/www-client/chromium/chromium-28.0.1496.0.ebuild
+++ b/www-client/chromium/chromium-28.0.1500.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1496.0.ebuild,v 1.1 2013/05/03 16:54:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.5.ebuild,v 1.1 2013/05/09 20:59:28 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -27,6 +27,7 @@ QA_FLAGS_IGNORED=".*\.nexe"
 
 RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	app-arch/bzip2:=
+	app-arch/snappy:=
 	system-sqlite? ( dev-db/sqlite:3 )
 	cups? (
 		dev-libs/libgcrypt:=
@@ -59,7 +60,10 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -127,10 +131,13 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
 
-	# Fix build with system libraries, to be upstreamed.
-	epatch "${FILESDIR}/${PN}-shim-headers-r0.patch"
+	# Fix build with system libraries. To be upstreamed.
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-v8-r1.patch"
+	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
 
 	epatch_user
 
@@ -168,7 +175,6 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/snappy/*' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
@@ -179,6 +185,7 @@ src_prepare() {
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/widevine/*' \
 		\! -path 'third_party/x86inc/*' \
+		\! -path 'third_party/zlib/google/*' \
 		-delete || die
 
 	# Remove bundled v8.
@@ -228,11 +235,13 @@ src_configure() {
 		-Duse_system_libvpx=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
 		-Duse_system_minizip=1
 		-Duse_system_nspr=1
 		-Duse_system_opus=1
 		-Duse_system_protobuf=1
 		-Duse_system_re2=1
+		-Duse_system_snappy=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 145df740e028..9a4cd1a7ed63 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.193 2013/05/08 19:17:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.194 2013/05/09 20:59:28 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -59,7 +59,10 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
 	sys-apps/dbus:=
 	sys-apps/pciutils:=
 	sys-libs/zlib:=[minizip]
@@ -184,7 +187,7 @@ src_prepare() {
 		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	fi
 
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
new file mode 100644
index 000000000000..be625ad67e9a
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
@@ -0,0 +1,75 @@
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
+index 17241b9..8a92312 100644
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+ 
+ struct AVFormatContext;
+-struct AVIOContext;
+ 
+ namespace media {
+ 
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+           'dependencies': [
+             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+           ],
++          'export_dependent_settings': [
++            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++          ],
+         }, {  # media_use_ffmpeg == 0
+           # Exclude the sources that depend on ffmpeg.
+           'sources!': [
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+--- a/media/media.gyp.orig	2013-05-09 18:02:50.958682676 +0000
++++ b/media/media.gyp	2013-05-09 18:03:45.009023680 +0000
+@@ -530,6 +530,12 @@
+             '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+                 '--code "#define __STDC_CONSTANT_MACROS\n'
+                 '#include <libavcodec/avcodec.h>\n'
++                'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
++                '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
++
++            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++                '--code "#define __STDC_CONSTANT_MACROS\n'
++                '#include <libavcodec/avcodec.h>\n'
+                 'int test() { struct AVFrame frame;\n'
+                 'return av_frame_get_channels(&frame); }" '
+                 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
+--- a/media/filters/ffmpeg_demuxer.cc.orig	2013-05-09 18:04:25.089276403 +0000
++++ b/media/filters/ffmpeg_demuxer.cc	2013-05-09 18:05:16.289599070 +0000
+@@ -111,12 +111,15 @@
+   // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
+   // keep this generic so that other side_data types in the future can be
+   // handled the same way as well.
+-  av_packet_split_side_data(packet.get());
+   int side_data_size = 0;
+-  uint8* side_data = av_packet_get_side_data(
++  uint8* side_data = NULL;
++#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
++  av_packet_split_side_data(packet.get());
++  side_data = av_packet_get_side_data(
+       packet.get(),
+       AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+       &side_data_size);
++#endif
+ 
+   // If a packet is returned by FFmpeg's av_parser_parse2() the packet will
+   // reference inner memory of FFmpeg.  As such we should transfer the packet