diff --git a/app-admin/profile-cleaner/Manifest b/app-admin/profile-cleaner/Manifest
index 0d45cd117..e211cce5a 100755
--- a/app-admin/profile-cleaner/Manifest
+++ b/app-admin/profile-cleaner/Manifest
@@ -1,2 +1,2 @@
 DIST profile-cleaner-2.35.tar.xz 6008 SHA256 d02f31fb0c5a7a07da33c8e9f1ccc3d814f2ddefa427d4b3422889b54fcdb92f SHA512 c06a0312722fd2d1c8b3e0541a941deb87bf5a1dc6462ad9c798c142b3fc0c8f2e9c161818bdef257e88d282d1697d21fd7930442c13d2a048bbfd758addc2cf WHIRLPOOL d4f5cf02127399979480b1e29410437f99ac8b4982161d9b42880f7f0419779307a3f1ffbff77e24f6a820b10cdb08b846cd9b6a5bf593788408554dd812e9da
-EBUILD profile-cleaner-2.35.ebuild 594 SHA256 e8c87d7ed23db613eea1fd2d8f880887c898a3711e549afa35ff45b10063c2b5 SHA512 746828cf5c7f1431fc937bd88b74226c187cc34a7ff7a1b0238663c960abda5b472cd9e54528cad4890b7ee57683b5f5a23253fb28ff807c2aa2e7b4ef8bc4a4 WHIRLPOOL 8886092a6894ee73dcb0bb0b00e2394e70dc2bf1939f46c4681caa7598195c47e4a59805b9d5f8f7cfacdbe46a5200d45db000d40abf47e2c94a4d92059a1894
+EBUILD profile-cleaner-2.35.ebuild 583 SHA256 9087fbbb5cf13eea8872f5d0608ec62c86f58a1b662519d07170d5daef067544 SHA512 764bb2808431069768c280ad0be8d8cc33917dafaf8010643edcde7b5ed4a16b3276e3d658a2eee850291687386cd95c70e8b12727a4da69cf5b722507aa14a7 WHIRLPOOL d078c4fd5a74bc11771cc579fa047d13c9e7cbcf09bf2c30fc6ec5925f89d30bc4a5bddcde1bc5221a84bf9abf83ac8092137977a2a327dabb3927e2fad84f95
diff --git a/app-admin/profile-cleaner/profile-cleaner-2.35.ebuild b/app-admin/profile-cleaner/profile-cleaner-2.35.ebuild
index 0e9e9f589..e440193f2 100755
--- a/app-admin/profile-cleaner/profile-cleaner-2.35.ebuild
+++ b/app-admin/profile-cleaner/profile-cleaner-2.35.ebuild
@@ -1,9 +1,8 @@
-# Copyright 2013-2014 Gentoo Foundation
+# Copyright 2013-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit base
+EAPI=6
 
 DESCRIPTION="Vacuum and reindex browser sqlite databases"
 HOMEPAGE="https://bbs.archlinux.org/viewtopic.php?id=148062
@@ -25,4 +24,4 @@ sys-apps/sed
 sys-process/parallel
 dev-db/sqlite:3"
 
-DOCS=(INSTALL LICENSE)
+DOCS=( INSTALL LICENSE )
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 4960ed74d..8a6046147 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,3 +1,3 @@
 DIST qpdfview-0.4.16.tar.gz 636095 SHA256 fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 WHIRLPOOL 47bc82937562fdcbdf17f567bb0fa6e8eebd2e657320c129e9fd4f592c27eab855e7d2d69a22b45666509ace93b12528811b0671cb9483607448152bb676f11e
-EBUILD qpdfview-0.4.16.ebuild 2446 SHA256 eb72f5668853e93f85e1f352988c9c8a2ac3aa73b52805d52f132f12ee781a55 SHA512 2aee4745face0e9418b622a50891d7af94ddd7ad434f660deeb5476b3ed07307cbc26021ea18e3b258f355ca00219ad32a570a454b4dd5dd5f39646bd8c6f0f6 WHIRLPOOL 3d4096ff067e3e73465b16065eb9e12d55b2caeb2173e168d87fbce9c35a70c0b8383217d7dda958dc2bf5125842339a4c4a74e89ad9b3e84b62432997e3ddc8
+EBUILD qpdfview-0.4.16.ebuild 2446 SHA256 7e85ee9273136b8051c9cac2d9911c08a48f127cd8ba689775377459eac94d12 SHA512 6e0421f7183058522ecd7ae22cd3f9a5905808528e7e24f67de5afd12555c6f4d515884918312a8f6d39d3f769b08b8b3459ce3d20127aea3940a699eaab5f20 WHIRLPOOL 3da806585db977ef5c1dc225d70b7e0b5a4c040bc002237f68c8abff9429e762790eddef9cb9233c835037778bb7a666b1bd6875e62ce108d015909ec3381edf
 MISC metadata.xml 462 SHA256 c661af36cffc0f3e5bbd875f66bf9e869e79f9ec7a5724a4e5b56e9cec98653b SHA512 49f6b64efb47ddfe78145e7d5a0236eeca6e5e41329b3845c8a193f6feb791153d30f8c64953d0473de65f0840a462141ed8f2c059121fbff1de98436f959630 WHIRLPOOL bac6e6c48d6138418eca76132bbfb1c0ad3801567bbf6ec81da8830c16a91436da74878fe571f93e5e4f6ea78de7efb7d2bfb5e722447b9f38a1347b26f8ff84
diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
index f332531c1..59f082cbe 100644
--- a/app-text/qpdfview/qpdfview-0.4.16.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
 inherit eutils l10n multilib qmake-utils
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 25909d61d..1966ad611 100755
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,4 +1,4 @@
 AUX libgaminggear-0.10.0-doc.patch 484 SHA256 952751686f15bfd30033d13d2333415c366906b30dc3ee1f30b0a8cfa67e3254 SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01 WHIRLPOOL d837bc29cfb52f20fcab146710707f7e5c5583c7baafcaf6155f22e7b6ccec06a13473e252f28c226a63d1f803950d0a88ae02bfef39348e9c071dc0f8cd3381
 DIST libgaminggear-0.11.2.tar.bz2 103443 SHA256 99abcb627242aa96b597ed831fd1e6df1e8a3958fbaf6cc8e8fdf04d62570d0e SHA512 bd7d4d8c513cb4542ccde12a72ebc816124e09cbb0122e3df70cbbe8ff536b79f4ef5925a1b9e495401b586663afe79d70fd27bb962ba29a7c95a2242143f150 WHIRLPOOL 36052baeef5ca0fd1a0e8c2e424e0acfbdabde166fd23ffa21ffbac417d8c78e68e2e05b1348e9822da3e19c02d27f7cab4937691f722036b9a2714a45550442
-EBUILD libgaminggear-0.11.2.ebuild 962 SHA256 4e854f3840321f990bae144f7067cdc6db756720119f361bc211316702632811 SHA512 ea6ebd9a0182990f22f6e4477b4cd5274475773933eb4796b294a4143701ee38d06d2e97107691d71c2a1cc71373787a474ce1e02478370deda30a487b2c62dd WHIRLPOOL d93432deffb1d2eb8755d3d977e793d3836382107db1140dbc86d64c8ccb74cfc32dc6ef1e1ef74433590d943c2187b3af7cfec66088c3295c380c4c7b641cf7
+EBUILD libgaminggear-0.11.2.ebuild 962 SHA256 9b09206c48c4b369ed4e63521fe7e03d9894f6d9aaccad827ccd382a590c18d6 SHA512 3a323e7deaecadd7eee291b1fc88d892a1d479705c490e0213957c9ba0d32af2a9436f9f12e472a12341f07c0b6e9a1ebe674edddfb29c9bf56fceaa2d2d0fa6 WHIRLPOOL 5a6371a739ef38176d2672b311b1373d4605e9b617bc28d10fad4ae57081bf9267790225cfd2e5e49db16fd0a7368a60e5da44d8f57c6919568453ea090dfed8
 MISC metadata.xml 415 SHA256 680b0f53b9757a989c75311e3aa9667ca1a380639d118588b787072541446001 SHA512 8667053c7ac631a83162813db90233b9200a696e9804b7fbd3d3a5e7e949cbf7cb07837fbcc73139f085e022f3a7a4cbaff0f6f87c9c20bb91208baa8420fdfc WHIRLPOOL a679d910c3fd577b86707d48919b08d34b1578cbe0a0124e14687c0347d3cbf3afe7d74f8feb34221168219796a47819c87b7752a127e50ba149e6d3709ced1a
diff --git a/dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild b/dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild
index e2cdc0d99..0481592c4 100755
--- a/dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils gnome2-utils
 
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 261b5d4a5..7768fe868 100755
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,4 +1,4 @@
 AUX gperf-for-infinality.patch 5582 SHA256 0a8c12b5a26a249e28aed6bb2a9e1b1c6e9e46e75f5f8413b33689aaa7551dd7 SHA512 b5fd1b3fb571ebe464f39623391b8578e11644b88bc90c6f5122a9748fb057ccdcf70c1ee31c1830e82de58d00eecaf9dfa3e708e7ae4a92b027c070afa4477d WHIRLPOOL e43194531c22b008cc02517346d4147b31a1010c3645717a1cb039ab3991aaebae1db713fdc57d907679aec672995f5b4be84264345d30f48345290d9ac7cfcb
 DIST gperf-3.0.4.tar.gz 983500 SHA256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad WHIRLPOOL 1d5da177f69c1628d08ca146be7637517c0884dd6cd7457e7625ddcf7207cf7697da53d1c62f3a9f8c8dccecc7613d7fdcccaac0e0d2490bafbd42018ad7407a
-EBUILD gperf-3.0.4.ebuild 858 SHA256 54336a231f9cba7cd6590a3c218cef315f5949b5a6a88248449e246035b37db6 SHA512 c4caa6d6802935ca91cfcdaa8c94930a7bb9c140572a8406c0a4d0a05f0be9eb09ed62bc49eb7e500ed91b8d0bf0ea3e2232faa0224947a5083fa5c8e4a638cc WHIRLPOOL 23081c50829e897eb5de192d264aa4d41e5e73d20a7d08abd1f3e3b38eb0ac15753267696f01ccb3186b43f5b76a9f298be5c4a1bf00cba83936883b6a6f2214
+EBUILD gperf-3.0.4.ebuild 856 SHA256 d94f5b3d506056b8538f64de80a0328c0ee0ab42f341970c4ee0dfd551d0443e SHA512 301c9b550748181e7bdcfd85d821ea3c30716ffccb96b18917652661a9a5945867a4643c5da372a6719edb8dca4a8c27a8418efba73b238c93e52521e3e61d81 WHIRLPOOL fc3faae493ecfe4bf397bef7af6b0f5517edea8acd5a5d2a9dab7369b84b73c7c886b9d38e28c1912148b50cc794fc4a95b26995e515dc7dcdb55de7e4a81638
 MISC metadata.xml 205 SHA256 d21d6a0a1b6fd19fab410547db011e152cdc7f45405b791589ea5ae3b18d223d SHA512 df0317039e9fafc269e0990c390407b6fb808139de22ef10c6aff842e5fc83d2e9a6b2be83cabc6da908c8af8499f56351a96e70ea86ebbd10c2d701914e2137 WHIRLPOOL 116c0717eb147758a82308843e42b7106cc8406c9a21e0faf2fb74f4a7360cd00e2c0130cee180ed234e2a9393745cb51cafbfcff1c86d9c209ca9f3b5c0fe06
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index 4488a2425..013632d54 100755
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit eutils toolchain-funcs
 
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 55d5be81c..ecd45ae61 100755
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -3,12 +3,8 @@ AUX 02-infinality-2.6.3.patch 201468 SHA256 f66f6845135d6b54fb11a9265a2f44a762a5
 AUX freetype-2.4.11-sizeof-types.patch 1041 SHA256 b5ed7a7a8c10f3dcfd62a14998e640aeef185b45e291e5e1ce26b77b0509f77e SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc WHIRLPOOL 28db0f881d43c83cc1628f095c24a0c27e9bea322a5973de7640a35559ceed640433da8307d1692c808638b0bce34ebe3cacc46a42f8c6c66bbb6aa675dd06ee
 AUX infinality-settings.sh 2907 SHA256 1b96e5fea1494eb193f0a9f37a34a9aba2a26dac66243fc4511908f5eee2673a SHA512 68bb0db444b11dddcaeba5015fa70f056159e48687ad2d94e5b09f4c47dd7ba978f6b17f4381d2e15fd2489322e294ab62fc1913f93ad922c2344ed0e93f225a WHIRLPOOL 9b195617d3485de1ef0853c7686ad02c51dabcac3f2bf653e8d1207089420a3f112f96e44afcd7b15d076e4c7f05c1ea1f8f910293e17d6e4927b91b7a4eeb07
 AUX xft-settings.sh 242 SHA256 a4b3db6882de85304c5e4099fca5832a598607f90e582bcd030df0e9b526cd0b SHA512 15130688f2ed5d362fc5071ec8e575677058e01ba217f43012db144df8d8cfcb3a9593d713449ba7db540a67ffd418c815f64b4f605526725f3e221b17c2d299 WHIRLPOOL e22ef08821864435231b398abf3fac3a62a6fe362116aa98c7cf3ddd356e37c97494bcbf8dca3c028b09e006a2859a2305e5fe1b81be6395b740e9d5d7a0586b
-DIST freetype-2.6.2.tar.bz2 1767940 SHA256 baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 SHA512 269d7a2ba728b4cb79d1d533ce93674bfd483566ab80bc6be0ec24f869cb65ba1fd852fbeff8f045607dd044845ce3d125374faeb14c986761b94dce7d1ff48b WHIRLPOOL d1ffa0d84605ac4e1480c46f7ff7c9c6f87137a539258c3a38900850dbf53cf4f752b57f2e5d22164020d62295b6c4e50ae529ac953b7591b3c3a034701d845c
 DIST freetype-2.6.3.tar.bz2 1753083 SHA256 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 SHA512 e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d WHIRLPOOL e17e87fe7b821730da13b1a54073fd0314025e3e15a41b10b5ece2731c8152c4d8dbe1fb7f26593794d70f15f6dfd70582678d48a8f068cec865f821eb3847a0
-DIST freetype-doc-2.6.2.tar.bz2 477268 SHA256 d5108a972d8f80561fd698aa856233999527375b4e8f6c82d2eafe5ac66f989b SHA512 7eb9c2cee68e0557a9c177db83525c91ea59fbfaf2a6516916b76b7b3d82f17cf08ce21f062cf1012ed872db612444a1ae6fa31290ee1b0377d84531a17a4dea WHIRLPOOL 1822b3fbe2c1b83c2add119defe0052d18fd2875dd457432f024d8b197b48a93cc05be2743a1290050aae9b935cb3790b5ed28cf1b658eeba5ee43781de752c4
 DIST freetype-doc-2.6.3.tar.bz2 5367900 SHA256 28b7cb0b1ff3962d386c54cdffd3891d2126292f57b4ea9ad0467f07cf68de7d SHA512 7731d96543f73ace8afc4b5ff2148c32a8dacbf01a976a6870705f73b45dfe1429ffa94406cdfc83b163b039c4d375c0c553a7d7aaad659a87079f357e6599cc WHIRLPOOL 71b01f8d5daf8e93efab5453f198d1790365fd010b5a137f4f34e93f6bc03a6a644900b92b8263973248954895c73e70cad64fe50b09bb4042627182299a5a1c
