gentoo resync : 20.12.2017

46 files changed, 384 insertions, 51 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f017779ec818..86ac6b0e6879 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest
index 85266450e7c8..152e4d9410b4 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST clutter-gtk-1.8.2.tar.xz 326964 BLAKE2B fb9a764a8372864ef45fe30669bfdf7227b47171ce6714ac7a36fc9abaeab3aabba790fa45cebdcbe75da8034836cb2b10761939153ca52a392e779d9b216369 SHA512 f895e43c4eb2d49f5e514f4c29f406d587d6bdf15027c0632e5caa4c8a1f8048dfbef5674d7ec663379127460826c1d662b59690c8db2d3e54bedf78e357f765
 DIST clutter-gtk-1.8.4.tar.xz 331508 BLAKE2B 4e21b361fb0ebf8e322601e3a9f148125cb489cb6e14a963ee6e7fbf845556dd37fc1fedc89e8288d24bca559afe079cb7efe65c7be5c59c59b21461cf38834a SHA512 810f879a56cd71f1e9c4678ef704a997ee652d052cfea56b3ed9478f7a813a35dd2fdcded028ce17411ae02da52fa31e0fb8d1f4130c7b9f6d25eeb774b51ada
 EBUILD clutter-gtk-1.8.2.ebuild 1067 BLAKE2B 3f2e067c5f26b67cc0aea0c178d8bea263c8e69f86526d4d155afd9a14f8c4db6a50f3801387e73a0eda4a946c7cf4dca27485a95b79516fe6ef71f07662a175 SHA512 28be58913cb9ec6d00e62701348fd37cbf1af3dbd2a4b849503ed1ed25b114663256af972ccb29913a91483b96cd869babe794eb92a7ba7b7a50fe50ed7102f8
-EBUILD clutter-gtk-1.8.4.ebuild 1066 BLAKE2B 5557e7a87be1f7d3245071edec41b1f53db85d5c4b4352195b2732c1ff9f942cd587daf533ca91843abcf2118d219cb5623d8dff6102a0665fde6e43aa8d40ed SHA512 2146171c60825b8f3031d7eb66c943ce5bbf330c9ea3c58bff895a02c40d54b0c11bf48a1180a924a50044eef2888d36b9f0bbc952c35a9d0cf9ade25e45e195
+EBUILD clutter-gtk-1.8.4.ebuild 1065 BLAKE2B 1b71d302c059aafefdb65ba8dad64d3f1e6578aaa8f74aa7ec60da7a4d72eac1258b254f3f979f87efc151041a64efd3aab3f79f3a6a7042389bfb7c2fa83e6a SHA512 77550227a730d0994cad9cf01665bea0a0dd9ba524cda4566259859b5bc5dde8848bcea6cf8a5f930cb96d9bbb7167132501a83ad555f1bfbad2f0d94337899d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
index bfc14cf9deeb..383e63eb5d3c 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 LICENSE="LGPL-2.1+"
 
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="X debug examples gtk +introspection wayland"
 
 RDEPEND="
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 1fca34252279..e82fcf3c579e 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,8 +2,10 @@ DIST Image-ExifTool-10.64.tar.gz 4278747 BLAKE2B 35612093b27f698478071087ededfd1
 DIST Image-ExifTool-10.66.tar.gz 4293398 BLAKE2B 678b65372cd59a77d2f10c5bc084a6d20f7ac6b23e2e72bc4c1fa04be330d6569a80f4ec8acaa537b2e03a906ba4edc63b96ff58ab847750de63ab09b2a08cea SHA512 32824dfcaf84055143141cbdac05c56d322ecc970cf98813251b2eb1cda32340e08fd4fd6e9323994416e9dc4f9affcba7e35b991abfd6f30cabbb57d02b5eb2
 DIST Image-ExifTool-10.67.tar.gz 4293932 BLAKE2B 5bf69c6a3567a01a13c78c3790ee74f57f3154fd1523690770a3eb02e083f75427085b28121c260fcfa0f29f10444d2ccdf20948de921680cd35a995e3d50c27 SHA512 da16af355397d667b3c57a9b1d24b7d91888126138d4bc4cb936ea1ab418cef7e2baed069c39f2890cc93a5dc9cbecd51cd3b4ac7d81f1d6c1426b6fb1aca762
 DIST Image-ExifTool-10.68.tar.gz 4295465 BLAKE2B 5074c7310affda8b21d580d6db5ad67b74bc3e136a115f403e9567e6f667a1f5e600e1f09717b620613f0006b8c2571d365b1942c2f8138f4f122dcf31b47f07 SHA512 8064ada3abbb12d12a1ad89ec4185b25e54c0726f50b8650460280869dd538ec776c15ed1832350be900c4668ba90d4a45bf3b898173c5ac09945cfa473f42c8
+DIST Image-ExifTool-10.69.tar.gz 4296779 BLAKE2B cce6bf0f2fc599e15c11ea5709d8eeb1a7df2902f360f52daa15fc413e227c5925b9c9d755cd992e1d5f15cebaab94b893024bcbad6a3f58112eb17e617a176a SHA512 9b7004607d8e12581943d9a4e6fe928562f777a6b609b8a2b553813c04ce90b17eb53bd8dd1206183ce5b80ae1f39357891db3972103b634442dc836ae26896e
 EBUILD exiftool-10.64.ebuild 532 BLAKE2B 9082da4d83fc6b5ede514bd0a9fc277a08182500b4980f50de1cc5cbdf16179e7134c42a385bf0082d9ee7f46b279e0f6e757424414734f79ed2947ec5b575d7 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255
 EBUILD exiftool-10.66.ebuild 536 BLAKE2B 447face52dc7db39d6d75196556fa4c369d84e9bd1d83ceb241747839095b457eafa64c094741992f29cf0efc95fadb67263d3dec021cccdff8fc32bb2db9ad0 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b
 EBUILD exiftool-10.67.ebuild 536 BLAKE2B 447face52dc7db39d6d75196556fa4c369d84e9bd1d83ceb241747839095b457eafa64c094741992f29cf0efc95fadb67263d3dec021cccdff8fc32bb2db9ad0 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b
 EBUILD exiftool-10.68.ebuild 536 BLAKE2B 447face52dc7db39d6d75196556fa4c369d84e9bd1d83ceb241747839095b457eafa64c094741992f29cf0efc95fadb67263d3dec021cccdff8fc32bb2db9ad0 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b
+EBUILD exiftool-10.69.ebuild 536 BLAKE2B 447face52dc7db39d6d75196556fa4c369d84e9bd1d83ceb241747839095b457eafa64c094741992f29cf0efc95fadb67263d3dec021cccdff8fc32bb2db9ad0 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.69.ebuild b/media-libs/exiftool/exiftool-10.69.ebuild
new file mode 100644
index 000000000000..22e52f948459
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.69.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 58fe06070990..9c2333596f03 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -3,5 +3,5 @@ DIST grilo-0.3.3.tar.xz 641440 BLAKE2B eb35b3344b34eb8d2986bb92e19d6de41f1906c1b
 DIST grilo-0.3.4.tar.xz 644616 BLAKE2B 4e8a7ba7da065b91cf780e4ec5da96b7a63534c2ef22d80cea21853a9373bca59359d2384e6f549689221a4eb1da495037c88e9adaea6c786005963c97a9aa1e SHA512 d3800a1873364dc8b56748924eee71928f9e08ad82d8ee2ffaf265cca7e26476081e543f42f26db57c088b2b063f86244e6718116710fc39fdea623868992145
 EBUILD grilo-0.2.15.ebuild 2168 BLAKE2B 194275416887ac3e9d0c02cc68bac9945f3d0b7b35967ea0322a8b3ad6fbf962feff735f02c761cf02eb89c2215880eda473bab60a87345ddd795374a1dce12a SHA512 a3c16193769a111bf219382eec548de6bde3088646c02c579a553f5adad9e8949791fb9d06547bb58aab1b67505965c39bb8063cdc708b549779fed31c7109d2
 EBUILD grilo-0.3.3.ebuild 2297 BLAKE2B dae2b80d83636ffd8f331e59bb38e0ae5e513aa9e4812dc35f55308b5f27e8a6852ec735a934e64e9f1141429883d9bfd87ed42144e8d7bdaa38210ed854ddda SHA512 9e0ec9c435a33a9b3d19dc9ae1a6d5d352fd2ad2377c22999d18a0f0ef2d308d85a9dbd51024d304767503659e2d278f2de2916d699097e9b1f5e0b91d3efbd9