-DIST ft2demos-2.6.2.tar.bz2 191120 SHA256 819791a0548dcb8301c0f22e893ad7dadb1cb88cb37055e75f609bd436f013ca SHA512 570b6c6f072c93674b8cd27f9c42540e2bcd6b4f499c227634009277b0b6ac0833a2101285c5055a429a17be341cb2ff257eba25172a41accd4b43245908431c WHIRLPOOL a8f3fb54305ef8b0eb5161691546afdaa0cc65d48c9a7c411fe78fe8b5c11e118e6fccc579ac9e5d25d0199fce1e28a3d2c2e931cdae8080549cd5173cf1fa2c
 DIST ft2demos-2.6.3.tar.bz2 193412 SHA256 b076ac52465e912d035f111ede78b88bf3dd186f91a56a54ff83ffdf862e84e4 SHA512 1f23f9ab0bd59a06b8fd223bcc335ffba064477abee74d33308ddc28eb41e4ccf3728a52c36d4cab3995be695b56e1e099c2889f04e0835ba242b2938c5d2e78 WHIRLPOOL 1246985eca92e2e4d1b618d633602fc4114a69c1a8d715c51a5e96c17b3119fb3a254a577c876ad8ba9e2871bf59f4bd67f6721a706b3706a0a532728723f6a4
-EBUILD freetype-2.6.2-r20151206.ebuild 4959 SHA256 5ae5c086d787132d9e91ddb0f544b3961fd45fd666650943ca978f20c2e26bb4 SHA512 bd4b49c82b1c5b946c4a81d9b546d9dcb778134692ab1a638f4cabfb7e5269873ea6c3ed88efc7c4ffd7e17685d459435f3726f21ddda0537b424972fe762f9a WHIRLPOOL 8df1ff9bd101ecbfc4420346e0447833bcecdbf58f4f3028fb0fec0788d4c896d6eaa33d3464e551594650a4632ab8d4a190e34da34f35f9c99bfd9668192914
 EBUILD freetype-2.6.3-r20151206.ebuild 5038 SHA256 c47d5db431a02dbece9da3884368cd1ba0cc902e9245a004cb18a7973ba1cece SHA512 f9e69c85dbfea13e08ee1445901961e243e648e24b453bbfaf4288e2f3c1eb388bbbbf25bdd225206d5c03670f23fd61b878d09a2bbbc45dfc4de8c3fd177214 WHIRLPOOL 4185b4ea13e016da088026c19ea52d063d988a0261d380d1a590b89d898fc76674366c0f36570d858662e92d84b34269437f088ffea004238f3bb6c3e41863f6
 MISC metadata.xml 1548 SHA256 fa92e32766083aeb3c7f0472228517875f96441b18d9c54f636aa9f7b0d11a18 SHA512 77e335eacc737a8dbdf4d8c01f2a06dd5b0893954725b77fbe2adc3c7a9cd840fa5012d21bee419b9e8a2a5d45cebbce1034b7bc4b97a5efa5caff01399991c4 WHIRLPOOL f472ad4af32851d46401da5ab3bd43ba68c2ccae0702e48d9f0f4e4f5c7faec8b6d7689bf5930a3b7d810629567d15c39c80545b4fb9e407192bfa5373ed2c0d
diff --git a/media-libs/freetype/freetype-2.6.2-r20151206.ebuild b/media-libs/freetype/freetype-2.6.2-r20151206.ebuild
deleted file mode 100755
index f8a1fa0f3..000000000
--- a/media-libs/freetype/freetype-2.6.2-r20151206.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools-multilib flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="http://www.freetype.org/"
-SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
-	mirror://nongnu/freetype/${P/_/}.tar.bz2
-	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
-		mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
-	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
-		mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz
-	infinality png static-libs utils"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-src_prepare() {
-	enable_option() {
-		sed -i -e "/#define $1/a #define $1" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# This is the same as the 01 patch from infinality
-	epatch "${FILESDIR}"/01-${PN}-${PV}-enable-valid.patch
-
-	if use infinality; then
-		patch -p1 -i "${FILESDIR}"/02-upstream-*.patch
-		patch -p1 -i  "${FILESDIR}"/03-infinality-${PV}*.patch
-		epatch "${FILESDIR}"/stem-darkening.patch
-		# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
-		enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
-	fi
-
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
-
-	if ! use adobe-cff; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-
-	if use utils; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	autotools-utils_src_prepare
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--enable-biarch-config
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${ED}"/usr/bin || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/internal -name '*.h' | \
-		while read header; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/*.sh
-	
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	use doc && dohtml -r docs/*
-
-	prune_libtool_files --all
-}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index dcdcba895..35281bf12 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,3 +1,3 @@
 AUX qmmp-plugin-pack-1.0.1-fix-build.patch 1043 SHA256 718e6440844c81ca4fa9f82f1acce44035ae04b0eb13cbae70b0d9e836f22b9e SHA512 f83993008ffe24f1c0dda9ddbc817d5d38d2747ecfc8725cb100a50a71d069fda3b1009bc4620a4f667850e73482bca6f02a091073f949e71de2827f6c29d160 WHIRLPOOL 0812fa9517a3e94977c81df5b39bf8f81e9c61220c5ffa3a67790c0c87cd91e29f82ac72c829773407f9f830a21fba4cceac0b38f3dd5b71f9f6200b4e2e3dd0
-EBUILD qmmp-plugin-pack-9999.ebuild 836 SHA256 57bfbf5e329e40189b3387bfaa66a959eb1def96e9f854f760d0c7dfcd5825df SHA512 e7ad6c63e7c0ca13bc475075e7538023fc317a909f75dd609d31f933c8eb313056aa5967263f930493f6c68246a8b2a4a374d6f9b11df8495197a6f64a7bb904 WHIRLPOOL 06cedc0975a0bc25fc23aaa81426009197858161b6771b8bd6e4e814a8093772bb82c02a9a0b3a1118a4fe5c9ef28d413b02f466b4a6d0996b5b04054f999839
+EBUILD qmmp-plugin-pack-9999.ebuild 836 SHA256 e798f00edd7d03340c73dbbbba88228cb0b7ddaf81e1c0a359045a37e9ac1d04 SHA512 6e444b08a7cfeaf3f7db4630ac2596accf19d84ff47efe674cac45ff9fd5d662c78875b178d30f70d2ca743a6c226613390aad2ab821fccfde37f0a10e4e32d3 WHIRLPOOL d4297f741ec79edd266a239a383a1e4950cd57a7df9cfae98404659b801a18e3ce5b1a0e450b61904099bf3178675128a1411573a95e52384baca14f2dec4cc2
 MISC metadata.xml 297 SHA256 971a8fe01aead9fc3dd4926f84f63b5175064baa2c3a5e9fc47742fb438aaa17 SHA512 88d36b92d4920f89a2c8dee6f83db0c5faf54b1a9be6df814d347810fb4af7622ce150d6e4c6bd381fe20c2b7436929956d0a7d04fd3aa929192c53149672acf WHIRLPOOL 6120cc5cb7e41f3087c34e14bf905dd864fdd6bdf316c403645d9deafae91e0ca90560a9c33081b10f8f67b97a5c9a54c902d7336c6dfbd5510860f994970aae
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-9999.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-9999.ebuild
index 4537e18a5..ce5a8e29b 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-9999.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 CMAKE_MIN_VERSION=2.8
 
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index f8c5c556d..0d98b3030 100755
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,4 +1,4 @@
 AUX deadbeef-0.6.3-remove-unity-trash.patch 1341 SHA256 b180aa2de29803c1b5218d541515156b062ef63cd896d784ae5676aafc885736 SHA512 aaf5086ef3517ae1531d7e6aa152019908f7e67a82b4032dfb6d277227ea7dabac1b5dae70bfd216540f47ef690330b2ef877d75f449d3af2b99b860f0ada12b WHIRLPOOL 97e412fa4bea4fe14e683d98b91d623f57e1dda029784932013411d57212ffcd3fa6ea310ea3b68f1b8f7f046f31f2c1050357c57d3158fd9b6f2c59d6a893ab
 AUX deadbeef-remove-pt_br-help-translation.patch 379 SHA256 40c6c686bdbe6eb4526692c54fa8d80097552d18e7b3b260a79086f874eb8897 SHA512 e02897dc52499928512a914ab775dc8818f0661c00bf9d706582c35c567629b00e2cca73c4b627b6ab029b5848f637580c937087a0bc2f1fa87fb83b3269770e WHIRLPOOL d3dd433e4fc11f9a2f2fed083c95bce3872dc76aced8f7f4104edba45c30be3ae0b249a0ff5bce5bd70586fbdd2b6b4c89d08728db7f7aeb74db1824ea064216
-EBUILD deadbeef-9999.ebuild 6301 SHA256 17ce70aedcb628c6389fa5373b686fa3e4e8106a601ca0c6dde871d1dbfab392 SHA512 3b986e532b5802bd699041b19a411ddbe533ce2f23339ca3fb0c0f5f9739e35c7e1d4c27786611caef522c1e43afee1db5208fcdac1391e757181c263d0bd2c7 WHIRLPOOL 1efaf64d082259d0c2b7cdbf2f2eb3643ec75a2aa9a9773a9d8fd0cd57d8fb7aa8e777f231dc2ef653a39e151fae9ab0522c4ddfe23d968ba8c4f375efd70574
+EBUILD deadbeef-9999.ebuild 6299 SHA256 4f4af170654cdbaf70b86274ca16a2fec47a95d0dbe9e2f6a369e2f87def39dd SHA512 b459ec645bf33972925fa55fa187ac829700745d475dbfb5de96ea8d8dec63f18ae9bfb036a66422b10aad4b1376623eb47cd52e5451e9967b563e75b569e435 WHIRLPOOL 04a7d12cedcc8eb25e73f73e3a6aad44ef7a247e4e8def6bfd2b0ce23949efc4e3feff510a179eff987d1fb58c1df25d4383d2298c9989f8b335ba286647386e
 MISC metadata.xml 3230 SHA256 cb28392a8d49ffa59763d51704374d2a9e196bf7b9d5b9cf1b05817a93f13727 SHA512 8cd04d1445d366402a2b393945fb0709ba515eaf63c8aa96720211d1a57abdaa096507cc1e86bea3764744fc6a89675472b7c7305a78faa6f225a26b4eaaae3d WHIRLPOOL b58afbe8de4e87c8730cc3bacbf1dcf202c417136eefd4c7acdf1aed357c0243f2ab481d5a86c33d2e2d6562b372b350ff75228b49ad2ee296676392925c4db8
diff --git a/media-sound/deadbeef/deadbeef-9999.ebuild b/media-sound/deadbeef/deadbeef-9999.ebuild
index 2911b21eb..cf92a7310 100755
--- a/media-sound/deadbeef/deadbeef-9999.ebuild
+++ b/media-sound/deadbeef/deadbeef-9999.ebuild
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 PLOCALES="be bg bn ca cs da de el en_GB es et eu fa fi fr gl he hr hu id it ja kk km lg
 	lt nl pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr ug uk vi zh_CN zh_TW"
diff --git a/media-sound/rbutil/Manifest b/media-sound/rbutil/Manifest
index 22170e9c4..92da5af9b 100755
--- a/media-sound/rbutil/Manifest
+++ b/media-sound/rbutil/Manifest
@@ -1,2 +1,2 @@
 AUX rbutil-1.4.0-accessibility.patch 2263 SHA256 96be6510f3a3d6262826ac3937b81a08e4c0b075c4e941c25ef4ba73dd7711bf SHA512 d9e1ceab006ff828e09eafcaded6c905b9c8b60f9269be415389a091a43df933c7e381d8242479e626c9f11a9d3bf6af6ea498fd8e39af15ed3259d9e36934db WHIRLPOOL b66a73226caf38c76e1d5c9ec2d84b7b18751a9dd7b51809f21cb7572e0b5599359ab6e096deeaeb4ca0dbe32782cb3ab11f7e88910f9a0b1f568b29a8145323
-EBUILD rbutil-9999.ebuild 804 SHA256 362a50403cb536b9b16b4a84bb2e1af237f44d4cabf2cab92da0cdc536e1cf79 SHA512 962fc1089b45d2107b5340e74ef8cc0bf0155ec48d28ec44ab502443861d84187eee7c5ac68f08d74164b62f54148aca8a15286e26e8d19b0f7515ef8ef12b49 WHIRLPOOL 8290045b9e6559ef8f114c58cb17f96a931553dd44188e3fec1a5058ceac253c5ed03809d1f99b240f67c2fda5b7c196efda5560124d304188ac7e763c9df6b5
+EBUILD rbutil-9999.ebuild 804 SHA256 4fa52fe9a97abbce3f32e78a453f6337a38895b5047a7e90552698db0b86a9e3 SHA512 fba5cb098cc9918029bed83d0bdab8981e3a93069dc2591cbbb0a9cb14943976f552a0c2973daba1dae1a3c363200ba4da8f7fda8a8bbd44e8e11243f5b92a73 WHIRLPOOL 369feb5dac335ec96d948ff563f202e1d5199201a404a648632bfdd43407e58b6cb9a255e382a907a44af52080af51e70bf85a69a7e778ad8c88609d0fc4759e
diff --git a/media-sound/rbutil/rbutil-9999.ebuild b/media-sound/rbutil/rbutil-9999.ebuild
index 455118bbb..346d3cf1c 100755
--- a/media-sound/rbutil/rbutil-9999.ebuild
+++ b/media-sound/rbutil/rbutil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils qmake-utils git-r3
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 719c78a61..aa02653d9 100755
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,3 @@
 DIST waf-1.8.19 100743 SHA256 2ed5471a08df258f8557875761aad67e80b2dc846482dc11135a35c77c91b4b3 SHA512 fd9426345751128a5e5b826262f3da4121c0f6ac9c99878bdc417938cadcf04c98fd7207e8766d0019cb65b3fd7239cdcb4aab62bcf41f20bcde9ada90837af2 WHIRLPOOL 68a480d099630858cab33d52b25a6271ed93b3137cb4389d63e39e935f58f18e6bd72d0abff5f1b22d94d3137af794f3fd67d33d23ade2191471b4a702299845
-EBUILD mpv-9999.ebuild 8249 SHA256 00b8cfb69068cfc43ee75d3fbee8952cec0b6d6437a279021e7fe39bc3734ea9 SHA512 147eabca2bdcf2a6da8f6eb39a2741b6ba4d506bc0dcc4fd99e036a1f0af81c28ade4ff02d56018109a00113c0a313241df4858dbfb3442e3b504d14932d86e7 WHIRLPOOL 4479606ed80b0ebb8494ed549eaa80ed61baad845cce2e29f1bca0e30133baa968a3f97a6ebe83cbca192d9ccdf7ee80e72e2b27060886280e2d5472bce1d7fb
+EBUILD mpv-9999.ebuild 8249 SHA256 d4a1db458298dc7dd58d633f8dd5897e7728eec5730997a347d42debca4130f9 SHA512 91cc527b48674b1be0a8391e406c76bc4366b8436526a62a2db2ada9316c5065013443d87d44eac09eaaf1eb26a72e2da539bdacf5c2c36b6425931cfe174521 WHIRLPOOL 633f16f1740874fdc0501ce4d48e82f420d57364a832cfa2e2ec0a1c86f5719d438cd8b6d86ab4f3441717413c64f9b7729d8d3179ba5f61462681b885df475d
 MISC metadata.xml 2472 SHA256 8429f2d8d792d9d3226b78b6d0f400758f9eaee55d209fe0451e4e096db98688 SHA512 4f34ab495635e51af73d341ccdff6350176a89237662da3ed7a3411b6f8a78b9dd9a60f23470116c8533bbd99d4d63cd61c1c7767b675ff7c25bda5e5715d3eb WHIRLPOOL a6f6c1bc8385185df892fc44871e043f181da25f04ef12ea1dc6236e03236f3a53ac1350195ad3a75151f6f86c3557fce1f8ac654eedb57c8922bf4b8de422b1
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 847b68747..de62c1eda 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 8966552ee..b7d37f877 100755
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -2,5 +2,5 @@ AUX amuled.confd 433 SHA256 51229885825ecbd2a3fa95ebccc2b1e383ad5af6b95227fce677
 AUX amuled.initd 1228 SHA256 6e6d9d6b76324c835ab923c2f217de95cc8ad1feb92d6ac7571eb86f31b71180 SHA512 9ecbeb51a1a1872300533ebc425866caf85c4d9bbe0aaf98b1b271818a8e6314bbbb4e7b3725c48e5fee9da56e7e0faf814e8969953965aff65c80f4e36758af WHIRLPOOL e510f3ca5dbf4f88b0d781d74b4ea3baef1605b2917ae9527f12d25df6a3c9b63efd60552fe835568b5ccb98f812082734e200b3de7fd9283d29a0bdc3f1d5cc
 AUX amuleweb.confd 854 SHA256 3564ccddbe9ac3413c963db97257d9991220a31f02c29f7f7cb3cbd9fbb7c53c SHA512 064f78893bfb2cb2b05b8fa5f1fc64f773eb4655cfcfa7d2351c94542810c8cc49ba4e48512c44356c8e8f95a38e625de86d95e4b19897a28c03fcb0d65788b0 WHIRLPOOL 7d7b377146cb0ceb008460ce20f2f553011cace98c9dfb0569d9b5664f265e3568f6b2543cd9e721013c59fda84429e088a313456ff526f7ba9fa4eca3198c35
 AUX amuleweb.initd 1236 SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1 SHA512 80a8c71d8b57239d69f6b7ad5c15a04d33f5e6e802b23b4f8f2e3286a4b707f9fd3e20e4c4faac797be54cb7df8f6a2fba892cbb88ab36dbe6f5a40353671561 WHIRLPOOL aaad4a4ba1116330d20d6b68ff9fe80efa37abb8c1a4a37b54d63dcdbe8668eaf0886442a68b2a0ba947c09c7472b2ebbf96a599068a02b08ff73af66c8f0ada
-EBUILD amule-9999-r1.ebuild 2379 SHA256 51dbf71c8875a59ab64ef3d84316cffe5f467495c87c1b31e8f77c918ce2c529 SHA512 f01f42925c3cd86595fe2759a0d04142ed4f1bc396c4fc9007a8433ee48506dce1efcf19ceb14f2238354f6e112aaab4466bc61ae59a64736baa2e0a147d003f WHIRLPOOL b9c49395b4326302c75640197ff4fa0c05a2c3e2d1bad374a6002d3e681a6ab64f78568b4e882e2e390cc5b77776d2dc607085d802f00ead22f70ce0c44669a6
+EBUILD amule-9999-r1.ebuild 2377 SHA256 3457cb8ef9d2bc62acf8af9d5491636dbe1e47a1a91bc1e5200b0cc6c8955603 SHA512 23ad228b1f0bd77817d3da223466f409ba611077d4a856bc1c796614c044207648ea84c352d0f3404a0892bc3646c037df1bdaaf1b706c13ebd57d22f2feef9c WHIRLPOOL 1ee6b57461909ccabd46d5d26f3f339c1bb2eed75142082171adcf371930eb95ab4aa9032070e7917b60dc06a073642a085d6b27f10dbea5643babe6e0ccf1f7
 EBUILD amule-9999.ebuild 2606 SHA256 f3a5f8c60573c27b95bc7a38e2995684062fb5b9da562f9e4e213f675457dc2a SHA512 cba5b061f6dda66daaa943ec3161fa1162a43e297962346bf1d569d1a19046e289aa85a70993fe4c6ac53653d3cccc1ca1f3ecb3fb063f2590f91658235f8120 WHIRLPOOL d86be6d8a725c4890b699ddced1e23cc7738a37c718a21c43149edfad49147ebe73d0461da032792e91e9c28bbaf4c3ea8c39c777b954aed36a074c0708d2331
diff --git a/net-p2p/amule/amule-9999-r1.ebuild b/net-p2p/amule/amule-9999-r1.ebuild
index 116f2b7a7..504a31b1b 100755
--- a/net-p2p/amule/amule-9999-r1.ebuild
+++ b/net-p2p/amule/amule-9999-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=1
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 692bab98b..5716475e0 100755
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -3,5 +3,5 @@ AUX transmission-daemon.initd.9 2131 SHA256 ab1c267f3e3687ba0f5dfadd5ffa9edc6971
 DIST transmission-trunk-r14657.tar.xz 3383124 SHA256 16b810dcab1b6f85a1133cf256a9092cef43e02d95fbd4090f3007e34bdf6a8f SHA512 0b463b53d9b68dd77d4a4d8c05a5cea454ab77bd3d974e5327d158715bde61a3a58695c7c8c93543a47b688db3f33b5d4cf9eb75ded55f0fb3729b54d6367e93 WHIRLPOOL 9406dc5b99595f6d987ba785af10bedf00b7491980aba6680ea766142683d0c4c33d1ca823b9226e02c3111059552942df1135c4765ae53f1f821e84470930b0
 DIST transmission-trunk-r14673.tar.xz 3386536 SHA256 fc6fcd445889f6da77a41ba0bd0a761ad55696557d7339f51db7100cdc61b378 SHA512 fd72f0cde937e5c7bf5df228fb030fb8a4c00d8f09f6f4211527bd5a882ae02525e1d2a658d32c1271d00433738ef08f1ce5cad47943a89e749cfd909635ceaf WHIRLPOOL d2839f84012d78ae39011c1748c723d69917158c63720f63cc2b8ae1a08ea33f48f24eb4b19bf9bcccd50b131eb5e75b42ecff53a4d54ef174108dcec70f22f2
 EBUILD transmission-2.84-r14657.ebuild 4280 SHA256 e5e7f2facb21c243b08768835a7b0451e465c03439e060e43d473e5eac41d388 SHA512 48a3d70985bf7edc7934022020f898ec6387213d7b438acbadf94dae9d7dd5da5a352d8599390127926168b9d884c3ac1772d3f606a9a3f5cba6f912755204c5 WHIRLPOOL d5d773e9fe90da8392443bb4af847d5fe62cb4b9889a050d79117efea4b4a3173529842f5d63dc6cb9f363818dc0100f8904fd92e0d1b8ae6ac97d88d33b0f62
-EBUILD transmission-2.84-r14673.ebuild 4302 SHA256 57eb28cf504f101ce6045f9cddd7d73a39ddad00907580e466aff3fc9d3407e7 SHA512 95b909137fdd281cc5b832e2c10437de07b07d3bd709cdda11e0fd9c6fc0c1ab32755f2f93290ac4911d3ac7d2b8e293669dfa687c50aad9c726a98f8ea28aef WHIRLPOOL 4d207f488a908e4e4ef90d6a695bf6934539c9b31fe98ae0cd52fc6a8c47195ca8ad461dc0aceee3276727ac5a88be72398809cfc24cb405dfbd05adb4ff84b7
+EBUILD transmission-2.84-r14673.ebuild 4302 SHA256 66c9786037c725ef20f2868f1ba8fcb8037073636013e7730ec41e078a99ab08 SHA512 5f82ec448b1e5644f06789bea44381ee1a3ec1452b11f368bfcf0ec55ff35e6f4bf7d74aed3e8700e41ebe9934a7cc0b3b86b7f68d0f994b788dce8d9c68c614 WHIRLPOOL b9134fa6c3508eda31d131813ac98055e9b979b68788b1852107573a3da173e66ca664bab66af2f5124837a02ef46c6b30a5321549ae8c19c83c4294f3fb0a09
 MISC metadata.xml 565 SHA256 24a46a84d802b76d60d1f9982853a16e215436e40bf4030af9d8b376135e15a4 SHA512 2286b82af792127b3e533bb0610e3d64c5911ee1536a71d8e918cd6939731baae4efc6117cd6345635ca2ac5dd5ee4e6556e194d505f0f7dd4c2f46b15802dee WHIRLPOOL df0e5444ce5553077cfaf0d2a363c85914be0dd86dc9b4b9e4afcb9be65e60bd061142e2fc971f5a05cd5d3687b03e9d61336f5fa9313cc5a6e51ffd3a6c00a7
diff --git a/net-p2p/transmission/transmission-2.84-r14673.ebuild b/net-p2p/transmission/transmission-2.84-r14673.ebuild
index 3dd0096ad..cc12bf00d 100755
--- a/net-p2p/transmission/transmission-2.84-r14673.ebuild
+++ b/net-p2p/transmission/transmission-2.84-r14673.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils fdo-mime gnome2-utils qmake-utils systemd user
 
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 4d08ccd1b..b922e5785 100755
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,2 +1,2 @@
-EBUILD bleachbit-9999.ebuild 1605 SHA256 466c5a74f0e11d14106c46d84b84ea193e8b7efcec4e36a6ddefe8bb467ffe73 SHA512 15d9f3a1a6033534c443ab56f5122a95504f4bd8b0abda7d4ee7df4f69ed7d3a3ef3db4115db2d9354f9bae843cea0df45061b3ae6653206384ef76ac2b35498 WHIRLPOOL f93daa34966703169145130344567a111aebfcf70bd2bff2daab7c10e06ef83d4a4dc053ed7227e5d70ea27a65b83c246b3a562a172cfeb785f334310b41906b
+EBUILD bleachbit-9999.ebuild 1605 SHA256 d0b2628fd48b3b9807c7656eb13b568b9f5334ae02451a6e530dd75ed53f3ccc SHA512 379283fb3827acda5ac88d88242daa5861f92610f6af92381d79657a340beb0ec1e14bfa7a1bc0d08a48e00e372113d5e9420a8b81d74b3cf170799004a41257 WHIRLPOOL 8101fadfeca30a836e21abc0033ca5f9a66c63b82efcd75987191a65770487022cd5ae5eb475a7a4ee2f5f7fc533c246116d20d493fc02e0e54547e2737f701b
 MISC metadata.xml 371 SHA256 ef14292d4e3d8a556ba5d7451e30a25adf8cedd194509db4e66b5cfe87cf28c8 SHA512 cc2343f9c413c0dfb7fcad9fd5a52beb52b8d3b4c34c4efe57d706fbff680695fc037e2bf6c70429dd48399f2f3e7fa25954cb8fd7e0fb361fddb699d5061bd9 WHIRLPOOL abb78341dddd4a68d75201b073380d6f894cc8e8ff1e51c1363affca491f02a9f4283e85d93d9ccb9d30a726dbeb0fe2f141d61a0d518b250158056a159e15d8
diff --git a/sys-apps/bleachbit/bleachbit-9999.ebuild b/sys-apps/bleachbit/bleachbit-9999.ebuild
index 8ffe9afa8..e5c3c966c 100755
--- a/sys-apps/bleachbit/bleachbit-9999.ebuild
+++ b/sys-apps/bleachbit/bleachbit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_GB eo es et eu fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt lv
 ms my nb nds nl nn pl pt_BR pt ro ru se si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
diff --git a/sys-fs/android-file-transfer/Manifest b/sys-fs/android-file-transfer/Manifest
index b409e9913..ac137348e 100644
--- a/sys-fs/android-file-transfer/Manifest
+++ b/sys-fs/android-file-transfer/Manifest
@@ -1,3 +1,3 @@
 AUX 2.2-automagic.patch 3236 SHA256 3a6dd9f04c362dd315be1f36d008e3a93de85f06d436d4e792fed3bc90441123 SHA512 2cc96ab7981656c29282fbcd0fc1fbd29e47cc3bcc7bf153d62c77d8cacb76514df0de9e06dccb761234d4393028444de0635c24aed629650cbf83a804d2dff2 WHIRLPOOL 7b4c7623770035f29faa41b068a1fa1b1fae32ba41323f9a2ee7a153852abcd83b82560f5e84fad35e83d112b0293062f4949dff81aab4949cc154f713dfdaca
 DIST android-file-transfer-2.4.tar.gz 106684 SHA256 ce51656babd15d6742af86de97fe1566311860e1e4a99763c59f1cd99d028314 SHA512 b26474db6cee74dd1e170f8807e754d43793506c9c749312d99035115106b1fd18640079492f9ff06022cc87e6328b2fb304fbfbbb9e0449f87d13a42484d0aa WHIRLPOOL 33db472fadbaa03f764ae63ff08d744fddcd5af564f3222fde400c5095d373c7cc936298c647e00018e9f81371b914ca2e652cd28bd0bfe9cb68f6fed9d227c4
-EBUILD android-file-transfer-2.4.ebuild 938 SHA256 a498f1534a10148ef80ac11cad9d1aedccc7bf7e9252857f16738590441aaad2 SHA512 4dd8282ca48e7aa53358f489df7a81e51afb8b2449f3e1d8367da85639303ae838abd82d93339f1ac6c50759710b3744db6365aeb1ff9e3c06b24c4a3602ee60 WHIRLPOOL 9fc7a803742b7f445d01e0006f6ef59d6df03d52d1393f7f8e223ae0d0507d323b2f2bf2e9f01f2f7c4e6f8ea4b50fb5517e494f9ac320e6579056cc5a1de30a
+EBUILD android-file-transfer-2.4.ebuild 938 SHA256 dd39e9a76a7f8a0a5113195ba1017b5d86b563837fb0cce7410bd3786515e776 SHA512 617c5d6c034f40748b61bad50a513bc26d841d1b47dc76c0c0a82ba4ad72ec57beb595bb8eab36af075defe86e4507ce416b3620b8b95e8220c6aa5c4b9a172c WHIRLPOOL 06c6d0c50236813fffa5d62421e52c822ab14e427448d41a4f029154c510a3c1e998a51137a3117c1e11201910f3e044449dc439630f9ec26eaf82a9e697859b
diff --git a/sys-fs/android-file-transfer/android-file-transfer-2.4.ebuild b/sys-fs/android-file-transfer/android-file-transfer-2.4.ebuild
index 05845942d..8d9eecc3d 100644
--- a/sys-fs/android-file-transfer/android-file-transfer-2.4.ebuild
+++ b/sys-fs/android-file-transfer/android-file-transfer-2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
 inherit cmake-utils
 
 MY_PN=${PN}-linux
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 9e38af4d7..fb7c81d87 100755
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,2 +1,2 @@
-EBUILD f2fs-tools-9999.ebuild 779 SHA256 62224254ccf0e2476635681e43ed1ca8386c42fa75758f448890efe6c0b095f7 SHA512 6210d81e9a5578b6c53522fa5e9467b6f9ecbd6d1db77f2d74c6d608233b80e3f29f3bc82c7bb6a369794ce84312b76eaaffbea37427ba090cf5ce02724ebf7b WHIRLPOOL aad6549db5163f178fbf9c21ab0ae18825d743fcafbbda2b60fd20d6fa31f9befadc491a12da476278f15315cecdc6fb0f7afe7581577e9f9aa7417d4e5a6cb2
+EBUILD f2fs-tools-9999.ebuild 635 SHA256 b440e37491966e1aedacbd9856ebfc6046e1105d3cddb8cf34cb8ac289668079 SHA512 295d84865f42749ba2c55c9ec0f17095803c5c18e546288d687cd51393bf3d1fd88f4455f97a797b01abc196f964689de0d02f99e85159a25441c11c58340db5 WHIRLPOOL a6401407fb33cd4ce8e381c07687549e2df1156f36c08b4e77aebc69476ee9f3877915137710988d6d4e07b30fefae6347068ab9e1385756c70b5ca19333d8c3
 MISC metadata.xml 318 SHA256 5d0b43afc839d004d932bb1e643b0e20f50ef0a2e2fdb00c26cb36bb0139e0d1 SHA512 0042871c857e0e2f77e5f0838674c78a76d40b3c302a1a39bfeb578a6ce87050a51250cb717496533d682c84c442b3bde4bd119612fd77e27f44381e91eb4191 WHIRLPOOL 17673b40122601fddf2745bed152d9c7905619445f0ab3c3dc5946be0a2d0f1a91ed062d79f01138a63f64555ca48b2d3cb1be1d9c9219ecf1eeab17f6a50be9
diff --git a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
index 7359130f7..9f2130732 100755
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit autotools git-r3 multilib
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
 HOMEPAGE="http://sourceforge.net/projects/f2fs-tools/"
-SRC_URI=""
-
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git"
 
 LICENSE="GPL-2"
@@ -17,16 +15,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	echo 'mkfs_f2fs_LDFLAGS = ' >> mkfs/Makefile.am
-	eautoreconf --prefix=/ --includedir=/usr/include --disable-static
-}
-
-src_configure(){
-	econf --prefix=/ --includedir=/usr/include --disable-static
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf --prefix=/ --includedir=/usr/include
 }
 
 src_install() {
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index a037c1c8e..54ec7d05b 100755
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,3 +1,3 @@
 AUX xfsprogs-4.3.0-sharedlibs.patch 2310 SHA256 23bf3127cd1eab6e96055d2a5f3ae61f417a8d4ae52d5c421be2bbb05576bb46 SHA512 6d7ad2bc8b74390f81ecfa3774c837d083dc7e3332bd2e5450c4d67805d54f9727afeace39755e5d1185a230abcc9644bf2eb1544708d81b4f93a419aad8fdf4 WHIRLPOOL 5adb3dbffcd788e27e228d9d04a5991a20fd4ae9b8c7e32996b33fe71451ce2a468299f5abb40ff416b8abff399a7c0f7b4d3102b10f4e6bd830b3d0b57768c8
-EBUILD xfsprogs-9999.ebuild 2628 SHA256 732d20f6158d70b64337e9dc9e15c88eafbad556e6efe8a26ca3f43a1b37d0fb SHA512 d8fd73ecb9eeae411de8d55980ef7955e47b9d326b7ca4030e72be78432279bbae6fa4b5797544acaa4e790527deb0a09c0e4c86c0a14cc5af1343f3d13372a8 WHIRLPOOL 5558043d1cbed36d137e64f746ee8ab6fdc0d7d30fe1ee43bb9ef39b8e3bb062e1256b0fe88f6fb24207ace73996582f109c3666a0ac9389b9f01716a48b3809
+EBUILD xfsprogs-9999.ebuild 2626 SHA256 5ca83ed0b555b2904e290ead1cee22443bdae6f0419d1d73e0d426a59089302b SHA512 0585d9b1f5772731e0f4025421462f571c0c07fd7d3fd9d0288fb4185c1a2a843155b14f457efa71b20fbda0a3577ca5f436486088f7aa9acd70851a9cca263c WHIRLPOOL 4f04dceb636fa8a6fdd339b247e18a12532671201e0ef4aafa4c81f027eed1235543cfc99837e8e5cfb1e1c24807b4c9e89f649cd78fcabd687a1d5d1ce8102a
 MISC metadata.xml 164 SHA256 16b98e11bade8b75abec6160c61e72a254a0ef0ebe18cc26a9485305f5a20552 SHA512 a03ffe860fc268c96fe8e31837ace3dfdbb869736f612f2e64008cd7389f0592acba9415d1c24b8fedcda9d478f6779fa664f2ed4687a688f443fd582b667625 WHIRLPOOL c4c7ed06236b7db1698576834762a8cf762f043d90e9bc00428865157f0cbc86d3c851284cb1a38d53ceffe4293344d3f5a9978b0bea6aa5a50f75f204e4f7eb
diff --git a/sys-fs/xfsprogs/xfsprogs-9999.ebuild b/sys-fs/xfsprogs/xfsprogs-9999.ebuild
index 237c6d3df..6b45156c6 100755
--- a/sys-fs/xfsprogs/xfsprogs-9999.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit bash-completion-r1 eutils multilib toolchain-funcs git-r3
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2d295fa68..fa5865573 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,26 +22,24 @@ AUX chromium-werror-r0.patch 1636 SHA256 93c075c8c690e1b50061e3b8ad4bbe12bc3749f
 AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b482856030f43fd56273bb4f0bbc319d158 SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a WHIRLPOOL 2d2ff0b11c3062ef4c4873221d986dcd6018130d687d487cd32e4912e957332e12165114a69e8e86919338cfac2ad61dd521637fe4be6d7b3b3deed21b008365
 AUX chromium-widevine.patch 1461 SHA256 b352ea3512368fd77b6d342a043645a61204907c3c0c564b31ac7a7aeaa6e7a5 SHA512 da5948c28b0446879502eb0b1490bf06d1ffc8d93fe4bb769f50835b357af7691d474083262b5b5d89ee46ab295e9cab475a8e81833c45f9cfdcecf024f250c4 WHIRLPOOL df860509f7a845f13edf8794340ed5496ffc31662237d73a29404337a629309db6bc442ed4aca9a5844349878a60082f05670ac28cad487c78d7778aa413fbd2
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
-AUX chromium_vaapi.patch 19306 SHA256 b1856ee503783e5e1334f8302ec97336349cc8dda101edcbf3066a67d6bddaf6 SHA512 dd0b287df856d5395fe2487a147be80b958d5bb8a60a938f134a0053de0b89c8a372a61bfce4d38f414da9ec4fb2976d41873d4828e08f60754b5fe829e05f15 WHIRLPOOL 82730584124fcf069a5f8a586c9e3259d946bbe8e6720796d763b634dbbbcba251425d13dbba100ac80e773dee49752119851606eba62d9e017c871033ee0d47
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
+AUX enable_vaapi_on_linux.diff 17637 SHA256 90c553ff3ed19a9b63342fe7fd19f81ffd905e2f031b366491ab3fecd1c803df SHA512 6b5a6b872f061bb72399043ecb50b1b07886d4598abdad18982eb0971f55dcea3ba907ba8f691ca2bb80d05bc38eb6d9469a17df85c307f63606fbc73b944e60 WHIRLPOOL c9ba9f2ac2e8e638c8448d0cfce9c818f05615023e97f2922786d6ba865a559561b3d8e838851836daa647093bd0957791e3e2a876e6437dec9c8e252bf1d9ec
 AUX inox/add-duckduckgo-search-engine.patch 17405 SHA256 05f1a3a921c7e41535a67272e8a511f96e341b55d2549344c5026a5ebea38e4d SHA512 f7414e86e4f603dccd501fbe4f0860ff05f68fa6175f2a1eb831d212f0ede77faae5ef8d8d9a14db7c79eb796059c9a8a5db57ff97d3929b45476d11a6272624 WHIRLPOOL 0ee2269c388ed807194416404c84c2fef8e4fd29b0072a67ba27e3ea957b8919b6adce4564d737e818ebfb92155acc67c725a5b4ab32df1fd39d379cf756ded6
 AUX inox/chromium-sandbox-pie.patch 306 SHA256 cd0d2b665f9d39f7c25929f8e1b85b9a391b4a5a8a70d005cd815bbf2bb4e548 SHA512 45906fb516d11154068af8111857318bf5ebc004797b4168a60260822e3590e7955b3803b4bc3e0b9bec67f36bb5c594cda7955e56144207051dae3b671bcf01 WHIRLPOOL 7dfc2cd652603c3479067e5e84b885457d0f79423253330da90ccd97fa91896a16f2cd94d0dc815436212ecfbc5b8cbf0cebd6c0ae2881556b7620ded55b4b2a
-AUX inox/disable-autofill-download-manager.patch 2350 SHA256 4923cbcf3f5b8d8b469b23dedfedb36b85a11761ac07dd0e1bfd976c3801a322 SHA512 23b5998eb3300379146beb2fbea5d8d3b4bf6e535256fdc68cb5140ce14b777cc5d8b2f14b412bf5e1051d7606aee0f4ae32eb2dc4d945727248f15b1a34462e WHIRLPOOL a73e93e52b9d915dd3b8aeff2be80f7b57fdebb208a60e2181830709384cbac58b7d71ad33e05e2ffcf9b80b8b7d5afd62b598a056e4c49a7b18a87e044a80a0
-AUX inox/disable-default-extensions.patch 4690 SHA256 da61f378acf468851d084534c7c6d4afb9711534b92e58aea3e4bca98a38fa4b SHA512 f7bbd9453b06f0bd360445a80351993fca6bf0aeaed8927ba9fba78557fbb2244ccaed688a2eb580f62edb3d4e769f14ba5a356c314a31ba058f5e9040231e8a WHIRLPOOL c64008c8f77a78743f28e43acb77f189abc85d5583e15acd05c86f38f44057d3d0bfe232b3f0bffec690650d94fc94cb6c9a1c6b676fbb75fe20e8acb71428e4
 AUX inox/disable-first-run-behaviour.patch 1372 SHA256 c47efe038f502d4fe2b66e59347b01c58ee8739a8d8f050c6c1cc60752d24f13 SHA512 f218afa7fc69d2642676d9fc3853df3613fa24496502728a337e8334b5b440234fc17e75232c07458c1144acdbe85adbf232f7fc518728a9fab723b91f4cfbc3 WHIRLPOOL da2158d04ff50c02a322a22d52ba7ed91b16656f5d54750dc226025005ad0d9c2407535256bfc677fc750c90ce056c1e6abbc5aea7beada84633d602800b7132
 AUX inox/disable-gcm-status-check.patch 999 SHA256 b081462f645ffab7aaf2c310761c269329d3d22a36cf463dd0ba5ebb3da2141e SHA512 bf5cda4d43ef7d3bb5e23826d3012b70ca0c58b6f379d251487350e9147c596411438fa54518bc1e1f78d9465bc9406367268bb8bf5b6cee77f2a9658835d817 WHIRLPOOL 027190072e60eea8dc46a3502b8e6a7d4c2da225acc5a729e68644c9224b6ea6796bbb13d30c2c02bc8a839bb2f90fafaa728f569efdd66f77011aa3339502c1
 AUX inox/disable-google-ipv6-probes.patch 705 SHA256 562eea848542f76537a9f3993bac397b523d0ce419416daf0bb4dd17f5203c7c SHA512 54d98d666cd058845c36476bbe23d2a7633c96439050dfdc91f1c7c7b6fac575307cdae3e0ef0c42ef67cbe4114b4c8a65d756ccfff066c75d474f95a64c39ad WHIRLPOOL c709bc5511763ca91d25a27048200124b8bce9f9cfd00367751eddebc92fa66e554dbc118ace26655fbe95722fd7a629fa9edbd0a11466c0d1d37f2b56fbbf0f
 AUX inox/disable-google-url-tracker.patch 2831 SHA256 59ebf0ff2227eea507bf113c8f6ff4768dd168b6fa7cc2195172d2757a5df807 SHA512 feb050f03eb136b645786a4d40971353002abaf18361661f5bc331ba40e62f7d89813532bf300919b22e0fe8129dcb2728649701cbac37cfdec46080ff15b2ce WHIRLPOOL ccac1cf231b8b8843e6239288f973b2df8eb8e0cf8a23cdb8a87fd2af4058552ef9a80a826ce357d5d64595afe31bdea992ee72a5c98d6030f8034ab31bffe76
 AUX inox/disable-missing-key-warning.patch 315 SHA256 55b75daf5aad2a8929c80837f986d4474993f781c0ffa4169e38483b0af6e385 SHA512 8eb02b592f80f78a8130cc76b07c6380e45807946965fb98b3d2ff873b3cb1404379d5fbd37ee3684900afd9463ee1115f2496052d9c0c69f343c143388bdd8f WHIRLPOOL 9e97b526576922654d5a5b4c1eb749fd6d8183fc39ab07ed7dc847a0cc11916e14e7fabd1228beed894468e43f77d0df5c837d32c0e245ef3e6d727c8e7440d3
 AUX inox/disable-new-avatar-menu.patch 1115 SHA256 9e37751dca4a2b60681ba14119bc3839685ae420686664de7dfc4245f9eeff3c SHA512 4e84d2608b339abda6075df9c9bd3b1573374d317eb2fcec42121ad7410f23a90725aefc5c8a0e23651217bba3a20710b5516dd54b6882abb4dca456fa750730 WHIRLPOOL 2a2082be48051b2184f9240e79db7f7eda5ab5aa402d9883efabef0a989354ed2c18bea667d5c37279de70891828e48d4a79e5c49118fe49fbcc97978d4d0548
-AUX inox/disable-notification-promo-fetch.patch 1189 SHA256 64b5e27c57017b80c3e1471d0ee9fd45901392beb9ffe69fb4362f701eccc6ae SHA512 98ab269557f1596b3a55c14b789fc6287467d9db47bcf862f74ac49b5591caad60f02c57256ab4751975a14fff82e744273bae6d57688866a7667eeea39286dc WHIRLPOOL a6c7288086e5aedc3c86ab45209666d92b7275c658852312d0d6f68fd0dec1fc98b5fe2f2c6969d83f67ff6f6477e65a51e261225d977dc9e8b09f6aaea16b04
 AUX inox/disable-translation-lang-fetch.patch 1941 SHA256 0362593751abc09bbf2244109c93068fc9a40a51ba4dbd17bb2b107ff50d7dce SHA512 6d8fae31222864cf7e7fd2ca73535863da475deca95bfa9f67c7f08bab353cb247785db513a60e5c1673fcda13bcdbbd9c45489005d51191f909e59118d7a5f7 WHIRLPOOL af4bb0dec0fcc63eae19d9838d7fa1457e80c464bdf3ab9dac0d8c45e6a25eca70848afcb14b3e901d4289abc9d327dca8f677ba398799a86eb6fad3ab54a1ab
 AUX inox/disable-update-pings.patch 499 SHA256 e94dd87a3c28cdee7fde1c05d0ad2b76dd72a60819dde0401ef66828ac492bf2 SHA512 eb531ebe27f0f59c85bbc2f4541606f8d1c7c9d140eb1fdf6acffa4a96465617ef7213f708519124ba2b042fbc8145c144c708a310b778157f3088903dbc2c58 WHIRLPOOL 46ddf46b8a0d6b65dd3890ff06d9c05d7ee7afe35118d12743a52dbe93111a5f1ae548647d81a29a6362d87940ca4c48f6b937fdeed7f4518e9c56f8193f85af
-AUX inox/modify-default-prefs.patch 9808 SHA256 81f5f881e10d974b2a770b68e8becc25db22781252e85d0b7323f2c1236190a1 SHA512 3036b5639cb21879fdd39d0a029e8824eb8a7bf690b7fe6734f40964cbbaef25ccd533c903264b5f0eed495ec62eaddd29c288cbb89330babfb4c4a142c4d7eb WHIRLPOOL 7992ef54d0d616539c471ebf43eb7d0da6f946ed8eed72e50f52017b5b4b22536488a49acf2380bc195c1a5a7795f51a74e346008956c17ace12b9b515c61ae9
 AUX inox/restore-classic-ntp.patch 1440 SHA256 2aec3f9a8a3f9f64caf1fdaae797a617199739c8b0ead1e176aba1bcfffcc389 SHA512 b46ecc51e89e94653347023ac458c4185d85fe3716ad148f393f2a1c412edd3f98ddb58a5b982024a7d612aa351b14df493a1fe2a5d1ad4182cdff1b76ebc410 WHIRLPOOL dc217cf34f9c6fc3312cd141daad0b5f7d017462b26b8d00cee5dda6523a8db667d561c127b912dd60326bf90a76e0160dce8fb82f1ad6df04b18e0bd2373ab2
 DIST chromium-48.0.2564.109-lite.tar.xz 355147876 SHA256 2c31711bd77f24bd71a02535358883e9d125b046775abbe1f2149c1797d6d72c SHA512 3552dfe9ab7d03fc98ac8466b31479d99c7fe120e16e0e356522d7cb49a17fc1a60721b7f397557b63ec9a40135a130fc6f9e583860bfed0dc3c52d9d1844b14 WHIRLPOOL b1812227e9f7f4075ed8929ceb401f780753330b38be40959165f8c2736e599b1f48d97a7cffbb1fb1ebc743dd63367d6dc9160855c218ae46275e207b50e119
 DIST chromium-48.0.2564.116-lite.tar.xz 355202592 SHA256 22576f3e0451f289cbabde265fcb6b14aff926591d6f8c08ff5ea82cb42eeeb3 SHA512 61f560075f421943356550e64084ad82f8c58519d3f533b63a943619f968849e4c201d3a6b0ca5fe8516e30f8a523bb74a06d7782b7c9053df084bf4b76dad0f WHIRLPOOL 09e09371b27c035ad88c6cd0c0e243dce6e4c3e0e4007fd887c5ae09ef3b5fab468abb43a39bfcef42fa2bb4613f2eae4aa116db3cae8a5dbe78c5b4af2076a9
+DIST chromium-49.0.2623.75-lite.tar.xz 374614208 SHA256 56acde30f28ff85a6a7d0db80a8df0baf976331d649cb7a4d268d2638252cc7b SHA512 f85d6806448f20bcd0fe9a26fea9f88b04a4e14cd634d6b52c0c79cb89334d8e1c5db9cc334c74e2f6b953c17fb27ed98a27c600003549f6148a303e65cd9289 WHIRLPOOL ec1bd888713f4b2f3b5f4774810b0e729e420e296f1cf386785bca5c1e02b5ba40c1e58b4888d5b07b998418993d0664f36cb54bda9b5c71d5567ff8f3501db2
 EBUILD chromium-48.0.2564.109.ebuild 22112 SHA256 23e0f15dc9780c1411ed5a3ab07be011e56567e03825c801b64f1dadc7f3305a SHA512 79f80e1d893af133cc73f15ed3a5584585cc68b96a527ed9aec3b920edbca87946de28e7fa4bae312847951eccc272bfe7ac5cacafead61312cfe2d144f26db0 WHIRLPOOL 22f47fa231f6867952f93ef4ab5b5044a14c20465ca3be54153951ec567367b5899b631bd5fcdc4e18612bf88f25e15065b8c8902795887581c97c231b4a61de
 EBUILD chromium-48.0.2564.116.ebuild 22112 SHA256 23e0f15dc9780c1411ed5a3ab07be011e56567e03825c801b64f1dadc7f3305a SHA512 79f80e1d893af133cc73f15ed3a5584585cc68b96a527ed9aec3b920edbca87946de28e7fa4bae312847951eccc272bfe7ac5cacafead61312cfe2d144f26db0 WHIRLPOOL 22f47fa231f6867952f93ef4ab5b5044a14c20465ca3be54153951ec567367b5899b631bd5fcdc4e18612bf88f25e15065b8c8902795887581c97c231b4a61de
+EBUILD chromium-49.0.2623.75.ebuild 22252 SHA256 a8804aa0aca9b5c6e7eaf9ee8b2390f392c8cafc05ea7aa0983e927a46605fe4 SHA512 8691a9f46f3157c286b143ac82cb978fe284ee27813f73b06a0788c3e62d9bb572348a079fd351f2c5a160bc0fae737cd16a65a314dd818906eeed6bf1323b50 WHIRLPOOL c5372abaed49192faf7fe28f03b63926f98c87c441be2f77c961cec9a880878f2175c46d34021ed554efceae39ed39b6577b514215a424a03a1e931b2a497d85
 MISC chromium-47.0.2526.111._ebuild_ 21202 SHA256 5b6eb12307cba6536a9c29bcfca6940fa14099f7ec62d289aea4bf44e25d8d0f SHA512 eb965065b778cfff6ec360c52c51d4edfc7318400af8f12b0287e0dea89cd7c975ecba18474c39a42d62788faaeebf71187963feae0745c357071f04824bf698 WHIRLPOOL 3d17a98ac9690f019b568301182ffb89dfdcb57bd475d9f5076fd0c11bbe9c3ecf4d83c9185dd22813e9ec8766847c076be8ae4a26f5f5499c92ba2f73409da9
 MISC metadata.xml 1201 SHA256 6ca21612411528d2fa2692ff724de28bfa08391a9b819b20b43bcaf65e83b0a1 SHA512 31b5fcb0e30a1a33b3cfb9476c742b9793bf44f0aae3a35fa4d095f9c1b473abc859c9881d5bbc07f2fe0d987d4f30333e2b1942d910dc4e6741c3f5bc234c53 WHIRLPOOL a81a2db8d48d3715eb01919f06008298179d12f2fe0fa5de50edad4f7b87fa8dd55333100b4b37e45338f45dfffadd950a7158722f47814bb80175953c9e1a27
diff --git a/www-client/chromium/chromium-49.0.2623.75.ebuild b/www-client/chromium/chromium-49.0.2623.75.ebuild
new file mode 100644
index 000000000..e02b96f01
--- /dev/null
+++ b/www-client/chromium/chromium-49.0.2623.75.ebuild
@@ -0,0 +1,723 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="cups gn gnome gnome-keyring +gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux system-ffmpeg +tcmalloc widevine vaapi"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )
+	!gn? (
+		app-arch/snappy:=
+		>=dev-libs/icu-55.1:=
+		>=dev-libs/libevent-1.4.13:=
+		dev-libs/libxml2:=[icu]
+		dev-libs/libxslt:=
+		media-libs/flac:=
+		>=media-libs/harfbuzz-0.9.41:=[icu(+)]
+		>=media-libs/libjpeg-turbo-1.2.0-r1:=
+		media-libs/libpng:0=
+		>=media-libs/libwebp-0.4.0:=
+		sys-libs/zlib:=[minizip]
+	)"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
+	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
+	epatch "${FILESDIR}/${PN}-snapshot-toolchain-r1.patch"
+
+	if use vaapi; then
+		epatch "${FILESDIR}/enable_vaapi_on_linux.diff"
+	fi
+
+	# Inox patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${FILESDIR}/inox"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+	if use gn; then
+		conditional_bundled_libraries+="
+			base/third_party/libevent
+			third_party/adobe
+			third_party/ffmpeg
+			third_party/flac
+			third_party/harfbuzz-ng
+			third_party/icu
+			third_party/jinja2
+			third_party/libjpeg_turbo
+			third_party/libpng
+			third_party/libwebp
+			third_party/libxml
+			third_party/libxslt
+			third_party/markupsafe
+			third_party/snappy
+			third_party/speech-dispatcher
+			third_party/usb_ids
+			third_party/xdg-utils
+			third_party/yasm
+			third_party/zlib
+		"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/angle/src/third_party/murmurhash' \
+		'third_party/angle/src/third_party/trace_event' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/re2' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/woff2' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		'third_party/speech-dispatcher' \
+		'third_party/libva' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf_gyp=""
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf_gyp+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gyp+=" -Ddisable_nacl=1"
+	myconf_gn+=" enable_nacl=false"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_re2 (bug #571156).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf_gyp+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1
+		-Denable_webrtc=1
+		-Denable_google_now=0
+		-Denable_remoting=0
+		-Dsafe_browsing_mode=0
+		-Denable_rlz=0
+		-Denable_hangout_services_extension=1
+		-Dbranding=Chromium
+		-Dgoogle_chrome_build=0
+		-Denable_web_speech=1
+		-Denable_wifi_bootstrapping=0
+		-Denable_speech_input=0
+		-Denable_pre_sync_backup=0
+		-Denable_print_preview=0
+		-Dtracing_like_official_build=1
+		-Dfieldtrial_testing_like_official_build=1
+		-Dfastbuild=2"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf_gyp+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	myconf_gn+=" use_cups=$(usex cups true false)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf_gyp+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf_gyp+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf_gyp+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+		myconf_gn+=" is_clang=true"
+	else
+		myconf_gyp+=" -Dclang=0"
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0
+		-Dsysroot="
+	myconf_gn+=" use_sysroot=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf_gyp+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf_gyp+=" -Darmv7=1"
+		else
+			myconf_gyp+=" -Darmv7=0"
+		fi
+		myconf_gyp+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gyp+=" -Dwerror="
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# TODO: also do this for GN bundled ffmpeg build.
+	if ! use system-ffmpeg && ! use gn; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		if use vaapi; then
+			build_ffmpeg_args+=" --enable-vaapi --enable-vaapi"
+		else
+			build_ffmpeg_args+=" --enable-vdpau --enable-vdpau"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	if use gn; then
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+		out/Release/gn gen --args="${myconf_gn}" out/Release || die
+	else
+		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+		egyp_chromium ${myconf_gyp} || die
+	fi
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	if ! use gn; then
+		# Build mksnapshot and pax-mark it.
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	if use gn; then
+		doins out/Release/icudtl.dat || die
+	fi
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium_vaapi.patch b/www-client/chromium/files/enable_vaapi_on_linux.diff
similarity index 63%
rename from www-client/chromium/files/chromium_vaapi.patch
rename to www-client/chromium/files/enable_vaapi_on_linux.diff
index d69503787..e5abdc5db 100644
--- a/www-client/chromium/files/chromium_vaapi.patch
+++ b/www-client/chromium/files/enable_vaapi_on_linux.diff
@@ -1,60 +1,28 @@
-Description:
-Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_policy_linux.cc initially came from https://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+Description: Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_policy_linux.cc initially came from https://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc.
 
-Taken from:
-https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev
-And rebased against chromium-dev 48.0.2564.82 sources.
- 
---------
-
-diff -uar chromium-48.0.2564.82.orig/chrome/browser/about_flags.cc chromium-48.0.2564.82/chrome/browser/about_flags.cc
---- chromium-48.0.2564.82.orig/chrome/browser/about_flags.cc	2016-01-20 21:01:19.000000000 +0100
-+++ chromium-48.0.2564.82/chrome/browser/about_flags.cc	2016-01-24 12:37:54.343633831 +0100
-@@ -1017,7 +1017,7 @@
-      "disable-accelerated-video-decode",
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
--     kOsMac | kOsWin | kOsCrOS,
-+     kOsAll,
-      SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
-     },
- #if defined(USE_ASH)
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-48.0.2564.82/content/common/gpu/client/command_buffer_proxy_impl.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/client/command_buffer_proxy_impl.cc	2016-01-24 12:37:54.344633997 +0100
-@@ -667,8 +667,10 @@
- 
- scoped_ptr<media::VideoDecodeAccelerator>
- CommandBufferProxyImpl::CreateVideoDecoder() {
-+  TRACE_EVENT0("gpu", "CommandBufferProxyImpl::CreateVideoDecoder");
-   if (!channel_)
-     return scoped_ptr<media::VideoDecodeAccelerator>();
-+  VLOG(1) << "About to create GpuVideoDecodeAcceleratorHost.";
-   return scoped_ptr<media::VideoDecodeAccelerator>(
-       new GpuVideoDecodeAcceleratorHost(channel_, this));
- }
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-48.0.2564.82/content/common/gpu/media/gpu_video_decode_accelerator.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/gpu_video_decode_accelerator.cc	2016-01-24 12:40:38.968995605 +0100
-@@ -33,7 +33,7 @@
- #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
+Index: beta.xenial/content/common/gpu/media/gpu_video_decode_accelerator.cc
+===================================================================
+--- beta.xenial.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc
++++ beta.xenial/content/common/gpu/media/gpu_video_decode_accelerator.cc
+@@ -34,7 +34,7 @@
+ #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
  #elif defined(OS_MACOSX)
- #include "content/common/gpu/media/vt_video_decode_accelerator.h"
+ #include "content/common/gpu/media/vt_video_decode_accelerator_mac.h"
 -#elif defined(OS_CHROMEOS)
 +#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
  #if defined(USE_V4L2_CODEC)
  #include "content/common/gpu/media/v4l2_device.h"
  #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-@@ -164,7 +164,7 @@
-   // can be initialized by corresponding VDA successfully.
+@@ -164,7 +164,7 @@ GpuVideoDecodeAccelerator::GetCapabiliti
  #if defined(OS_WIN)
-   profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles();
+   capabilities.supported_profiles =
+       DXVAVideoDecodeAccelerator::GetSupportedProfiles();
 -#elif defined(OS_CHROMEOS)
 +#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
    media::VideoDecodeAccelerator::SupportedProfiles vda_profiles;
  #if defined(USE_V4L2_CODEC)
    vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
-@@ -341,6 +341,8 @@
+@@ -346,6 +346,8 @@ void GpuVideoDecodeAccelerator::Initiali
    }
  #endif
  
@@ -63,22 +31,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_a
    // Array of Create..VDA() function pointers, maybe applicable to the current
    // platform. This list is ordered by priority of use and it should be the
    // same as the order of querying supported profiles of VDAs.
-@@ -354,11 +356,14 @@
-       &GpuVideoDecodeAccelerator::CreateAndroidVDA};
- 
-   for (const auto& create_vda_function : create_vda_fps) {
-+    VLOG(1) << "Testing create_vda_function.";
-     video_decode_accelerator_ = (this->*create_vda_function)();
-     if (!video_decode_accelerator_ ||
-         !video_decode_accelerator_->Initialize(profile, this))
-       continue;
- 
-+    VLOG(1) << "Initialization successful.";
-+
-     if (video_decode_accelerator_->CanDecodeOnIOThread()) {
-       filter_ = new MessageFilter(this, host_route_id_);
-       stub_->channel()->AddFilter(filter_.get());
-@@ -438,7 +443,9 @@
+@@ -444,7 +446,9 @@ void GpuVideoDecodeAccelerator::BindImag
  scoped_ptr<media::VideoDecodeAccelerator>
  GpuVideoDecodeAccelerator::CreateVaapiVDA() {
    scoped_ptr<media::VideoDecodeAccelerator> decoder;
@@ -89,108 +42,131 @@ diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/gpu_video_decode_a
    decoder.reset(new VaapiVideoDecodeAccelerator(
        make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
                                          base::Unretained(this))));
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-48.0.2564.82/content/common/gpu/media/vaapi_video_decode_accelerator.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/vaapi_video_decode_accelerator.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -325,17 +325,17 @@
- 
-   base::AutoLock auto_lock(lock_);
-   DCHECK_EQ(state_, kUninitialized);
--  DVLOG(2) << "Initializing VAVDA, profile: " << profile;
-+  VLOG(1) << "Initializing VAVDA, profile: " << profile;
- 
- #if defined(USE_X11)
-   if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
--    DVLOG(1) << "HW video decode acceleration not available without "
-+    VLOG(1) << "HW video decode acceleration not available without "
-                 "DesktopGL (GLX).";
-     return false;
-   }
- #elif defined(USE_OZONE)
-   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
--    DVLOG(1) << "HW video decode acceleration not available without "
-+    VLOG(1) << "HW video decode acceleration not available without "
-              << "EGLGLES2.";
-     return false;
-   }
-@@ -345,7 +345,7 @@
-       VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
- 
-   if (!vaapi_wrapper_.get()) {
--    DVLOG(1) << "Failed initializing VAAPI for profile " << profile;
-+    VLOG(1) << "Failed initializing VAAPI for profile " << profile;
-     return false;
-   }
- 
-@@ -362,7 +362,7 @@
-     vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get()));
-     decoder_.reset(new VP9Decoder(vp9_accelerator_.get()));
-   } else {
--    DLOG(ERROR) << "Unsupported profile " << profile;
-+    VLOG(1) << "Unsupported profile " << profile;
-     return false;
-   }
+Index: beta.xenial/content/content_common.gypi
+===================================================================
+--- beta.xenial.orig/content/content_common.gypi
++++ beta.xenial/content/content_common.gypi
+@@ -878,7 +878,7 @@
+         },
+       ],
+     }],
+-    ['chromeos==1', {
++    ['chromeos==1 or desktop_linux==1', {
+       'sources': [
+         'common/gpu/media/accelerated_video_decoder.h',
+         'common/gpu/media/gpu_arc_video_service.cc',
+@@ -936,7 +936,7 @@
+         'common/gpu/media/tegra_v4l2_device.h',
+       ],
+     }],
+-    ['target_arch != "arm" and chromeos == 1', {
++    ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
+       'dependencies': [
+         '../media/media.gyp:media',
+         '../third_party/libyuv/libyuv.gyp:libyuv',
+Index: beta.xenial/content/content_gpu.gypi
+===================================================================
+--- beta.xenial.orig/content/content_gpu.gypi
++++ beta.xenial/content/content_gpu.gypi
+@@ -38,7 +38,7 @@
+         ],
+       },
+     }],
+-    ['target_arch!="arm" and chromeos == 1', {
++    ['target_arch!="arm" and (chromeos == 1 or desktop_linux == 1)', {
+       'include_dirs': [
+         '<(DEPTH)/third_party/libva',
+       ],
+Index: beta.xenial/content/content_tests.gypi
+===================================================================
+--- beta.xenial.orig/content/content_tests.gypi
++++ beta.xenial/content/content_tests.gypi
+@@ -1757,7 +1757,7 @@
+           },
+         ]
+     }],
+-    ['chromeos==1 and target_arch != "arm"', {
++    ['(chromeos==1 or desktop_linux==1) and target_arch != "arm"', {
+       'targets': [
+           {
+             'target_name': 'vaapi_jpeg_decoder_unittest',
+Index: beta.xenial/content/public/common/content_switches.cc
+===================================================================
+--- beta.xenial.orig/content/public/common/content_switches.cc
++++ beta.xenial/content/public/common/content_switches.cc
+@@ -944,7 +944,9 @@ const char kDisableWebAudio[]
+ #if defined(OS_CHROMEOS)
+ // Disables panel fitting (used for mirror mode).
+ const char kDisablePanelFitting[]           = "disable-panel-fitting";
++#endif
  
-diff -uar chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-48.0.2564.82/content/common/gpu/media/vaapi_wrapper.cc
---- chromium-48.0.2564.82.orig/content/common/gpu/media/vaapi_wrapper.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/gpu/media/vaapi_wrapper.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -152,7 +152,7 @@
-     VAProfile va_profile,
-     const base::Closure& report_error_to_uma_cb) {
-   if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
--    DVLOG(1) << "Unsupported va_profile: " << va_profile;
-+    VLOG(1) << "Unsupported va_profile: " << va_profile;
-     return nullptr;
-   }
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ // Disables VA-API accelerated video encode.
+ const char kDisableVaapiAcceleratedVideoEncode[] =
+     "disable-vaapi-accelerated-video-encode";
+Index: beta.xenial/content/public/common/content_switches.h
+===================================================================
+--- beta.xenial.orig/content/public/common/content_switches.h
++++ beta.xenial/content/public/common/content_switches.h
+@@ -277,6 +277,8 @@ CONTENT_EXPORT extern const char kDisabl
  
-@@ -311,15 +311,17 @@
- bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
-   static bool vaapi_functions_initialized = PostSandboxInitialization();
-   if (!vaapi_functions_initialized) {
--    bool running_on_chromeos = false;
--#if defined(OS_CHROMEOS)
-+    bool error_level_logging = false;
-+#if defined(OS_LINUX)
-+    error_level_logging = true;
-+#elif defined(OS_CHROMEOS)
-     // When chrome runs on linux with chromeos=1, do not log error message
-     // without VAAPI libraries.
--    running_on_chromeos = base::SysInfo::IsRunningOnChromeOS();
-+    error_level_logging = base::SysInfo::IsRunningOnChromeOS();
+ #if defined(OS_CHROMEOS)
+ CONTENT_EXPORT extern const char kDisablePanelFitting[];
++#endif
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
-     static const char kErrorMsg[] = "Failed to initialize VAAPI libs";
--    if (running_on_chromeos)
--      LOG(ERROR) << kErrorMsg;
-+    if (error_level_logging)
-+      VLOG(1) << kErrorMsg;
-     else
-       DVLOG(1) << kErrorMsg;
-     return false;
-@@ -390,7 +392,7 @@
-   if (std::find(supported_entrypoints.begin(),
-                 supported_entrypoints.end(),
-                 entrypoint) == supported_entrypoints.end()) {
--    DVLOG(1) << "Unsupported entrypoint";
-+    VLOG(1) << "Unsupported entrypoint";
-     return false;
-   }
-   return true;
-@@ -414,8 +416,8 @@
-     if (attribs[i].type != required_attribs[i].type ||
-         (attribs[i].value & required_attribs[i].value) !=
-             required_attribs[i].value) {
--      DVLOG(1) << "Unsupported value " << required_attribs[i].value
--               << " for attribute type " << required_attribs[i].type;
-+      VLOG(1) << "Unsupported value " << required_attribs[i].value
-+              << " for attribute type " << required_attribs[i].type;
-       return false;
-     }
-   }
-diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-48.0.2564.82/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
---- chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	2016-01-24 12:37:54.345634163 +0100
-@@ -21,6 +21,8 @@
- #include "base/logging.h"
+ 
+Index: beta.xenial/media/media.gyp
+===================================================================
+--- beta.xenial.orig/media/media.gyp
++++ beta.xenial/media/media.gyp
+@@ -783,7 +783,7 @@
+           ],
+         }],
+         # For VaapiVideoEncodeAccelerator.
+-        ['target_arch != "arm" and chromeos == 1', {
++        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
+           'sources': [
+             'filters/h264_bitstream_buffer.cc',
+             'filters/h264_bitstream_buffer.h',
+@@ -1417,7 +1417,7 @@
+             'cdm/cdm_adapter_unittest.cc',
+           ],
+         }],
+-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
++        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1) and use_x11 == 1', {
+           'sources': [
+             'filters/h264_bitstream_buffer_unittest.cc',
+           ],
+Index: beta.xenial/gpu/config/software_rendering_list_json.cc
+===================================================================
+--- beta.xenial.orig/gpu/config/software_rendering_list_json.cc
++++ beta.xenial/gpu/config/software_rendering_list_json.cc
+@@ -481,17 +481,6 @@ const char kSoftwareRenderingListJson[]
+       ]
+     },
+     {
+-      "id": 48,
+-      "description": "Accelerated video decode is unavailable on Linux",
+-      "cr_bugs": [137247],
+-      "os": {
+-        "type": "linux"
+-      },
+-      "features": [
+-        "accelerated_video_decode"
+-      ]
+-    },
+-    {
+       "id": 49,
+       "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
+       "cr_bugs": [140175],
+Index: beta.xenial/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+===================================================================
+--- beta.xenial.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
++++ beta.xenial/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+@@ -22,6 +22,8 @@
+ #include "base/macros.h"
  #include "base/memory/scoped_ptr.h"
  #include "build/build_config.h"
 +// Auto-generated for dlopen libva libraries
@@ -198,7 +174,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  #include "content/common/sandbox_linux/sandbox_bpf_base_policy_linux.h"
  #include "content/common/sandbox_linux/sandbox_seccomp_bpf_linux.h"
  #include "content/common/set_process_title.h"
-@@ -31,6 +33,8 @@
+@@ -32,6 +34,8 @@
  #include "sandbox/linux/syscall_broker/broker_file_permission.h"
  #include "sandbox/linux/syscall_broker/broker_process.h"
  #include "sandbox/linux/system_headers/linux_syscalls.h"
@@ -207,7 +183,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  
  using sandbox::arch_seccomp_data;
  using sandbox::bpf_dsl::Allow;
-@@ -40,6 +44,11 @@
+@@ -41,6 +45,11 @@ using sandbox::syscall_broker::BrokerFil
  using sandbox::syscall_broker::BrokerProcess;
  using sandbox::SyscallSets;
  
@@ -219,7 +195,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  namespace content {
  
  namespace {
-@@ -94,7 +103,7 @@
+@@ -95,7 +104,7 @@ inline bool UseLibV4L2() {
  
  bool IsAcceleratedVaapiVideoEncodeEnabled() {
    bool accelerated_encode_enabled = false;
@@ -228,7 +204,7 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();
    accelerated_encode_enabled =
-@@ -299,27 +308,41 @@
+@@ -300,27 +309,41 @@ bool GpuProcessPolicy::PreSandboxHook()
      // inside the sandbox, so preload them now.
      if (IsAcceleratedVaapiVideoEncodeEnabled() ||
          IsAcceleratedVideoDecodeEnabled()) {
@@ -288,55 +264,123 @@ diff -uar chromium-48.0.2564.82.orig/content/common/sandbox_linux/bpf_gpu_policy
  
    return true;
  }
-diff -uar chromium-48.0.2564.82.orig/content/content_common.gypi chromium-48.0.2564.82/content/content_common.gypi
---- chromium-48.0.2564.82.orig/content/content_common.gypi	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_common.gypi	2016-01-24 12:37:54.346634329 +0100
-@@ -865,7 +865,7 @@
-         },
-       ],
-     }],
--    ['chromeos==1', {
-+    ['chromeos==1 or desktop_linux==1', {
-       'sources': [
-         'common/gpu/media/accelerated_video_decoder.h',
-         'common/gpu/media/h264_decoder.cc',
-@@ -921,7 +921,7 @@
-         'common/gpu/media/tegra_v4l2_device.h',
-       ],
-     }],
--    ['target_arch != "arm" and chromeos == 1', {
-+    ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
-       'dependencies': [
-         '../media/media.gyp:media',
-         '../third_party/libyuv/libyuv.gyp:libyuv',
-diff -uar chromium-48.0.2564.82.orig/content/content_gpu.gypi chromium-48.0.2564.82/content/content_gpu.gypi
---- chromium-48.0.2564.82.orig/content/content_gpu.gypi	2016-01-14 02:49:23.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_gpu.gypi	2016-01-24 12:37:54.346634329 +0100
-@@ -38,7 +38,7 @@
-         ],
-       },
-     }],
--    ['target_arch!="arm" and chromeos == 1', {
-+    ['target_arch!="arm" and (chromeos == 1 or desktop_linux == 1)', {
-       'include_dirs': [
-         '<(DEPTH)/third_party/libva',
-       ],
-diff -uar chromium-48.0.2564.82.orig/content/content_tests.gypi chromium-48.0.2564.82/content/content_tests.gypi
---- chromium-48.0.2564.82.orig/content/content_tests.gypi	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/content_tests.gypi	2016-01-24 12:37:54.346634329 +0100
-@@ -1733,7 +1733,7 @@
-           },
-         ]
-     }],
--    ['chromeos==1 and target_arch != "arm"', {
-+    ['(chromeos==1 or desktop_linux==1) and target_arch != "arm"', {
-       'targets': [
-           {
-             'target_name': 'vaapi_jpeg_decoder_unittest',
-diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.82/content/gpu/gpu_main.cc
---- chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/gpu/gpu_main.cc	2016-01-24 12:37:54.347634495 +0100
-@@ -72,7 +72,7 @@
+Index: beta.xenial/chrome/browser/about_flags.cc
+===================================================================
+--- beta.xenial.orig/chrome/browser/about_flags.cc
++++ beta.xenial/chrome/browser/about_flags.cc
+@@ -937,7 +937,7 @@ const FeatureEntry kFeatureEntries[] = {
+      "disable-accelerated-video-decode",
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+-     kOsMac | kOsWin | kOsCrOS,
++     kOsAll,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+     },
+ #if defined(USE_ASH)
+Index: beta.xenial/content/common/gpu/media/vaapi_wrapper.cc
+===================================================================
+--- beta.xenial.orig/content/common/gpu/media/vaapi_wrapper.cc
++++ beta.xenial/content/common/gpu/media/vaapi_wrapper.cc
+@@ -186,7 +186,7 @@ scoped_refptr<VaapiWrapper> VaapiWrapper
+     VAProfile va_profile,
+     const base::Closure& report_error_to_uma_cb) {
+   if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
+-    DVLOG(1) << "Unsupported va_profile: " << va_profile;
++    VLOG(1) << "Unsupported va_profile: " << va_profile;
+     return nullptr;
+   }
+ 
+@@ -345,15 +345,17 @@ VaapiWrapper::GetSupportedProfileInfosFo
+ bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
+   static bool vaapi_functions_initialized = PostSandboxInitialization();
+   if (!vaapi_functions_initialized) {
+-    bool running_on_chromeos = false;
+-#if defined(OS_CHROMEOS)
++    bool error_level_logging = false;
++#if defined(OS_LINUX)
++    error_level_logging = true;
++#elif defined(OS_CHROMEOS)
+     // When chrome runs on linux with chromeos=1, do not log error message
+     // without VAAPI libraries.
+-    running_on_chromeos = base::SysInfo::IsRunningOnChromeOS();
++    error_level_logging = base::SysInfo::IsRunningOnChromeOS();
+ #endif
+     static const char kErrorMsg[] = "Failed to initialize VAAPI libs";
+-    if (running_on_chromeos)
+-      LOG(ERROR) << kErrorMsg;
++    if (error_level_logging)
++      VLOG(1) << kErrorMsg;
+     else
+       DVLOG(1) << kErrorMsg;
+     return false;
+@@ -424,7 +426,7 @@ bool VaapiWrapper::IsEntrypointSupported
+   if (std::find(supported_entrypoints.begin(),
+                 supported_entrypoints.end(),
+                 entrypoint) == supported_entrypoints.end()) {
+-    DVLOG(1) << "Unsupported entrypoint";
++    VLOG(1) << "Unsupported entrypoint";
+     return false;
+   }
+   return true;
+@@ -448,8 +450,8 @@ bool VaapiWrapper::AreAttribsSupported_L
+     if (attribs[i].type != required_attribs[i].type ||
+         (attribs[i].value & required_attribs[i].value) !=
+             required_attribs[i].value) {
+-      DVLOG(1) << "Unsupported value " << required_attribs[i].value
+-               << " for attribute type " << required_attribs[i].type;
++      VLOG(1) << "Unsupported value " << required_attribs[i].value
++              << " for attribute type " << required_attribs[i].type;
+       return false;
+     }
+   }
+Index: beta.xenial/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+===================================================================
+--- beta.xenial.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc
++++ beta.xenial/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+@@ -334,17 +334,17 @@ bool VaapiVideoDecodeAccelerator::Initia
+ 
+   base::AutoLock auto_lock(lock_);
+   DCHECK_EQ(state_, kUninitialized);
+-  DVLOG(2) << "Initializing VAVDA, profile: " << profile;
++  VLOG(1) << "Initializing VAVDA, profile: " << profile;
+ 
+ #if defined(USE_X11)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+                 "DesktopGL (GLX).";
+     return false;
+   }
+ #elif defined(USE_OZONE)
+   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
+-    DVLOG(1) << "HW video decode acceleration not available without "
++    VLOG(1) << "HW video decode acceleration not available without "
+              << "EGLGLES2.";
+     return false;
+   }
+@@ -354,7 +354,7 @@ bool VaapiVideoDecodeAccelerator::Initia
+       VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
+ 
+   if (!vaapi_wrapper_.get()) {
+-    DVLOG(1) << "Failed initializing VAAPI for profile " << profile;
++    VLOG(1) << "Failed initializing VAAPI for profile " << profile;
+     return false;
+   }
+ 
+@@ -371,7 +371,7 @@ bool VaapiVideoDecodeAccelerator::Initia
+     vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get()));
+     decoder_.reset(new VP9Decoder(vp9_accelerator_.get()));
+   } else {
+-    DLOG(ERROR) << "Unsupported profile " << profile;
++    VLOG(1) << "Unsupported profile " << profile;
+     return false;
+   }
+ 
+Index: beta.xenial/content/gpu/gpu_main.cc
+===================================================================
+--- beta.xenial.orig/content/gpu/gpu_main.cc
++++ beta.xenial/content/gpu/gpu_main.cc
+@@ -76,7 +76,7 @@
  #include "content/common/sandbox_mac.h"
  #endif
  
@@ -345,7 +389,7 @@ diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.
  #include "content/common/gpu/media/vaapi_wrapper.h"
  #endif
  
-@@ -237,7 +237,7 @@
+@@ -247,7 +247,7 @@ int GpuMain(const MainFunctionParams& pa
    GetGpuInfoFromCommandLine(gpu_info, command_line);
    gpu_info.in_process_gpu = false;
  
@@ -354,82 +398,18 @@ diff -uar chromium-48.0.2564.82.orig/content/gpu/gpu_main.cc chromium-48.0.2564.
    VaapiWrapper::PreSandboxInitialization();
  #endif
  
-diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.cc chromium-48.0.2564.82/content/public/common/content_switches.cc
---- chromium-48.0.2564.82.orig/content/public/common/content_switches.cc	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/public/common/content_switches.cc	2016-01-24 12:37:54.347634495 +0100
-@@ -931,7 +931,9 @@
- #if defined(OS_CHROMEOS)
- // Disables panel fitting (used for mirror mode).
- const char kDisablePanelFitting[]           = "disable-panel-fitting";
-+#endif
- 
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- // Disables VA-API accelerated video encode.
- const char kDisableVaapiAcceleratedVideoEncode[] =
-     "disable-vaapi-accelerated-video-encode";
-diff -uar chromium-48.0.2564.82.orig/content/public/common/content_switches.h chromium-48.0.2564.82/content/public/common/content_switches.h
---- chromium-48.0.2564.82.orig/content/public/common/content_switches.h	2016-01-20 21:01:21.000000000 +0100
-+++ chromium-48.0.2564.82/content/public/common/content_switches.h	2016-01-24 12:37:54.347634495 +0100
-@@ -275,6 +275,8 @@
- 
- #if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisablePanelFitting[];
-+#endif
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
- #endif
+Index: beta.xenial/content/common/gpu/client/command_buffer_proxy_impl.cc
+===================================================================
+--- beta.xenial.orig/content/common/gpu/client/command_buffer_proxy_impl.cc
++++ beta.xenial/content/common/gpu/client/command_buffer_proxy_impl.cc
+@@ -698,8 +698,10 @@ bool CommandBufferProxyImpl::ProduceFron
  
-diff -uar chromium-48.0.2564.82.orig/gpu/config/software_rendering_list_json.cc chromium-48.0.2564.82/gpu/config/software_rendering_list_json.cc
---- chromium-48.0.2564.82.orig/gpu/config/software_rendering_list_json.cc	2016-01-20 21:01:22.000000000 +0100
-+++ chromium-48.0.2564.82/gpu/config/software_rendering_list_json.cc	2016-01-24 12:43:07.497683578 +0100
-@@ -481,17 +481,6 @@
-       ]
-     },
-     {
--      "id": 48,
--      "description": "Accelerated video decode is unavailable on Linux",
--      "cr_bugs": [137247],
--      "os": {
--        "type": "linux"
--      },
--      "features": [
--        "accelerated_video_decode"
--      ]
--    },
--    {
-       "id": 49,
-       "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
-       "cr_bugs": [140175],
-@@ -1041,6 +1030,11 @@
-           }
-         },
-         {
-+          "os": {
-+            "type": "linux"
-+          }
-+        },
-+        {
-           "os": {
-             "type": "android"
-           },
-diff -uar chromium-48.0.2564.82.orig/media/media.gyp chromium-48.0.2564.82/media/media.gyp
---- chromium-48.0.2564.82.orig/media/media.gyp	2016-01-20 21:01:22.000000000 +0100
-+++ chromium-48.0.2564.82/media/media.gyp	2016-01-24 12:37:54.365637487 +0100
-@@ -764,7 +764,7 @@
-           ],
-         }],
-         # For VaapiVideoEncodeAccelerator.
--        ['target_arch != "arm" and chromeos == 1', {
-+        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
-           'sources': [
-             'filters/h264_bitstream_buffer.cc',
-             'filters/h264_bitstream_buffer.h',
-@@ -1398,7 +1398,7 @@
-             'cdm/cdm_adapter_unittest.cc',
-           ],
-         }],
--        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
-+        ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1) and use_x11 == 1', {
-           'sources': [
-             'filters/h264_bitstream_buffer_unittest.cc',
-           ],
+ scoped_ptr<media::VideoDecodeAccelerator>
+ CommandBufferProxyImpl::CreateVideoDecoder() {
++  TRACE_EVENT0("gpu", "CommandBufferProxyImpl::CreateVideoDecoder");
+   if (!channel_)
+     return scoped_ptr<media::VideoDecodeAccelerator>();
++  VLOG(1) << "About to create GpuVideoDecodeAcceleratorHost.";
+   return scoped_ptr<media::VideoDecodeAccelerator>(
+       new GpuVideoDecodeAcceleratorHost(channel_, this));
+ }
diff --git a/www-client/chromium/files/inox/disable-autofill-download-manager.patch b/www-client/chromium/files/inox/disable-autofill-download-manager.patch
deleted file mode 100644
index a5e06d62f..000000000
--- a/www-client/chromium/files/inox/disable-autofill-download-manager.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./components/autofill/core/browser/autofill_download_manager.cc
-+++ ./components/autofill/core/browser/autofill_download_manager.cc.new
-@@ -57,8 +57,7 @@
- }
- 
- GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
--  return GURL("https://clients1.google.com/tbproxy/af/" +
--              RequestTypeToString(request_type) + "?client=" + kClientName);
-+  return GURL("about:blank");
- }
- 
- }  // namespace
-@@ -190,46 +189,6 @@
- bool AutofillDownloadManager::StartRequest(
-     const std::string& form_xml,
-     const FormRequestData& request_data) {
--  net::URLRequestContextGetter* request_context =
--      driver_->GetURLRequestContext();
--  DCHECK(request_context);
--  GURL request_url = GetRequestUrl(request_data.request_type);
--
--  std::string compressed_data;
--  if (!compression::GzipCompress(form_xml, &compressed_data)) {
--    NOTREACHED();
--    return false;
--  }
--
--  AutofillMetrics::LogPayloadCompressionRatio(
--      static_cast<int>(100 * compressed_data.size() / form_xml.size()),
--      request_data.request_type);
--
--  // Id is ignored for regular chrome, in unit test id's for fake fetcher
--  // factory will be 0, 1, 2, ...
--  net::URLFetcher* fetcher =
--      net::URLFetcher::Create(fetcher_id_for_unittest_++, request_url,
--                              net::URLFetcher::POST, this).release();
--  data_use_measurement::DataUseUserData::AttachToFetcher(
--      fetcher, data_use_measurement::DataUseUserData::AUTOFILL);
--  url_fetchers_[fetcher] = request_data;
--  fetcher->SetAutomaticallyRetryOn5xx(false);
--  fetcher->SetRequestContext(request_context);
--  fetcher->SetUploadData("text/xml", compressed_data);
--  fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
--                        net::LOAD_DO_NOT_SEND_COOKIES);
--  // Add Chrome experiment state and GZIP encoding to the request headers.
--  net::HttpRequestHeaders headers;
--  headers.SetHeaderIfMissing("content-encoding", "gzip");
--  variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
--      fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
--  fetcher->SetExtraRequestHeaders(headers.ToString());
--  fetcher->Start();
--
--  VLOG(1) << "Sending AutofillDownloadManager "
--           << RequestTypeToString(request_data.request_type)
--           << " request: " << form_xml;
--
-   return true;
- }
- 
-
diff --git a/www-client/chromium/files/inox/disable-default-extensions.patch b/www-client/chromium/files/inox/disable-default-extensions.patch
deleted file mode 100644
index 83d3b2d32..000000000
--- a/www-client/chromium/files/inox/disable-default-extensions.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- ./chrome/browser/extensions/external_component_loader.cc
-+++ ./chrome/browser/extensions/external_component_loader.cc.new
-@@ -38,10 +38,6 @@
-
- void ExternalComponentLoader::StartLoading() {
-   prefs_.reset(new base::DictionaryValue());
--  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
--
--  if (HotwordServiceFactory::IsHotwordAllowed(profile_))
--    AddExternalExtension(extension_misc::kHotwordSharedModuleId);
-
- #if defined(OS_CHROMEOS)
-   {
-@@ -52,17 +48,6 @@
-   }
- #endif
-
--#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
--  if (media_router::MediaRouterEnabled(profile_))
--    AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
--#endif  // defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
--
--#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
--  std::string google_now_extension_id;
--  if (GetGoogleNowExtensionId(&google_now_extension_id))
--    AddExternalExtension(google_now_extension_id);
--#endif
--
-   LoadFinished();
- }
- 
-
---- ./chrome/browser/extensions/component_loader.cc
-+++ ./chrome/browser/extensions/component_loader.cc.new
-@@ -350,24 +350,12 @@
- }
-
- void ComponentLoader::AddHangoutServicesExtension() {
--#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
--  Add(IDR_HANGOUT_SERVICES_MANIFEST,
--      base::FilePath(FILE_PATH_LITERAL("hangout_services")));
--#endif
- }
-
- void ComponentLoader::AddHotwordAudioVerificationApp() {
--  if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
--    Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
--        base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
--  }
- }
-
- void ComponentLoader::AddHotwordHelperExtension() {
--  if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
--    Add(IDR_HOTWORD_MANIFEST,
--        base::FilePath(FILE_PATH_LITERAL("hotword")));
--  }
- }
-
- void ComponentLoader::AddImageLoaderExtension() {
-@@ -384,43 +384,6 @@
- }
-
- void ComponentLoader::AddGoogleNowExtension() {
--#if defined(ENABLE_GOOGLE_NOW)
--  const char kEnablePrefix[] = "Enable";
--  const char kFieldTrialName[] = "GoogleNow";
--  std::string enable_prefix(kEnablePrefix);
--  std::string field_trial_result =
--      base::FieldTrialList::FindFullName(kFieldTrialName);
--
--  bool enabled_via_field_trial =
--      field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0;
--
--  // Enable the feature on trybots and trunk builds.
--  bool enabled_via_trunk_build =
--      chrome::GetChannel() == version_info::Channel::UNKNOWN;
--
--  bool is_authenticated =
--      SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
--
--  bool enabled =
--      (enabled_via_field_trial && is_authenticated) || enabled_via_trunk_build;
--
--#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
--  // Don't load if newer trial is running (== new extension id is available).
--  std::string ignored_extension_id;
--  if (GetGoogleNowExtensionId(&ignored_extension_id)) {
--    enabled = false;
--  }
--#endif  // defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
--
--  const int google_now_manifest_id = IDR_GOOGLE_NOW_MANIFEST;
--  const base::FilePath root_directory =
--      base::FilePath(FILE_PATH_LITERAL("google_now"));
--  if (enabled) {
--    Add(google_now_manifest_id, root_directory);
--  } else {
--    DeleteData(google_now_manifest_id, root_directory);
--  }
--#endif  // defined(ENABLE_GOOGLE_NOW)
- }
-
- #if defined(OS_CHROMEOS)
-@@ -495,15 +446,6 @@
- }
-
- void ComponentLoader::AddWebStoreApp() {
--#if defined(OS_CHROMEOS)
--  if (!IsNormalSession())
--    return;
--#endif
--
--  AddWithNameAndDescription(
--      IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
--      l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
--      l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
- }
-
- scoped_refptr<const Extension> ComponentLoader::CreateExtension(
-@@ -555,9 +555,6 @@
-   DCHECK(!skip_session_components);
-   Add(IDR_BOOKMARKS_MANIFEST,
-       base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
--  // Cloud Print component app. Not required on Chrome OS.
--  Add(IDR_CLOUDPRINT_MANIFEST,
--      base::FilePath(FILE_PATH_LITERAL("cloud_print")));
- #endif
-
-   if (!skip_session_components) {
-
-
-@@ -629,13 +571,6 @@
-     AddImageLoaderExtension();
-     AddGoogleNowExtension();
-
--    bool install_feedback = enable_background_extensions_during_testing;
--#if defined(GOOGLE_CHROME_BUILD)
--    install_feedback = true;
--#endif  // defined(GOOGLE_CHROME_BUILD)
--    if (install_feedback)
--      Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")));
--
- #if defined(ENABLE_SETTINGS_APP)
-     Add(IDR_SETTINGS_APP_MANIFEST,
-         base::FilePath(FILE_PATH_LITERAL("settings_app")));
diff --git a/www-client/chromium/files/inox/disable-notification-promo-fetch.patch b/www-client/chromium/files/inox/disable-notification-promo-fetch.patch
deleted file mode 100644
index 4816fc01d..000000000
--- a/www-client/chromium/files/inox/disable-notification-promo-fetch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./chrome/browser/browser_process_impl.cc
-+++ ./chrome/browser/browser_process_impl.cc.new
-@@ -1082,7 +1082,6 @@
-         local_state(), chrome::GetChannel(), GetApplicationLocale(),
-         system_request_context(), switches::kDisableBackgroundNetworking,
-         base::Bind(safe_json::SafeJsonParser::Parse)));
--    promo_resource_service_->StartAfterDelay();
-   }
- 
- #if !defined(OS_ANDROID) && !defined(OS_IOS)
-
-
-
---- ./chrome/browser/signin/signin_promo.cc
-+++ ./chrome/browser/signin/signin_promo.cc.new
-@@ -105,6 +105,7 @@ bool ShouldShowPromo(Profile* profile) {
- 
- bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
-   DCHECK(profile);
-+  return false;
- 
-   // Don't show if the profile is an incognito.
-   if (profile->IsOffTheRecord())
-
-
---- ./components/web_resource/notification_promo.cc
-+++ ./components/web_resource/notification_promo.cc.new
-@@ -30,7 +30,7 @@ namespace {
- 
- const int kDefaultGroupSize = 100;
- 
--const char promo_server_url[] = "https://clients3.google.com/crsignal/client";
-+const char promo_server_url[] = "about:blank";
- 
- // The name of the preference that stores the promotion object.
- const char kPrefPromoObject[] = "promo";
diff --git a/www-client/chromium/files/inox/modify-default-prefs.patch b/www-client/chromium/files/inox/modify-default-prefs.patch
deleted file mode 100644
index c6c9a06b9..000000000
--- a/www-client/chromium/files/inox/modify-default-prefs.patch
+++ /dev/null
@@ -1,258 +0,0 @@
---- ./chrome/browser/chrome_content_browser_client.cc
-+++ ./chrome/browser/chrome_content_browser_client.cc.new
-@@ -639,7 +639,7 @@
- void ChromeContentBrowserClient::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
--  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
-+  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
-   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
- }
- 
-
-
---- ./chrome/browser/ui/browser_ui_prefs.cc
-+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
-@@ -86,7 +86,7 @@
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
-   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
-   registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
-
-
-
---- ./chrome/browser/net/prediction_options.cc
-+++ ./chrome/browser/net/prediction_options.cc.new
-@@ -25,7 +25,7 @@ bool CanPrefetchAndPrerender(int network_prediction_options) {
-     case NETWORK_PREDICTION_NEVER:
-       return false;
-     default:
--      DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
-+      //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
-       return !net::NetworkChangeNotifier::IsConnectionCellular(
-                  net::NetworkChangeNotifier::GetConnectionType());
-   }
-
-
---- ./chrome/browser/net/prediction_options.h
-+++ ./chrome/browser/net/prediction_options.h.new
-@@ -21,7 +21,7 @@ enum NetworkPredictionOptions {
-   NETWORK_PREDICTION_ALWAYS,
-   NETWORK_PREDICTION_WIFI_ONLY,
-   NETWORK_PREDICTION_NEVER,
--  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
-+  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
- };
- 
- void RegisterPredictionOptionsProfilePrefs(
-
-
---- ./chrome/browser/background/background_mode_manager.cc
-+++ ./chrome/browser/background/background_mode_manager.cc.new
-@@ -330,7 +330,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
-   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
-   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
- #endif
--  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
- }
-
-
---- ./components/content_settings/core/browser/cookie_settings.cc
-+++ ./components/content_settings/core/browser/cookie_settings.cc.new
-@@ -82,7 +82,7 @@
- void CookieSettings::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
--      prefs::kBlockThirdPartyCookies, false,
-+      prefs::kBlockThirdPartyCookies, true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 
-
-
---- ./chrome/browser/ui/navigation_correction_tab_observer.cc
-+++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
- void NavigationCorrectionTabObserver::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* prefs) {
-   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
--                             true,
-+                             false,
-                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
-
-
---- ./components/autofill/core/browser/autofill_manager.cc
-+++ ./components/autofill/core/browser/autofill_manager.cc.new
-@@ -164,7 +164,7 @@ void AutofillManager::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kAutofillEnabled,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kAutofillWalletSyncExperimentEnabled,
-
-
---- ./chrome/browser/resources/options/reset_profile_settings_overlay.html
-+++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new
-@@ -24,7 +24,7 @@
-   <div id="feedback-bar"
-       class="gray-bottom-bar checkbox controlled-setting-with-label">
-     <label>
--      <input id="send-settings" type="checkbox" checked>
-+      <input id="send-settings" type="checkbox">
-       <span>
-         <span i18n-content="resetProfileSettingsFeedback"></span>
-         <span id="expand-feedback"></span>
-
-
---- ./chrome/browser/io_thread.cc
-+++ ./chrome/browser/io_thread.cc.new
-@@ -1113,7 +1113,7 @@
-       data_reduction_proxy::prefs::kDataReductionProxy, std::string());
-   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
-   data_reduction_proxy::RegisterPrefs(registry);
--  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
-   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
- }
- 
-
---- ./extensions/common/extension.cc
-+++ ./extensions/common/extension.cc.new
-@@ -347,7 +347,7 @@
-   if (extensions::Manifest::IsComponentLocation(location()) &&
-       !base::CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kShowComponentExtensionOptions)) {
--    return true;
-+    return false;
-   }
- 
-   // Always show unpacked extensions and apps.
-@@ -356,7 +356,7 @@
- 
-   // Don't show apps that aren't visible in either launcher or ntp.
-   if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
--    return true;
-+    return false;
- 
-   return false;
- }
- 
-
---- ./chrome/browser/signin/signin_promo.cc
-+++ ./chrome/browser/signin/signin_promo.cc.new
-@@ -253,8 +253,8 @@
- void RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
--  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
--  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
-   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
- }
- 
-
-
---- ./chrome/browser/ui/browser_ui_prefs.cc
-+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
-@@ -102,7 +102,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kEnableTranslate,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterStringPref(
-       prefs::kCloudPrintEmail,
-
-
---- ./components/bookmarks/browser/bookmark_utils.cc
-+++ ./components/bookmarks/browser/bookmark_utils.cc.new
-@@ -424,7 +424,7 @@
- void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kShowBookmarkBar,
--      false,
-+      true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kEditBookmarksEnabled,
-@@ -432,7 +432,7 @@
-       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kShowAppsShortcutInBookmarkBar,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kShowManagedBookmarksInBookmarkBar,
-
-
---- ./chrome/browser/profiles/profile.cc
-+++ ./chrome/browser/profiles/profile.cc.new
-@@ -76,7 +76,7 @@
- void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kSearchSuggestEnabled,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- #if defined(OS_ANDROID)
-   registry->RegisterStringPref(
-@@ -94,7 +94,7 @@
-       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kSafeBrowsingEnabled,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kSafeBrowsingExtendedReportingEnabled,
-@@ -104,7 +104,7 @@
-   // This pref is intentionally outside the above #if. That flag corresponds
-   // to the Notifier extension and does not gate the launcher page.
-   // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
--  registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, false);
-   registry->RegisterBooleanPref(prefs::kDisableExtensions, false);
- #if defined(ENABLE_EXTENSIONS)
-   registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized,
-
-
-
---- ./chrome/service/cloud_print/connector_settings.cc
-+++ ./chrome/service/cloud_print/connector_settings.cc.new
-@@ -58,7 +58,7 @@
-   DCHECK(server_url_.is_valid());
- 
-   connect_new_printers_ = prefs->GetBoolean(
--      prefs::kCloudPrintConnectNewPrinters, true);
-+      prefs::kCloudPrintConnectNewPrinters, false);
- 
-   xmpp_ping_enabled_ = prefs->GetBoolean(
-       prefs::kCloudPrintXmppPingEnabled, false);
-
-
-
---- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-+++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
-@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kLocalDiscoveryNotificationsEnabled,
--#if defined(OS_WIN)
-       false,
--#else
--      true,
--#endif
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 06a5bf476..241e899d9 100755
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,5 +2,5 @@ AUX cairo-respect-fontconfig_pb.patch 554 SHA256 3ef17cfd14b3edc14092b5e96fc6367
 AUX cairo-server-side-gradients.patch 768 SHA256 b80c99b10fd48dbf98abd70ca2d1265ad6035383c47bfbee5e540a814b6d2a23 SHA512 095017d2b213aba6fe515e8d584fcb418b75dd45bdf7566ad7183e82024e512fa92c7ac21266192111aef27149e29942a530c57b197e365452b0243a404f451e WHIRLPOOL 5264558df3800f6b75935c552f4139d098f27edba16a3a4f1483391574edbd6b05eb2ef25b331f973875ee6185adb9568a47845578f59b014a3fc33d69325c64
 AUX cairo-webkit-html5-fix.patch 1009 SHA256 e4fea537fae57f42a453dbace666482fc4de4cb7090d0141fdefb4388f842f32 SHA512 2df69df419ca33c380218a4f05fd311882070bb9a87f34023625d66f294e208716358933699dbea5426bdb05c1c3108bfe5d752a7814d281bb0b49591889249a WHIRLPOOL 7769c2c03c618e6d5d67fbdbe05ed6b0d35ab90b1ad0caacd0d9211aea7cea2268c315549ecd9b27d42d469956939fa6034f7630386fd9e110896747292dedbc
 DIST cairo-1.14.6.tar.xz 36040596 SHA256 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 SHA512 e2aa17a33b95b68d407b53ac321cca15b0c148eb49b8639c75b2af1e75e7b417a2168ea978dabb8581b341f0f45dc042d3b1a56b01ab525b1984015f0865316b WHIRLPOOL cf58eff36277d013225e5a76a9f0d8530012502a3f125c417085ddc9ad7997ab180468783ae6a702a15ac4a3f4c0b5406170a6e6504785bf7de3a9e3b511b48f
-EBUILD cairo-1.14.6-r20150311.ebuild 4702 SHA256 3b3c972005c95beee0974a57cf8bc04ac381efded417b1782a2b442fa3051bdc SHA512 41c9be74b21cd4f39bda1222ed02a58eb919adc0c749cf5e065863caae16ffb9a141ea05065257068c646f0690a066d5e7dc5395ad3335bcbd50cdf40a5a165f WHIRLPOOL 97eb51d3c926827b090758d54c2ba44b4c59250f5a82f064fd3fe891a50d14ffeb4735823921d9b60249ea47785fdb1c2c3055a1734a0b1fe7feef1c72fe4424
+EBUILD cairo-1.14.6-r20150311.ebuild 4702 SHA256 dec444ee4317d48780f83ac08171e195c520a751ba72a09e6ad38d03ab1cf8df SHA512 7616977803040746f439c5356e341212bcc11476ac45738c032bfad4105636c3ce888b4cc58a3d5bef22659e7d916c4f9e247973ab569088831ba79dfa61d7b7 WHIRLPOOL c9e0bf118d79da9f073bd1cbb6374472c389537e235c747b52e59d2b460d0801bc3bb8d5c0ba323cab2e3e3e66562e12bdfe89fbfc17d6bc51942c7dffeaf75a
 MISC metadata.xml 1015 SHA256 69809d8cf1bcd279fac776434c8a01f58987a82599ee2c973a2ac3e09e8e3fce SHA512 1a8e57281b3b1e75e5e46ce321fc1679cf40e64b5ac552c0bbeb495e5880b850bf7aa966e93a31556c2305095bd74bd58094de8c3c7d14c89931ecaf8f0ef5ee WHIRLPOOL 56831148e3544172741470c07d8f4cc2f8db41d63aa547338c11b023bcd2d3659eb5a2fb8fc61a8539fdedd49635bbd6dd8e4976a2c458a249559c1b88bd5c3e
diff --git a/x11-libs/cairo/cairo-1.14.6-r20150311.ebuild b/x11-libs/cairo/cairo-1.14.6-r20150311.ebuild
index 9a842f266..4da139ff0 100755
--- a/x11-libs/cairo/cairo-1.14.6-r20150311.ebuild
+++ b/x11-libs/cairo/cairo-1.14.6-r20150311.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic autotools multilib-minimal
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index eebe71395..8849eabe2 100755
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,5 @@
 AUX wxGTK-3.0.0.0-collision.patch 6237 SHA256 9bfd909e4f953810b84e068b0ec5c709f3ff0a286c3d599fc7b1b26b96bef8d8 SHA512 c68ac400ddc4531d81a251acf1efc4440a5a17d78d9767427121f4ca0425a179a9cdfa94f22ecad0f2cd8f4bf3a4c799a4e21878e93367b57e206f2504a2724f WHIRLPOOL 1d9f7eba01e72bd662eb4c94a92a0bc7193b60f79559b00d2844dffa3c43c748c718491769daffc140c39895382621ca0c59229933f694d948d74379a1756d65
 DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
-EBUILD wxGTK-3.0.2.0-r2.ebuild 4405 SHA256 bb325c50d902dc0c4fe15313b551dbd733f55bfef95acbc7769179070f585bbc SHA512 b4b272ed4967581a6cb190aa9561866f3a35862f72506db68c4a5e0f47367ded3bc11a265ae3e382f90802f3b3613adead0e312c0f9c077769de78ec0ae6897a WHIRLPOOL b3e4318f87a60f7b51d8c66ef7790250b3cc3f83609d5e86532ca7a4c259d14d0279b03a353251ce39e5b128617fd589b24aaeffe269121216de8b8976cdb838
+EBUILD wxGTK-3.0.2.0-r2.ebuild 4403 SHA256 f0f5853e95a188ca5caea19bd12fcdad34620db6064d0216ae563f09e6738bfd SHA512 b849984425758b9e4685dab9f84ce7ea6800bdd0b8b34cbb470904574c1a4f6549146a492fc97b7bbd3be6dfebf8d98cb2d1da6bfb857688c64e8bb250740e9c WHIRLPOOL 5fbd2aa13edc99c83aed8676b6cdd00ed4ead7349d08c6f03505b3efccea9b251626d73367318e220741f23544bb352908e0df78c1fdc5675bdc1c78f636de85
 MISC metadata.xml 865 SHA256 c451da907b2f37627e824ac6dda3f375e06222f1d93c5e010b66f13eb6a33314 SHA512 2fcfd5c723556d4f44deca4d00331ce033f80e6f79bd669badacc8af3295c2ddfa6c71cae308746bf9610202ebae31c989d612b6c9ee18035e0de64da5501b44 WHIRLPOOL 92c7db46e257ace0ef692aca3b06d8ae18c1e98d74daa7718ecb78d35e026dcb9d4d35d085add716891973c0fd07c5c4381f102c273afc7f80be3370c47d0ea4
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
index ff7ee6215..241efd085 100755
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils flag-o-matic multilib-minimal