-EBUILD grilo-0.3.4.ebuild 2298 BLAKE2B 85c144761ba9a98f293eb2fd3d347f4f605a4477f5b5f2128160de241a9be7c6740a3092a748254a7b6a61417c95bff6e9d7df5e841b2b6e40e8bb240cc04645 SHA512 c0eec0f60ca52fc758dbbac9b3049b6c3d7583a1e43ab02c1b20537039a6bab08f2d478e5390c95b14bf71976eff17afe4ebe2aeca50ff72dd13b602edee2a78
+EBUILD grilo-0.3.4.ebuild 2297 BLAKE2B dae2b80d83636ffd8f331e59bb38e0ae5e513aa9e4812dc35f55308b5f27e8a6852ec735a934e64e9f1141429883d9bfd87ed42144e8d7bdaa38210ed854ddda SHA512 9e0ec9c435a33a9b3d19dc9ae1a6d5d352fd2ad2377c22999d18a0f0ef2d308d85a9dbd51024d304767503659e2d278f2de2916d699097e9b1f5e0b91d3efbd9
 MISC metadata.xml 484 BLAKE2B 56ca18d39e67d361c060c6b08bb8da562257cdf8a3f8ca208a745cc628ebd4607bb3bd84f2269d54c914fcd83123b152258ed888691c510b856d8f16f3eaf2ab SHA512 b72030308a92f0c105f71df30321e2aa52d7e7bedcaaa8a2ddc9eb42e4e70981f6015ee8d00c81e50ce6460ab91396742619b8962c95cf664125f283ecc4e229
diff --git a/media-libs/grilo/grilo-0.3.4.ebuild b/media-libs/grilo/grilo-0.3.4.ebuild
index 9b2bd5eb635d..8226d721b9b7 100644
--- a/media-libs/grilo/grilo-0.3.4.ebuild
+++ b/media-libs/grilo/grilo-0.3.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk examples +introspection +network playlist test vala"
 REQUIRED_USE="test? ( introspection )"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 6332806d6a65..a4b56074d684 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,7 +2,7 @@ DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68a
 DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
 EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
-EBUILD harfbuzz-1.4.6-r2.ebuild 3168 BLAKE2B 75af613d4d940aa3666825a6a5124785c8bd69fd29b465a0ba93ade43c603239aba07cd1c7c6d9c13a8044dbd57c51e8bfa5095025fdb72a2ee6ddefc55a5ab7 SHA512 713d5114cb344c9b31d61f75f14e1a6a10fe0e578d61ca03af1ad4ffd0af7a2192943ff930ff621b4fcf041ca3a7787af1b4aa5094a21a2bb1cedd4fc19ed433
-EBUILD harfbuzz-1.7.2.ebuild 3156 BLAKE2B 6fde808c6a76f27bd5ef3a799a0060ce871944d83fd3b58066a7a65d44d395c8952ab9e2895878c614e70beff33bbf96f1cd008ff0be1924d43d227146c5e01f SHA512 f8139a893baf0adf76396b06c25665dbabc5c434bd7e46c2b6d585ec3808b063b6eb5a2b00572851aed4a65b9591dffca595392427b23827aacc9f6fe68516ac
+EBUILD harfbuzz-1.4.6-r2.ebuild 3167 BLAKE2B 7f7ed68df05d3d71c1977e253a8ba7da7ac28d65467b255e7076f39a47e46e91e558ecc5a30069c75f47d9933163ae2a661c3c11c9937dd768cc082136c14797 SHA512 e20d4f4d7573ddbf45eda1df6ac1302ef262e1023a02da03e9202c274681fe2fa7355afeec0edeee36898aa8e61195ecb2f3afbccea230b21d5c7c6bc1a38eeb
+EBUILD harfbuzz-1.7.2.ebuild 3155 BLAKE2B abc11b2c1318453d833d04a2c9c33c875b1eb7b0af4ac5d35bc9aa97961be8ef50b1f3d3e446440d2c7ac13a09baa1b472b66f8a14c150943982164712fce1cb SHA512 c148286f61e20af53d46097bb7198f4a41ffe2dac46a54fa676ea8bda0cc703cd18272e80aa54bc318d3350ca976193f0bb7389d8a10e75d254f80b384d646e7
 EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
index 6753cb9fa393..9dc93543a438 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
index 1dd17671b70f..3fc51209e289 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index c85f8c5a2f6a..cfd6299594bf 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,5 @@
 DIST libchamplain-0.12.15.tar.xz 616692 BLAKE2B 5b0f2697eac0bffb4f2d0702e54c58c5e129ec88d09fbe10035f7a1adae7ecc160023b20eb109ede0e9372ba8f23ffe5cbc9afc08828de8078109336bd8c4c94 SHA512 df921dc26e30bc32f6487c02fc3c3f2dc7c672f6f42bd79e05091f717e6545051ab4f0db0709152a5babd4bbd7eb122997682561d9d63bef19bc1b2923100437
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
 EBUILD libchamplain-0.12.15.ebuild 1609 BLAKE2B 15963cc53511fb190ea8f105afa56bbedc9c586f43d3c7e6db0e6034d5306d3a4c7852caf60615ae81bff18a4a6dad18e236b13783217a59e90356eb677cff18 SHA512 5d45092261e5c5917cc511e0edc563656f834bc7c8fcf431c8159b2813abbbccae450ee0c4449094887e7b15c56465bb1cb1139138f031ca0bf8de438155d5db
-EBUILD libchamplain-0.12.16.ebuild 1610 BLAKE2B 8d3376a71c8a17209297985d6e8f33c507b8e17658bccd972c6dd2bdd7c9bb3a74098ecbb7e0c8f4525e2d634261d9ca295a2f0df8c73a23f1003aee7ae824bd SHA512 c018871c54e513e0c224c27cbbbed3fc010bbda3e9b613fd3bae0a790b06320edbba1ef413e78e688f31130d46f862e4abe0d9a6675374101a9fb6c43cff7b9c
+EBUILD libchamplain-0.12.16.ebuild 1609 BLAKE2B 15963cc53511fb190ea8f105afa56bbedc9c586f43d3c7e6db0e6034d5306d3a4c7852caf60615ae81bff18a4a6dad18e236b13783217a59e90356eb677cff18 SHA512 5d45092261e5c5917cc511e0edc563656f834bc7c8fcf431c8159b2813abbbccae450ee0c4449094887e7b15c56465bb1cb1139138f031ca0bf8de438155d5db
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-libs/libchamplain/libchamplain-0.12.16.ebuild b/media-libs/libchamplain/libchamplain-0.12.16.ebuild
index f8059909253c..8f081e3d8b9c 100644
--- a/media-libs/libchamplain/libchamplain-0.12.16.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug +gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index c70df0919546..11545b75f899 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
-EBUILD libdmtx-0.7.4.ebuild 559 BLAKE2B 7da919a33131867207693786b806093ed1b8321461b4ad024bdbe5c9580eddc9bdcb19176b8956d9a832b2ee82dd23c39afefb63070dce7eaba9cc48d0cbc441 SHA512 3d42a932ac4b707fa03b17e0ba0b19d0bb443f718788b827306a44bffbac8dedecadc50dd61c7164c65a9490d78688d8dc2ae159ce13cae4fec1606960f56258
+EBUILD libdmtx-0.7.4.ebuild 559 BLAKE2B 2bf658670fbe81aa3d73265f684582be428ad3cf3e4454787cf48ce5e05d5417440f934562fcf3e1467dd7a5aaf6eacdadb9c60bd07bfc3798902df2c88bad31 SHA512 c9dec7100a4fffc636cde5fb6b99f7a9e5a4cee565d2ac52685db6df4c5b128adadefda51aeef494449e71f4a06dd48033905cff1c773e6d1eb9c0229f37127e
 MISC metadata.xml 326 BLAKE2B 569a4d2049158e629962d3fe2190f5abbd2971ca7235e4cac03f98cd3addc98f41171f81819bafb05d2548b62ff62e90b8ea2af63b79bc3a9ab1f5b06269249a SHA512 a76e9bc57b61fe25bae84a0a6420dc399647457b484d633033914a898933e7c2d3de5cddb379156ca681e20f270c7b3c6699ced46d0514aa418fc5b6f7df908c
diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
index 7677996a6a57..ebeeb12a21d5 100644
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Barcode data matrix reading and writing library"
 HOMEPAGE="http://libdmtx.sourceforge.net/"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 769e6d504ef8..fd3a65b2c074 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,8 +2,10 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f
 DIST libjpeg-turbo-1.5.0.tar.gz 1654276 BLAKE2B b3f1ad4c6bbe5b75ef8daa38e0ccf6165616768d1427d41f9b5cc6f5775720d2977aff6758ec0a9679c9eabc7c2395d4cdecdcb22c92522900de52900281b9bd SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22
 DIST libjpeg-turbo-1.5.1.tar.gz 1650647 BLAKE2B 5e9eb7889c430a735a8b8ac22fbf66fc98102acf372d08aa2dbd86ac55d43c5700438a77925f894c473e81289e4d3d2e6fe3da435d2799db21782da9bd5dfe41 SHA512 a03823cf4b3d1aada24e502fea0a979b1f656c01e55ffddc06013b9c79509c2da1e3bcf0b85282289451d77d4cb5f56dd8cbf6e492744836ddda1f7136534852
 DIST libjpeg-turbo-1.5.2.tar.gz 1657235 BLAKE2B 8d26af1cf6219e02f13f8729b688175590b01a4ce538ae861e72e6344a319475f8114ad05aefe2f8ffd6b5481c7915bd18097466408729d80212a2db7f99ad5c SHA512 c7fe5cc77e38fad33af3f10e6db961c8edf033a86c09541121f49bfa20547179760924e6d3e397f0add7030459ff3babadd3457ab2da4a40a2147dc1574aa444
+DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.0.ebuild 2861 BLAKE2B 4110c8947b54c3959a8bcf10a57810fca35ff31e389b51d32b03d5ab15db542ebf63d931c8aa926da4b3c49d1b005031fd2468ade8a0c980714f77a76310538e SHA512 3aa56d232af1153e2c7747d7d390d11d43ff3955691420d8d3247ce104f6b959e55fa83bafa601401cb0095944504c5474b3564b98762907cf413ad504643c45
 EBUILD libjpeg-turbo-1.5.1.ebuild 2923 BLAKE2B 67850bed77be9bd0b06c1d4c4f95bcdd73430e8b26e1698409213837edaee047578f79b4f019979aab48dbfac6210272594b28aacba1d25e6237034c85e3c4d6 SHA512 13e10d81a0543f6b7cf44b185c3534aa08e2fc07bcb243aa159bc3fcd6194ed7d7e4f8bee51570acf0962731275a4f2d91cdfa931b62ec370e54f27487bf13ff
 EBUILD libjpeg-turbo-1.5.2.ebuild 2925 BLAKE2B c519f100505bcccb2d7b9192e26d5ffcc2d881b4bfc90b3e2e4f72447512686745434e4754f8393c14d4d2b7a285a6bc2d0ba0dd20a9916f00e2cccb85129023 SHA512 4e320a1a69fb0ca060ea35a9e2cc5aa7a971ad727bf661c9f64472874200a941f1502eecbe99d26642b21f06a4c1c3faf6d57885ccc63e1e9ec5edb3a7746d11
+EBUILD libjpeg-turbo-1.5.3.ebuild 2936 BLAKE2B 94617d0cf0b8f02ce609e18fce3bf06238d20a92b459edae1307da6af1b0c855eeb600d553bf70c2290e34215429f9530f0a63d4e2461934ea72fc829cd3accd SHA512 495d50a0f8662b17f57154a280f533c71ac4e06a0fd42a8f97adc7784731cbe582e228a2a724681023a747abd5e190ea148dbc0baece29770cc65b2ff96e3bf2
 MISC metadata.xml 466 BLAKE2B 989b0d905baa9ba6217f871c43b1d06f8ea718ab7250d31cce0d498b219b3d1077638b2fecfaeb747e2505f2608d73390789bd442462a9e2f410b0939e2dbb77 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild
new file mode 100644
index 000000000000..c777fa40b4c7
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if multilib_is_native_abi; then
+		myconf+=( $(use_with java) )
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+		fi
+	else
+		myconf+=( --without-java )
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+	# Force /bin/bash until upstream generates a new version. #533902
+	CONFIG_SHELL="${EPREFIX}"/bin/bash \
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--with-mem-srcdst \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	if multilib_is_native_abi; then
+		pushd ../debian/extra >/dev/null
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+		popd >/dev/null
+	fi
+}
+
+multilib_src_test() {
+	emake test
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	if multilib_is_native_abi; then
+		pushd "${WORKDIR}"/debian/extra >/dev/null
+		emake \
+			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+			install
+		popd >/dev/null
+
+		if use java; then
+			rm -rf "${ED}"/usr/classes
+			java-pkg_dojar java/turbojpeg.jar
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	insinto /usr/share/doc/${PF}/html
+	doins -r "${S}"/doc/html/*
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	if use java; then
+		insinto /usr/share/doc/${PF}/html/java
+		doins -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 451e78267740..eb46159962d5 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,5 +3,5 @@ DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f898
 DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
-EBUILD libmatroska-1.4.8.ebuild 708 BLAKE2B 0a963d1f82a7b4f3d24e04b3b862c9a9b6c25f7af95156a3ff9c4eea803911a27dce7bd7263f405ca00814acee5c1e2785769e006397b3bb00de49927afbc522 SHA512 4b64d5499d3b3ecafeec4939f50a109b8f33faf777dd59502436376c0392446dc257597a1c694d294b1481e828244ddee6a3251c93a36a5da5732da20373a5b1
+EBUILD libmatroska-1.4.8.ebuild 707 BLAKE2B 949163c97643956e4743338ff34e3a149361f1607e24d053296b9f45b82eb7387ac60ab20dba9f9df85efda49a90dc33c0167f7463eec783203c96095ba56243 SHA512 8b7b412fb4d50ebd12f1be103f5d21cace556eaae49b07d71430bdab4cea58593dfce5afa42463441b18bf09b617280842373f19e6c761141bf1251f5f528861
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
index 588acba09717..febe604b4f64 100644
--- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libebml-1.3.4:="
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 47d28a24adc5..e1fbaaae4dad 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,5 +1,5 @@
 DIST libmediaart-1.9.1.tar.xz 5826128 BLAKE2B 65576c14fbf565d51332ae9cbd8e38ba5df7b1401f38f2fda45cf40885234646e4198fc6df8397a41b036fff106ec8faedd09385262a439ce7c39440f986639c SHA512 1ba43d3501d4775984967960c24bf217bcedd075e1716a2f54266817ae2a93eed119035f385025e34ba83b58ec10e544bbde9c2ad328a3de00c5c80b35524222
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
 EBUILD libmediaart-1.9.1.ebuild 1771 BLAKE2B 6f7d17ad8beb2ec15540651463e6fae22ba2596bb0c7a77bb03526ca70ed4d0b00a0bfcf36f840983ad3b08a483f674b90e6e8502212dfd3d115a8904deb30fb SHA512 7a14f1598189a12c180c432235e2a81265434902039048a567a24816aa2f888a9ca472757e939fc4ff56b63f92a2eae38753db4fe566766ceff1f2c41d8c2342
-EBUILD libmediaart-1.9.4.ebuild 1770 BLAKE2B 78c94d1f33ea043013db7259d00f1896d9b88fd1e961079db5b9057e11083752a5b63c3b518c730930012f5055d728717c30e760ad71ca1938d86da83e60b4ce SHA512 85b16f511554fb4c417144b5f09d6a4ba5151d8b9956d9447d17283c8433e72e57138bcb07e3bae56a1f95be7796a25e74be9f9f4765534dab10d5ca5516d27b
+EBUILD libmediaart-1.9.4.ebuild 1769 BLAKE2B 76921f46c72702c9b3a6eb1f8401259942378b4a6d2c6023fee3289a8a2a3e685131faac879aa174c2ae643b834bf315dcf59c9b83d881ce98caf250cbb79bbd SHA512 da96a731b80cacab48eb9f356b7bac5041894436c8e5f3a38e7bfdd4231da7bb02d42815871f0bd14f094660de1054cd9202366b5cff5c044f73db075b26e844
 MISC metadata.xml 335 BLAKE2B e8913835af52f0cffac2adfeb58abe2f2028fd27fb25a74cb70e03f14dfd69b3acd068d5b2c6fa68f51a73c304f9735e988c1497910dd627d7ef990fd95a412b SHA512 467d3cc035daf04fbf86044c676241a0c388f7f4ecdca1de15ac87772c8878052fe37f456c8627bd8fb385f520ec9a741b96a4abf2b43d5f981562805b22009d
diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
index e2b58f6742fa..f6b07c337557 100644
--- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk +introspection qt5 vala"
 REQUIRED_USE="
 	?? ( gtk qt5 )
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index e715c93c782a..e51866694915 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,6 +1,6 @@
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
-EBUILD libmypaint-1.3.0.ebuild 1286 BLAKE2B 47945893e8709daa0bd7d9795bae86476131f39187c6af8ddf60030da7a54a0018a57f7f6c0652072f64bb834141e73850e85139913ec81d8e0ba6176446dde8 SHA512 4b10bc681be6c9b72ce5c0c3135a041cb279ea3d34e70d1f5798c14cbf5e29c3d9a30375955953055ff53424716bc4b3ef1c6d706ff0cdfcab95ee8662bf0aca
-EBUILD libmypaint-1.3.0_beta1.ebuild 1336 BLAKE2B 9cae85ec8775662969226048eaed0c9cd86a62bf2c5570e7ab9c645da793fa415658cb2901e003c55481bbbb7542e510d13ab2a98a7c605a3531d980a0510565 SHA512 4f1b138309b67cd0b88e4744f8830e703372299ed3f80020461de00de90ccf5719b37d4307fb0ed90963f20d0252bf37c9b0a3e20f032d71b2f30e12a3eca807
+EBUILD libmypaint-1.3.0.ebuild 1288 BLAKE2B c050f4494c13229023ff0d8b22bec96ccbc0b2ccf5fec35009ca999e4c6445fb7f54fe924dd5ebad0a4d99df801d2fd64123252affd04006b4030623fe170a32 SHA512 a4db525903690220009592e24052b84026b3dfc644b864c5c850987f296470f91f1bc96b6ad98e469082b03e183b06c6c8f30c79aeef2ada9d65a901b6291c66
+EBUILD libmypaint-1.3.0_beta1.ebuild 1338 BLAKE2B 599d82ff4502132ecd6142cb8621fa6895bc093777623b19eb9b0de8a94575502452e03a3d85137832c6f5dc4efda6c95ecb1bc10bd1c889eee7dba5e1cfea6d SHA512 df3b6586e00ce5a843ebc6f5dfed83a27607149a4c1b38c7486a720cf9122e3311e4150ba76d04ec717350f23ef9b79693d8fd08a6d13c2fecb11e1c8b50cd14
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
index bd45646bd144..e9abaeef2330 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
@@ -20,7 +20,7 @@ IUSE="gegl introspection nls openmp"
 
 CDEPEND="
 	dev-libs/glib:2
-	dev-libs/json-c
+	dev-libs/json-c:=
 	gegl? (
 		media-libs/babl
 		media-libs/gegl:0.3[introspection?]
diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
index 6da54a043821..bfd8ff226300 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ IUSE="gegl introspection nls openmp"
 
 CDEPEND="
 	dev-libs/glib:2
-	dev-libs/json-c
+	dev-libs/json-c:=
 	gegl? (
 		media-libs/babl
 		media-libs/gegl:0.3[introspection?]
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 1be85e191007..d377c53caf09 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,4 +1,7 @@
 DIST libnsgif-0.1.4-src.tar.gz 242078 BLAKE2B b70249caeecf3deb80e16491062a41a70771118179a07e43302203c84dd9bcebbb85ec1dbd3b592141f509d6413e72f86aaf6beaf8a86bc70b97c2f164ad526c SHA512 7b6e57b32d26ebf04cd5c39ebdb9e4dd134caebd7e7e9da9f365250ec320873bcae685b7f1a6099c41ec3ac060ca986d8ebd44fef69a9f726f800d62eb9dbe20
+DIST libnsgif-0.2.0-src.tar.gz 268300 BLAKE2B 21ddbb258113f1b7aead4d5c09dd4a50403bac0e3f12749670d6de64d4505cf53d01f2bde4485036b523b68a1546acd8f7ec67623912ddf2bbe8bba8d666bfc2 SHA512 4c021e91b55c55e9f275c7a2b38de2480a8280853e373cbb6ec19487c5aa711cb5e88c9a244f8656265e25948105740b0032822e0a0c7de1865b6ffb87eb97a7
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
 EBUILD libnsgif-0.1.4.ebuild 415 BLAKE2B df8b5f6a6173c0a4ac9ae86053548ecdcbfdeefc63f1a578ad189f3a6ad23dbe63a78d405abf51f311800901240381f14cd64ac57c4e80dc0ed9e50c11b5838c SHA512 faa009d2f31e6d55f60ff98f524f7898fc5f5cae9996b420be6b520fa3f27984e5c5d256ea56f1beb4c583865aec70e2820ab4ad101ae1f4b8756341c6ba9905
+EBUILD libnsgif-0.2.0.ebuild 548 BLAKE2B 023f1ae0a5257597e6ef2d9243857ec90cd54c93f28dcd3d7189c961275b16fa6012113b0ee2e29f9aec00fb8586aff51223542de512a85282b5af0f91af5ea3 SHA512 c206216ab8f1257eb285ac9e190b5f479daf404d5c21bd8a534415a4b735b4d750b280a30dd2a7d10ee0e014644b1da38e339bfc19bc017104656955313d859f
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/media-libs/libnsgif/libnsgif-0.2.0.ebuild b/media-libs/libnsgif/libnsgif-0.2.0.ebuild
new file mode 100644
index 000000000000..60e45209c367
--- /dev/null
+++ b/media-libs/libnsgif/libnsgif-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.6
+inherit netsurf
+
+DESCRIPTION="decoding library for the GIF image file format, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/lzw.c || die
+
+	netsurf_src_prepare
+}
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index f41fd888f5ec..4e351da1bf14 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,4 +1,7 @@
 DIST libnspsl-0.1.0-src.tar.gz 299718 BLAKE2B 77e7cf73aa7c270711d400bfe56db0e8fcfb3dd77466fd1d12a9ddfaf8c6be534f44b13bf80589f7b7e002b46381eb184d3f5905b36f1cee842eeaebad00db83 SHA512 de850ee3d94ebcc243c73ee1f8c80f2bb3ab10459023594157876f9e18a27bf13d16417dc68a68a58f34d412b7b607b5240cc28e78b7bcc3027668e3e99f9b55
+DIST libnspsl-0.1.2-src.tar.gz 305693 BLAKE2B cb4e0bafab35049112823bb95216ff3ba5ebb522eefa4e5b7a97ecbefaee52c2670eaef03fc56055cc57081dc3c952d964e6555e359fc1007e1b378922eae06a SHA512 99910674b8685476fd8be995b3436f966f0b8351596eff4152dc9aa0dd795b634b57ba6d17ee866f8947fbb9002f2237936f29ea9c5d9b4ec6a4c7b07c64de44
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
 EBUILD libnspsl-0.1.0.ebuild 417 BLAKE2B 7423cc8c3f7886a3f323b17f6912803336de4256b7f45bf656f7278512c51ff13fc6c361f7651cd9e48bf14332a9462408a79723c2cce83f49282e5c5f9ac70f SHA512 a89db3345f6412704e20ea6c69797d8d3f251f37ad6fd504cd3e55c2bc3aa653ee20bef0ea08a4d9692065704f6994d469338378d7cc6eb46d9a6c802d3c1538
+EBUILD libnspsl-0.1.2.ebuild 417 BLAKE2B 0fda39b9d0b9d9c758072919b8bc60e3e9dc895c6b70349979b6ad0249656650ee85c74b740ffc9d64af53ae28c85a4dbf05d13b0d2b82326233a45803ba2e90 SHA512 68f6e7857abe61c414e9d89dc4916881d933bb317056445c2daa48e286fa20208fcac9cfe165de197873d17f5ba88883adc41ef0074e4630cb6cfd63ab883d29
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/media-libs/libnspsl/libnspsl-0.1.2.ebuild b/media-libs/libnspsl/libnspsl-0.1.2.ebuild
new file mode 100644
index 000000000000..43ff354386db
--- /dev/null
+++ b/media-libs/libnspsl/libnspsl-0.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.6
+inherit netsurf
+
+DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index ebe15cdc4c2c..a6cc724bcb79 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,13 @@
 DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
 DIST LibRaw-0.18.5.tar.gz 1280046 BLAKE2B 167267922a1a8d16e3b13dbf4c8cda3bfa31a9e5d98eb9fc3929eb61df4cf6491a49772d1fd8a18da525709481afa34c7b85c996d02445012ddcadb90bbc0675 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81
+DIST LibRaw-0.18.6.tar.gz 1282212 BLAKE2B db53d22a38535f0b96fd02aa52969206d4003579706a4c2b8ed00c6df0785e062ea92fd9613bfe5e94efc65bb69fefb8661d2afc4b57341800a4176ba264bc83 SHA512 ce916a85dcc8ad50a631e9f0e4532d4cc300624b5c78d233531317f33cdf74363cdbcab1fbef3207e89b77bac5be370ef8ff1b806dbb9ae2c4cc0ec607b53e55
 DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
 DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 BLAKE2B 6881852b59bc728eee6f31d5b355ee7583390adcc62446d0f4c9df6efe45b0384e192e9ce8e48815c960af89890a9ee4c3f5a2f0e0f1086bc943c8425b7e5930 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5
+DIST LibRaw-demosaic-pack-GPL2-0.18.6.tar.gz 32638 BLAKE2B 070a09732a018c3c759fd6417ff9f8b97ba6cf4bafc2efcb24c9d0809fe53565ff74b60c46f640e76a3a95486fc70a08f6059fb311e4f3b3337048665caef38d SHA512 2a4f317c2594825a7a7ad62eb5592ad3d512026dc49b87123ae4f5a05731912fcf4f3e22169acbc1decf6b79aec34a7250d892b686fe824f8bb2c5afa759c7ae
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 BLAKE2B 8ad0e18c0f33d4cd485668cb126ca18677271f4b141c64e0adfe918b3a04e4dbf2b4a11eb810ca6b93e850babf755ed4df1f2d85c9ca8cfbfe78ca3b5a14ac63 SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028
+DIST LibRaw-demosaic-pack-GPL3-0.18.6.tar.gz 39247 BLAKE2B 73319b2c33c24b570036725585c15bffe9bffb1252a8cf64cd3628dab22cf17e12e7fc87efb5c5ae8581dfcd59d0f9bd7dc41817a2ceb1dd2b1e2b09e76423ce SHA512 53ad72654f407dbb3b591f2d1ff12de1cb273de5339d598e76260ee2e2c4095d70d3b0f30536cbb7eb06d802bcf6cc76e6b870837a3e4dc640f4a14da020a704
 EBUILD libraw-0.18.4.ebuild 1709 BLAKE2B e9f8aa141cc9a75922d8cd242194f18c6c4aee4869d005a39a45aea15134607274309e03c785c03ca542f2fccad46ed296849143f057b7a72f4741e34fb0df22 SHA512 bc71024b25099e5d8f1d159da3c0c547e66daccc8154d925f5b261c72db5e2cb3fb840974a7c84888d9190254388da892d0746ab77ad58392d9f5eba471dc14f
 EBUILD libraw-0.18.5.ebuild 1718 BLAKE2B d5a7c80018a5848d097ef300d3ff49bef0589f8c092934f603d5f09efbdf64a4f32ff78b30ae7afb6a5868221fb15394525db8d8cd3d096f6dce270ff2e22b4d SHA512 7a411fcef607ef7b41496284df88f9e6c4bd82ba87cdd0693ed34b820c698dba384a81886764fac86c0386f004fdfba787d29f22ca58e12aad58e7f5e56bbc3f
+EBUILD libraw-0.18.6.ebuild 1724 BLAKE2B b54447a16c286c835e3d8dfac31dd879fe33604a7f6b58c3fbf7bcee01314bb1a7380dd265b7c3195c5de981b8a73591cf1650bb65a2825d626540867de704cf SHA512 c8d43d50d6e092fa4469cc0262d0eac82f6c09893aa1d507f9a4a5d5f4340084a558d98a73b8ffa975bfc854b5af47e3b220ef4c079d7d060ab0d335d56201f2
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.6.ebuild b/media-libs/libraw/libraw-0.18.6.ebuild
new file mode 100644
index 000000000000..318f92ff6128
--- /dev/null
+++ b/media-libs/libraw/libraw-0.18.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
+	demosaic? (
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
+	)"
+
+LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
+SLOT="0/16" # subslot = libraw soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable demosaic demosaic-pack-gpl2)
+		$(use_enable demosaic demosaic-pack-gpl3)
+		$(use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jasper)
+		$(use_enable lcms)
+		$(use_enable openmp)
+	)
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 9e0b95689cb8..cd36aa369257 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,5 +1,5 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
-DIST libsvgtiny-0.1.5-src.tar.gz 760663 BLAKE2B 3dda007b22a30d70bdd6c3c9cd22589aa65998278a88601a69191499ed8883a862d73406dbc92bfd55e805fa2df27b788702fdba5b647d000dd7ad4671eae283 SHA512 b838a7e9355d474926d437f7a756c217ea3e105443731c0234dfceba7037eb7c9249fc0f47b3905dcfc1ec9ed0495c7c1a7882054d468240a75749e497dbd5b7
-DIST netsurf-buildsystem-1.4.tar.gz 38067 BLAKE2B cd09909e0565a7e63f16082c653f7dbf8de3e6b4d61aadd213bcd884a7cd3d10d8e22859322ffbe71a7d99823b3789c6e2454ea50cbe75578dc7d6eab324d0f5 SHA512 2c804ad7bef70c987e1d393ee4041bffc9797893b4fd513c90a665027205a1f7eee0a7d86ddaf833a6ee18346d6fe69587190c4e6722afc4ed18ce87783c35fc
-EBUILD libsvgtiny-0.1.5.ebuild 626 BLAKE2B 236b241629aa16c9fb414bf29c199bb13c861e1c0654047b6aefffafcdb23413265906db5dc68de33b6db84df3a890258b1e1081728b93189d10ed82d6223d7c SHA512 8529bcdc28847146e9a3320e08701d5363c2816d96a31023bcaa038bd8516ce9f7806159a04d63ed86d71bcc1f39a4678048cafd51d23b4a99217f475bf3c746
+DIST libsvgtiny-0.1.6-src.tar.gz 760475 BLAKE2B 69b991e92ad34ce39b40c49ffda88517a737515c6f6f6a3525786e626ec4148c5f66ab2edd09bbd84e38f6a7646ad05f25055a5316f7cf9bab77fc619cf27f84 SHA512 d8c2eaf2bc11b3e054ef2e8181da816aaa1fa45a537574541d174eb9ad23d452e85179c3f2232035f133be1497b080bc0494d080b77da1eb4112c19fbe712928
+DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
+EBUILD libsvgtiny-0.1.6.ebuild 626 BLAKE2B 429ea531638edaaa5edbf91811b2be9067052989d3f48232b87c63b2deaf3d0dbe4c8260f8dd95f1d51d9c71646c39ffe244c266c6439c57777e25c3cfb5b8df SHA512 c2552ab6c41ed2ee105bbde786d579cb9dc2831f8bb67fb85a79e411263ec47d0eacfa88150c0b58599a458c84f61692fc138e7c318580311f2a60f5ba8d4f97
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.5.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
index 99f4f2c5e091..d69b7dcc88c1 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.5.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-NETSURF_BUILDSYSTEM=buildsystem-1.4
+NETSURF_BUILDSYSTEM=buildsystem-1.6
 inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 2346f49d8b2a..1c4c426de89c 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -18,6 +18,6 @@ DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317
 EBUILD mediastreamer-2.7.3-r3.ebuild 3898 BLAKE2B 0c0d3a249968143af013c67198e654f7d2c6af582b0efe1646412a299c46ef2f61efd46db788060586ec1aaa66a8bde0e06aff5e2ef628a3eee616f5d1990410 SHA512 941d6199e23c2e2d42e5e784fb125ab6ca128e839f691a45a3c5faf2ffe1cbc7189e506f8c1a129e92283fc4428573d78d4f9971b3d75f6c25d36e1f77ff176e
 EBUILD mediastreamer-2.8.2.ebuild 3824 BLAKE2B ad844e6ca0b7d3c7432fd8a6110487c84b5d67d15c387953deb35cfcc9123320281e04f9f337a0a62602635beff62aeb28b593dab8a10a96538d3e53ae6b6ee1 SHA512 9336b58a8b0ef34d58ee9f3d37cb40911e25a5c1979bbf9507370f3d9018de5c13833d8cfbaeb3482810bf1c9d366a0541ea576c345af5837fc4e4ca9d0579c1
 EBUILD mediastreamer-2.9.0-r1.ebuild 4584 BLAKE2B 0e76a1c5b90f4e4991073eed84ae37e2b50510ed156e705c773622225286b7f600d7c60df795dcce57e533f0574c05756fd18df9cb20b7854cc2feae2253507a SHA512 2b05c989175bb8fccf7d5bccce914ddfeec8c5ef28e76d34bbcdf811aa19b0343ead4b41fbcd5aa3fd0aa8cba9921d7d1ecabf253842108b45b01c69b162ade9
-EBUILD mediastreamer-2.9.0-r2.ebuild 4636 BLAKE2B d53c83141512a885a3feed5840afd6c28ce2e5a5b57ec5b1e7fb6af896465db89bc87c177913857f037b31cfdfee2c2fd608c557f4c32150a582d91f23148260 SHA512 2153f2eb4ee90ffcc5e049f53341ad84261c9fff6de7087d8166a885809e1ad112ac85405b17814a8a869dc58354bcfca1c342ab730e1177837d460177a48569
+EBUILD mediastreamer-2.9.0-r2.ebuild 4635 BLAKE2B 00b9c5855278363f1e2d5a52a91ce28aa5f3c725476b8463dbaf774257c7ac1c22db5419c989c92f1b3c14e3e677b702b5b5c6c8bf6d10af0cf3a9a5fd8ff687 SHA512 6b6b532d735df9bb11ac4bb74e1981e645b17ddaaf3ab91977e2d37b405c6639bea7516143628f440426b1d04438a18bc6d7d43a29b1d8ca6d0b774c6f7a41d8
 EBUILD mediastreamer-2.9.0.ebuild 4469 BLAKE2B 2befba8d12580524af4c08219a711a2c35c76d385851833f6625ebf2e186c944bc688daa1b096836409e4136ace25ed24a003d21e4af3f6c368f5f408aff0fc2 SHA512 acf3c4d57f6e34e576ed7793c7b44da186ca48f667f4749e628ed2e3b9da0768ad49802063e782140964e8bd21286d6b470f394574a89c4004308791383dc610
 MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 48cb07c5b2d7..86db1bda81ed 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 # Many cameras will not work or will crash an application if mediastreamer2 is
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 652618991bf6..2f2744e1c405 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,7 +5,7 @@ DIST mesa-17.2.7.tar.xz 10353448 BLAKE2B cb116d7d7f8ace7769c348f04c0db194312553f
 DIST mesa-17.3.0.tar.xz 10667896 BLAKE2B 4786f1ac3fa2d2f07895c829f2c0770861d64f606d72635eb206cb9f0a1e84c061950fbf33b2c7b27055399da43d705ed9abd5d8f46c7bb3e3d9a6497f4bd71d SHA512 b0a616ce9a534a19c42eb0a626a178c6a7171aae1989351ea7c2a9e775a7478758b805dbfb754056720b1ef0454c3d3beb64aa59543be27f249ce97efae8e47e
 EBUILD mesa-17.1.10.ebuild 13427 BLAKE2B 584c9d7c4954623b346c6884d3870131a338ec6ab1f6b6976447a94014fa6fcb7a8c349898e44a0716a844dd6d4943175b6d2c4f213c37879f7973317009a9c9 SHA512 cdd0a580b7051e39a2a1fe1e0f8ca4671420ae69670c71b252057080d0384a74d3228ccafd40ea44b4be3057ff6d33977119bfbf8c4e3780bce8f1017db03645
 EBUILD mesa-17.2.6.ebuild 15006 BLAKE2B afff4eb4640402b2fd36d86cbae220e956c4a09917d6081c304779124ba86a4373ca37cbbe8610396ee7c2a0a24659432689e70fde79b4a355c122b61b4d2caa SHA512 9d1e62aca188b73dbfc63434934f1202060945320e35805f519bc85c22f7765057d594b095874f12f04f0f9ebe3be0705a92392c7deb52711dc232c2ca93739f
-EBUILD mesa-17.2.7.ebuild 15005 BLAKE2B b0662e4e7c2dc9302a57e7546dfa4bc493367c128bacd0242e30b0e2990adc5999cfb5ddde92a60cdb310b8b886d207fd2cd9ad7d33a87d3f049307fe956de6c SHA512 243406b1adc6cf7103aeae3d38bcea0cee5bf016e79d09dd75a4ad20b129f5597abcdae8b830478018b75a23f21b55776b2a3848f4f86b4a8a14338b14e2ea74
+EBUILD mesa-17.2.7.ebuild 15004 BLAKE2B 0be51eceafdacad450f608906d7fbb62290bb9936c25ef4bff835c8bad8806b08602f21e7151b6df9f682c9021220e5f126d768132dd02c74ae3d92e8a9c9612 SHA512 4888fae0e2a4ef8841475e445effb16fde6460820810182c67e49ef934afb88e70bd7e8f2d04f1d6e719f31ace830f3a22ae9a850ce9c9e39bf05def813cafcc
 EBUILD mesa-17.3.0.ebuild 14892 BLAKE2B e3fb731721a648981bc901a4b96a0d76d6e0a1d9393d515bff62c808c700626052983a5d0ec29b2f584da70246fb53eba99abb9403eccb62fd74e289b9113d11 SHA512 57ac595432a400c8435ba4e60d4a64e2333e33cd5f2c0ad8292a30677fbcd85ebe60c913f8d47b66cb79ed06b42f4da3e288675514ecefaed8c74d1f98553087
 EBUILD mesa-9999.ebuild 14935 BLAKE2B 2dc1df6d79a037e01e7d95b2a94716b5df4f25bce37397938812d91ba6ca9b5f9d4a30d8b88be8d2d5d7f7487f8c35cc81031a8586935912d52313aeb21dc233 SHA512 c66ac4dd0afa249b4d886a583076cce12f1e7b5d3154705f784f91402273055c6c0f0e800ac29a07eca837f671c346e0feb023531f7c302b678825f7581f0341
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.2.7.ebuild b/media-libs/mesa/mesa-17.2.7.ebuild
index 40a99f38d753..ac743382963a 100644
--- a/media-libs/mesa/mesa-17.2.7.ebuild
+++ b/media-libs/mesa/mesa-17.2.7.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 188edb5ce4b2..75904e64086d 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,5 +1,5 @@
 AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728
-EBUILD phonon-4.9.1-r1.ebuild 3188 BLAKE2B d19620a542d387c126ca62c6a82b5cbe40b040d804891281d43ef5f1d6c28ce968859cd3ecbcb6661d80abe700432d60b11f1497f2c5f9a84dbe135722ff61bc SHA512 aa974ba795bac1499e36551ac732346015fd8fee9ca2ec6526e6e2ca3054b268f1fe652050785f9eb1aabc6a87515220a2677e3e73da5a5d2ba17b1671289329
-EBUILD phonon-9999.ebuild 3129 BLAKE2B dc3eb725a2f42ab2b012b080eaed52a6ec97fcad40939f2dd30a89a5ceb9aa97fb34d8da85c72c4e68c5db7dec1403ad92ccdedbeb6905303006637f72854d2d SHA512 82ad80a3a9ed8a543e60cd20d863621f07c089139bf128978f2687fa7e957298c6daf6f5ca2554802dd0a2bb2ac31bdfa9b0e28679baa9b18aa60a9f07531a9d
+EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec
+EBUILD phonon-9999.ebuild 3029 BLAKE2B 48448ed0f51ec28d817a080226e4ac606742228741dfa262044ad3141683a3ed26476eaea81cab3acfcc5ddc551411c2b65e241b9e536ef41ea3aa36f972938e SHA512 eac3b28188b2be8c8f2ed0b0bc01684bd40e729eaf0e05a1b840c3bd489a0ef479c95c14e8529be9bc5e9d7c2b7bf40ea7a221df4348c39591ab423906b3493d
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 2474f3bab8db..7f91cb3281fe 100644
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -54,10 +54,6 @@ PDEPEND="
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
 
 pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
@@ -67,15 +63,20 @@ multilib_src_configure() {
 		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
 		-DWITH_GLIB2=$(usex pulseaudio)
 		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DWITH_QZeitgeist=OFF
 		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
 	)
 
 	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-		mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+		mycmakeargs+=(
+			-DPHONON_BUILD_PHONON4QT5=OFF
+			-DWITH_QZeitgeist=OFF
+		)
 	fi
 	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-		mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+		mycmakeargs+=(
+			-DPHONON_BUILD_PHONON4QT5=ON
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+		)
 	fi
 
 	cmake-utils_src_configure
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index e39cec4c2f67..b16a70f4b3c9 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -50,10 +50,6 @@ PDEPEND="
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
 
 pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
 	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
 }
 
@@ -63,15 +59,20 @@ multilib_src_configure() {
 		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
 		-DWITH_GLIB2=$(usex pulseaudio)
 		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DWITH_QZeitgeist=OFF
 		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
 	)
 
 	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-		mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+		mycmakeargs+=(
+			-DPHONON_BUILD_PHONON4QT5=OFF
+			-DWITH_QZeitgeist=OFF
+		)
 	fi
 	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-		mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+		mycmakeargs+=(
+			-DPHONON_BUILD_PHONON4QT5=ON
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+		)
 	fi
 
 	cmake-utils_src_configure
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 057ca7f95dfd..80c969bcbb83 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,6 +2,6 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
 AUX speex-1.2_rc1-r1-configure.patch 1153 BLAKE2B ef6e7e227b19b532a89c819481050aa9aab5c805934ae12f6ab2f666f6e7d056f4375cb0cce31a688c4b725fda057ad01e5b400b5024313c788f02af5880ebd6 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 DIST speex-1.2rc1.tar.gz 1061882 BLAKE2B 1ce4a2c6682c7142cec64dab7075525ffb485d43f61aabab82e01333df2e59c04dba56bf8982a28dd544011dab45db03b4830430303e9610846ed79d77d69d0f SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
-EBUILD speex-1.2.0-r1.ebuild 1668 BLAKE2B 3cf16fad2ddebb807f346615c48daf313c77d90d5fa4e9e48488675644accfa171896ff920b9507005fdec7410f2d8778d235b52018a9f7f9964bad7e59c4c47 SHA512 89b61391d3afc92e51c0b9b2734ad3d886935e00b5c0bdfe49d216d7d58425f96d72599f3226bc9cbb99b596515299dae6fcfd7a2048f85cb1e41984c9df73e5
+EBUILD speex-1.2.0-r1.ebuild 1665 BLAKE2B 8ec1579cfbdf8c35b94585ebe37bcf0cf35e495aeeaeaec10a4115562392f97df980a46829ad988f263cfbea3c577e033cbeec1d3b1eca88649ffb432792d0f5 SHA512 56f55d48b65b4987359d4ad5cec81652f435a03a890ecabea6f87514258412ec5f5776b3bb61b146b2e867d9366eb8d149d1145eb0dc9aa1e7564c0ae35a7c9e
 EBUILD speex-1.2_rc1-r2.ebuild 1585 BLAKE2B a0f2e029fac58e02469d8fc71c201052311e6a6de7a3b500ba832491f3c3fd389a7459a592e837e971f16c64240255e839ad06bae5ac062ad8d190a1f71d2d5e SHA512 16920e4bd2a50e933b9a288e0f4a91fee1e2bcfd62adac3f2a438e8f0896a72eef7e35e644c795605caaacb92d3bd880eed8618014d1df53136400818038b1ab
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 0c0c99a1cdff..067a6748ea64 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 17d200d03141..617eb65f0553 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,6 +3,6 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
 EBUILD speexdsp-1.2_rc3-r1.ebuild 1466 BLAKE2B 3778e15394c69370bd493a1130f716954861fd9bab81244da11bee3f5a5ad3fad42e368b7b6219999fdc125b70b2257518c3a7ce657654239d777782b1cd59f1 SHA512 148ab93d88edea7e6fd50ea7fa8a5011d13b4609778f03b61d63ef5457074a7f8a6daf0ab1cc6de402ce6fe0bf4391345b15466d9fa8c466c86ec0a7a70d7b76
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1501 BLAKE2B a01e9399df050e756942af7e0f03f9ebddd5d7e2c5ce5001c2d0a426709143392bbd42e0571db058cfe0be667610a9d7a09784fa8b0881291eeb0b3dfd0d709e SHA512 00d4b78cb735e13e6d9ace27d9594d7bdea3aa02e7eff1ec75d6abad9f5063c129626dec2c7e0bb4f1e6f4a732a036425108cfa3e3a19b1a56517ae0b6466e13
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1498 BLAKE2B 53d188d016786ac4006f18cb59805cdf73ed5c3466364cfb7194be861d8342279d608836294ee3e7b3925ff786b7fc4fb5a65d0816142a4187a795b18f921056 SHA512 5c981d14f31e16d6563bff0131542f1f3a3d7f2af7cf124836a6d02118a85a6548fc289dc527044304e830245d97301a5df2010c7ad2c7bb889c206a001469f0
 EBUILD speexdsp-1.2_rc3.ebuild 1422 BLAKE2B 3e2720efc4fa740ba5ba18c0dcbcff580f4b572baf2c5840aece7cad18464862394c25db7a0fff2f9be996cf3d18f85feb6d393d31be6975b35fc9712e78d129 SHA512 16cb6141e84d413af8be8652c60398612bead1a95f9bfb6e26c2ec9260885a2bd9db910a35ff34123f6095c6502946859623169e364daf86935530b972e98f53
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index ef469e1dd724..69f5da68e348 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index d8c354d80435..9b673233f233 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,6 +5,6 @@ AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491e
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829 SHA512 ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
-EBUILD xine-lib-1.2.8.ebuild 5700 BLAKE2B f6656856b5e78e967c99d12bdbfde9db5e960da05475e6a6236c9699d1e577c8c3e795014192e126f226149886498d5fa002897d67f0350c4b57c57eea12c972 SHA512 c9eca07b1f4421b0fbc56218885f8e55bfb47836527f755a4625b19f3dadba14b016c4ed642471d31251f247e1d04c19a2924c14f50f5876b9502677ca0818ea
+EBUILD xine-lib-1.2.8.ebuild 5699 BLAKE2B 73db2b57f1d6cc61976b49f9222c121c6ab1156cd774b00859e51303e047619ff807733a28feb1a984da79edc9afb6c4c65b76d7a6f695b88aac7795eb2be5c6 SHA512 864ce1a82f78bbda925d8081b4778410d781e3202784f9277cca2885af3f7e9787af104960126f080bce866dc468350db53a186ab731456a67c1a3c9c1d89a43
 EBUILD xine-lib-1.2.9999.ebuild 5648 BLAKE2B 3d6d44b476327453c2ba711d53103d9b72b8fe820e0454e1c78e286f85e623fabcdacfebc16a3f16b388e0f0d17d1473ea0353d17dd3f181bd00de610f3f0cf8 SHA512 fc3bbe13f66ae98f08ce3d8a60970adbf15fd36b461b23cb22a1dbe51413d1cb97d06a22b0fea6145bd7dd58882ead91b95de52436123c2b37416f654f97f2d1
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index a2171f2e6216..d3a4b7e7656b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index bd00eb2a7d9e..4e14a570487a 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,5 +1,7 @@
 DIST xvidcore-1.3.3.tar.bz2 695279 BLAKE2B 7e24910d51e6e8d9a725aba86a83a59556e85bb953c683eef1d74bd10bf427d22f1d66e86c3a5f6ff73e3b16427af274b51447d1e336968415c252699965bd57 SHA512 e2178ee946fa057cf465da855b702e74fbab04347020ab7900850c07dfcd5202003fcd579fc404e0a567807285607ed4bcd14dc4c074ea19123143f03af80f09
 DIST xvidcore-1.3.4.tar.bz2 697808 BLAKE2B 71ee4e6e73e37055482f4b02859467b2dde0f687b0652b36169b1b77378cf5db77fa805ca932cb4a0772b1abe46f3d4ecb05302c23b951d7e8dfa6888cb53b4f SHA512 09c0dca898ad8ba32161d979dea66730c235d9649e93e5053f0e0f0d02f8996f0f85d629728bff16d3253b71e0435809360e6cf4d72801e63c061f2a0b0dbe7d
+DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
 EBUILD xvid-1.3.3.ebuild 1826 BLAKE2B e95565e45b1ec90077b35ed3c279316be84b8b79022fdfa50c409e2c485df3e32ec62fb8d2144efed23ac7f8af76e8ad67893ece40fea70f8efc59fbd884accc SHA512 4c451fec5390c84521a0674ff75c77be3bd4791f9fc5b4a29726a1e4958a68f90b9328e4572b8649594534b694dba4b4ec6a5bd04abb102372ff7bd7324d11d5
 EBUILD xvid-1.3.4.ebuild 1842 BLAKE2B bd0e66e22654baa942cffb3bdf2c3bb5ebcf4aa6ac97edfe227afad8857513d7333455968ae372e17123a82638db0a4cf8c56c8d7a214d3d8a80fdbe4d943fb7 SHA512 0aa1e4aa14158996ac706d654894b7a35b3d9a92d593ea04c1356ae8b4cc1bf23ed472dd41b30b643bee63934b098566515dbd9e5945fc7989b1452bf369eab4
+EBUILD xvid-1.3.5.ebuild 1801 BLAKE2B 7f88505ad571a754a880fc39aa818be9c425c27cdb952ca369dbc979c1144f03a221a839bc20ec163097b470f4926a842e368d2d4ead172576926725f70b3a82 SHA512 9e5ca2ca9b21e7abdbe45e8cc6033af38d5613e31342e5d8336565eaaf0a0d67f73d2bf9d9c1722fcecf49389a2309d86fd2006b8c52088c56987d976e343c61
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
new file mode 100644
index 000000000000..f0ddb60833ec
--- /dev/null
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib multilib-minimal
+
+MY_PN="${PN}core"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
+HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples elibc_FreeBSD +threads pic"
+
+NASM=">=dev-lang/nasm-2"
+YASM=">=dev-lang/yasm-1"
+
+DEPEND="sys-apps/grep
+	amd64? ( || ( ${YASM} ${NASM} ) )
+	amd64-fbsd? ( ${NASM} )
+	x86? ( || ( ${YASM} ${NASM} ) )
+	x86-fbsd? ( ${NASM} )
+	x86-macos? ( ${NASM} )
+	x64-macos? ( ${NASM} )"
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+S="${WORKDIR}/${MY_PN}/build/generic"
+
+src_prepare() {
+	default
+
+	# make build verbose
+	sed \
+		-e 's/@$(CC)/$(CC)/' \
+		-e 's/@$(AS)/$(AS)/' \
+		-e 's/@$(RM)/$(RM)/' \
+		-e 's/@$(INSTALL)/$(INSTALL)/' \
+		-e 's/@cd/cd/' \
+		-i Makefile || die
+	# Since only the build system is in $S, this will only copy it but not the
+	# entire sources.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use sparc && append-cflags -mno-vis #357149
+	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
+
+	local myconf=( $(use_enable threads pthread) )
+	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
+		myconf+=( --disable-assembly )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r "${S}"/../../examples
+	fi
+}